From 052bf4b80c8a0dc45f6222617bfd8ae1b9c40410 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@redhat.com>
Date: Mon, 23 Jan 2006 18:52:48 +0000
Subject: 2006-01-23  Kristian Høgsberg  <krh@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

        * 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.
---
 poppler/GlobalParams.cc     | 23 ++---------------------
 poppler/poppler-config.h.in |  5 -----
 2 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'poppler')

diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 11697fc8..49c05907 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -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 @@ GlobalParams::GlobalParams(char *cfgFileName) {
   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;
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index f93e5c01..bd0dd5cd 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -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
-- 
cgit v1.2.3