From ef3cc79b01ce4e0d5dbd5e9e43aaf07215b57f0b Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Sat, 17 Jul 2010 11:25:27 +0000 Subject: Move device colorspace contants into the fitz namespace. --- apps/pdfapp.c | 6 +++--- apps/pdfdraw.c | 8 ++++---- apps/pdfextract.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'apps') diff --git a/apps/pdfapp.c b/apps/pdfapp.c index 32de4265..5a2d2322 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -295,12 +295,12 @@ static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage) if (app->image) fz_droppixmap(app->image); if (app->grayscale) - colorspace = pdf_devicegray; + colorspace = fz_devicegray; else #ifdef _WIN32 - colorspace = pdf_devicebgr; + colorspace = fz_devicebgr; #else - colorspace = pdf_devicergb; + colorspace = fz_devicergb; #endif app->image = fz_newpixmapwithrect(colorspace, bbox); fz_clearpixmap(app->image, 0xFF); diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c index f0601570..e0003246 100644 --- a/apps/pdfdraw.c +++ b/apps/pdfdraw.c @@ -292,13 +292,13 @@ int main(int argc, char **argv) glyphcache = fz_newglyphcache(); - colorspace = pdf_devicergb; + colorspace = fz_devicergb; if (grayscale) - colorspace = pdf_devicegray; + colorspace = fz_devicegray; if (output && strstr(output, ".pgm")) - colorspace = pdf_devicegray; + colorspace = fz_devicegray; if (output && strstr(output, ".ppm")) - colorspace = pdf_devicergb; + colorspace = fz_devicergb; timing.count = 0; timing.total = 0; diff --git a/apps/pdfextract.c b/apps/pdfextract.c index 1271d95a..7598fcd6 100644 --- a/apps/pdfextract.c +++ b/apps/pdfextract.c @@ -54,10 +54,10 @@ static void saveimage(int num) pix = pdf_loadtile(img); - if (dorgb && img->colorspace && img->colorspace != pdf_devicergb) + if (dorgb && img->colorspace && img->colorspace != fz_devicergb) { fz_pixmap *temp; - temp = fz_newpixmap(pdf_devicergb, pix->x, pix->y, pix->w, pix->h); + temp = fz_newpixmap(fz_devicergb, pix->x, pix->y, pix->w, pix->h); fz_convertpixmap(pix, temp); fz_droppixmap(pix); pix = temp; -- cgit v1.2.3