[poppler] poppler/utils: pdftohtml.cc,1.3,1.4 pdftops.cc,1.2,1.3

[Kristian Høgsberg]

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

Modified Files:
	pdftohtml.cc pdftops.cc 
Log Message:
2006-01-23  Kristian Høgsberg  <krh at redhat.com>

        * configure.ac:
        * poppler/GlobalParams.cc:
        * poppler/poppler-config.h.in:
        * utils/pdftohtml.cc:
        * utils/pdftops.cc: Respect command line paper size settings (#5641).
        Drop the built-in paper sizes.



Index: pdftohtml.cc
===================================================================
RCS file: /cvs/poppler/poppler/utils/pdftohtml.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pdftohtml.cc	23 Jan 2006 15:40:54 -0000	1.3
+++ pdftohtml.cc	23 Jan 2006 18:52:48 -0000	1.4
@@ -316,12 +316,10 @@
     psFileName = new GooString(htmlFileName->getCString());
     psFileName->append(".ps");
 
-    globalParams->setPSPaperWidth(w);
-    globalParams->setPSPaperHeight(h);
     // XXX
     // globalParams->setPSNoText(gTrue);
     psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(),
-			    doc->getCatalog(), firstPage, lastPage, psModePS);
+			    doc->getCatalog(), firstPage, lastPage, psModePS, w, h);
     doc->displayPages(psOut, firstPage, lastPage, 72, 72, 0,
 		      gTrue, gFalse, gFalse);
     delete psOut;

Index: pdftops.cc
===================================================================
RCS file: /cvs/poppler/poppler/utils/pdftops.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pdftops.cc	23 Jan 2006 15:40:54 -0000	1.2
+++ pdftops.cc	23 Jan 2006 18:52:48 -0000	1.3
@@ -307,7 +307,9 @@
 
   // write PostScript file
   psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(),
-			  doc->getCatalog(), firstPage, lastPage, mode);
+			  doc->getCatalog(), firstPage, lastPage, mode,
+			  globalParams->getPSPaperWidth(),
+			  globalParams->getPSPaperHeight());
   if (psOut->isOk()) {
     doc->displayPages(psOut, firstPage, lastPage, 72, 72,
 		      0, globalParams->getPSCrop(), gFalse, gFalse);