[poppler] poppler/utils: Makefile.am,1.4,1.5 pdftoppm.cc,1.2,1.3

[Albert Astals Cid]

Update of /cvs/poppler/poppler/utils
In directory gabe:/tmp/cvs-serv25074/utils

Modified Files:
	Makefile.am pdftoppm.cc 
Log Message:
Actually create pdftoppm patch by Stefan Schweizer


Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/utils/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	6 Jan 2006 10:05:59 -0000	1.4
+++ Makefile.am	4 Feb 2006 20:07:08 -0000	1.5
@@ -13,7 +13,8 @@
 	pdfinfo					\
 	pdftops					\
 	pdftotext				\
-	pdftohtml
+	pdftohtml				\
+	pdftoppm
 
 dist_man1_MANS =				\
 	pdffonts.1				\
@@ -21,7 +22,8 @@
 	pdfinfo.1				\
 	pdftops.1				\
 	pdftotext.1				\
-	pdftohtml.1
+	pdftohtml.1				\
+	pdftoppm.1
 
 common = parseargs.c parseargs.h
 
@@ -56,3 +58,7 @@
 	HtmlOutputDev.cc			\
 	HtmlOutputDev.h				\
 	$(common)
+
+pdftoppm_SOURCES =				\
+	pdftoppm.cc				\
+	$(common)

Index: pdftoppm.cc
===================================================================
RCS file: /cvs/poppler/poppler/utils/pdftoppm.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pdftoppm.cc	23 Jan 2006 15:40:54 -0000	1.2
+++ pdftoppm.cc	4 Feb 2006 20:07:08 -0000	1.3
@@ -108,7 +108,6 @@
 
   // read config file
   globalParams = new GlobalParams(cfgFileName);
-  globalParams->setupBaseFonts(NULL);
   if (enableT1libStr[0]) {
     if (!globalParams->setEnableT1lib(enableT1libStr)) {
       fprintf(stderr, "Bad '-t1lib' value on command line\n");
@@ -158,14 +157,16 @@
     lastPage = doc->getNumPages();
 
   // write PPM files
-  paperColor.rgb8 = splashMakeRGB8(255, 255, 255);
+  paperColor[0] = 255;
+  paperColor[1] = 255;
+  paperColor[2] = 255;
   splashOut = new SplashOutputDev(mono ? splashModeMono1 :
 				    gray ? splashModeMono8 :
-				             splashModeRGB8,
+				             splashModeRGB8, 4,
 				  gFalse, paperColor);
   splashOut->startDoc(doc->getXRef());
   for (pg = firstPage; pg <= lastPage; ++pg) {
-    doc->displayPage(splashOut, pg, resolution, resolution, 0, gTrue, gFalse);
+    doc->displayPage(splashOut, pg, resolution, resolution, 0, gTrue, gFalse, gFalse);
     sprintf(ppmFile, "%.*s-%06d.%s",
 	    (int)sizeof(ppmFile) - 32, ppmRoot, pg,
 	    mono ? "pbm" : gray ? "pgm" : "ppm");