summaryrefslogtreecommitdiff
path: root/poppler
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2006-01-23 18:52:48 +0000
committerKristian Høgsberg <krh@redhat.com>2006-01-23 18:52:48 +0000
commit052bf4b80c8a0dc45f6222617bfd8ae1b9c40410 (patch)
treec86856220b8e2aacaea88c19526506361d4b2d54 /poppler
parentfb2054a5031d60aac3ccc9a36b3ed88a32188e33 (diff)
2006-01-23 Kristian Høgsberg <krh@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.
Diffstat (limited to 'poppler')
-rw-r--r--poppler/GlobalParams.cc23
-rw-r--r--poppler/poppler-config.h.in5
2 files changed, 2 insertions, 26 deletions
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