[poppler] poppler/poppler: GlobalParams.cc, 1.13, 1.14 poppler-config.h.in, 1.4, 1.5

[Kristian Høgsberg]

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

Modified Files:
	GlobalParams.cc poppler-config.h.in 
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: GlobalParams.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/GlobalParams.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- GlobalParams.cc	12 Jan 2006 23:54:08 -0000	1.13
+++ GlobalParams.cc	23 Jan 2006 18:52:48 -0000	1.14
@@ -23,9 +23,6 @@
 #ifdef WIN32
 #  include <shlobj.h>
 #endif
-#if HAVE_PAPER_H
-#include <paper.h>
-#endif
 #include <fontconfig/fontconfig.h>
 #include "goo/gmem.h"
 #include "goo/GooString.h"
@@ -324,24 +321,8 @@
   cMapDirs = new GooHash(gTrue);
   toUnicodeDirs = new GooList();
   displayFonts = new GooHash();
-#if HAVE_PAPER_H
-  char *paperName;
-  const struct paper *paperType;
-  paperinit();
-  if ((paperName = systempapername())) {
-    paperType = paperinfo(paperName);
-    psPaperWidth = (int)paperpswidth(paperType);
-    psPaperHeight = (int)paperpsheight(paperType);
-  } else {
-    error(-1, "No paper information available - using defaults");
-    psPaperWidth = defPaperWidth;
-    psPaperHeight = defPaperHeight;
-  }
-  paperdone();
-#else
-  psPaperWidth = defPaperWidth;
-  psPaperHeight = defPaperHeight;
-#endif
+  psPaperWidth = -1;
+  psPaperHeight = -1;
   psImageableLLX = psImageableLLY = 0;
   psImageableURX = psPaperWidth;
   psImageableURY = psPaperHeight;

Index: poppler-config.h.in
===================================================================
RCS file: /cvs/poppler/poppler/poppler/poppler-config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- poppler-config.h.in	17 Oct 2005 02:17:52 -0000	1.4
+++ poppler-config.h.in	23 Jan 2006 18:52:48 -0000	1.5
@@ -14,11 +14,6 @@
 // around #undef look odd, but it's to silence warnings about
 // redefining those symbols.
 
-/* Use A4 paper size instead of Letter for PostScript output. */
-#ifndef A4_PAPER
-#undef A4_PAPER
-#endif
-
 /* Enable multithreading support. */
 #ifndef MULTITHREADING
 #undef MULTITHREADED