From d1028259a790fbbef87c2ce47f046057f15489ab Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 28 Jun 2012 08:14:19 +0000 Subject: pdfTeX: allow to build with poppler >= 0.19.0 (aka system-xpdf) git-svn-id: svn://tug.org/texlive/trunk@26905 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/pdftexdir/am/libpdftex.am | 5 +++-- Build/source/texk/web2c/pdftexdir/pdftosrc.cc | 4 ++++ Build/source/texk/web2c/pdftexdir/utils.c | 4 ---- 4 files changed, 12 insertions(+), 6 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 2ecbc91e195..193779bdf95 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-06-21 Peter Breitenlohner + + * pdftosrc.cc: Use XRef::getNumObjects instead of XRef::getSize, + required for poppler >= 0.19.0. + 2012-05-20 Thanh Han The * pdftex.defines (get/setimagegroupref): these replace imagegroupref. diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am index 32cb0e889d1..c7c5042585f 100644 --- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am @@ -1,13 +1,13 @@ ## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex. ## -## Copyright (C) 2009-2011 Peter Breitenlohner +## Copyright (C) 2009-2012 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## libpdftex ## EXTRA_LIBRARIES += libpdftex.a -libpdftex_a_CPPFLAGS = $(pdftex_cppflags) +libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags) libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) libpdftex_a_SOURCES = \ @@ -41,6 +41,7 @@ libpdftex_a_SOURCES = \ pdftexdir/writezip.c if MINGW32 +REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex libpdftex_a_SOURCES += \ pdftexdir/regex/regex.c \ pdftexdir/regex/regex.h diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc index 86a2c425117..de4ba6ebcb4 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc +++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc @@ -134,7 +134,11 @@ int main(int argc, char *argv[]) exit(1); } if (extract_xref_table) { +#ifdef POPPLER_VERSION + int size = xref->getNumObjects(); +#else int size = xref->getSize(); +#endif int i; for (i = 0; i < size; i++) { if (xref->getEntry(i)->offset == 0xffffffff) diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c index 776a99dd7e5..af8794df243 100644 --- a/Build/source/texk/web2c/pdftexdir/utils.c +++ b/Build/source/texk/web2c/pdftexdir/utils.c @@ -25,11 +25,7 @@ with this program. If not, see . #else #include #endif -#ifdef __MINGW32__ -#include -#else #include -#endif #include #include #include -- cgit v1.2.3