summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-06 08:19:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-06 08:19:56 +0000
commit72351c3e68ec7574a578bd41f7a0b17578d857af (patch)
tree84f9dfe9627578aee454107602231168c950cc83 /Build/source/texk/web2c/luatexdir
parentf4c2f03b11aecc0d90f836edfd44da8bd24e1bd8 (diff)
support libpoppler as 'system-xpdf'
git-svn-id: svn://tug.org/texlive/trunk@12943 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc9
-rw-r--r--Build/source/texk/web2c/luatexdir/utils/utils.c11
3 files changed, 24 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index b117200df37..acf8f253f7f 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * image/pdftoepdf.cc, utils/utils.c: adapt for poppler.
+
+ patches from Norbert Preinig <preining@logic.at>
+
2009-04-27 Taco Hoekwater <taco@luatex.org>
* pdf/pdfpage.c: rename exp10 to exp10_arr to solve a
diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc
index 41d9fe0caec..ac74cde7e63 100644
--- a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc
+++ b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc
@@ -24,11 +24,20 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
+#ifdef POPPLER_VERSION
+#define GString GooString
+#include <dirent.h>
+#include <poppler-config.h>
+#include <goo/GooString.h>
+#include <goo/gmem.h>
+#include <goo/gfile.h>
+#else
#include <aconf.h>
#include <GString.h>
#include <gmem.h>
#include <gfile.h>
#include <assert.h>
+#endif
#include "Object.h"
#include "Stream.h"
#include "Array.h"
diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.c b/Build/source/texk/web2c/luatexdir/utils/utils.c
index 926fef3d34a..f6afa5687ae 100644
--- a/Build/source/texk/web2c/luatexdir/utils/utils.c
+++ b/Build/source/texk/web2c/luatexdir/utils/utils.c
@@ -40,7 +40,14 @@
#include "ptexlib.h"
#include "png.h"
+#ifdef POPPLER_VERSION
+#define xpdfString "poppler"
+#define xpdfVersion POPPLER_VERSION
+#include "poppler-config.h"
+#else
+#define xpdfString "xpdf"
#include "xpdf/config.h" /* just to get the xpdf version */
+#endif
static const char __svn_version[] =
"$Id: utils.c 2329 2009-04-18 14:25:30Z hhenkel $ "
@@ -1125,9 +1132,9 @@ void initversionstring(char **versions)
(void) asprintf(versions,
"Compiled with libpng %s; using libpng %s\n"
"Compiled with zlib %s; using zlib %s\n"
- "Compiled with xpdf version %s\n",
+ "Compiled with %s version %s\n",
PNG_LIBPNG_VER_STRING, png_libpng_ver,
- ZLIB_VERSION, zlib_version, xpdfVersion);
+ ZLIB_VERSION, zlib_version, xpdfString, xpdfVersion);
}
/*************************************************/