autogen.sh | 19 ++++++++++--------- poppler/Parser.cc | 2 +- poppler/poppler-config.h.cmake | 2 +- poppler/poppler-config.h.in | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)
New commits: commit 1e1b9991a911fb610e74119979b20b179f3f2a67 Author: Albert Astals Cid <[email protected]> Date: Mon Jan 6 21:51:25 2014 +0100 Fix rendering of pdf file from KDE bug 329600 It used to work and regressed with large file support (used to work because stuff just overflowed) lexer->getPos needs lexer to be a stream, if it is not, just resort to the +5000 kludge diff --git a/poppler/Parser.cc b/poppler/Parser.cc index a021994..c0230c8 100644 --- a/poppler/Parser.cc +++ b/poppler/Parser.cc @@ -248,7 +248,7 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey, } else { error(errSyntaxError, getPos(), "Missing 'endstream' or incorrect stream length"); if (strict) return NULL; - if (xref) { + if (xref && lexer->getStream()) { // shift until we find the proper endstream or we change to another object or reach eof length = lexer->getPos() - pos; if (buf1.isCmd("endstream")) { commit 4cd5c349cfbc745688c0c38fc50d364092bc3718 Author: Albert Astals Cid <[email protected]> Date: Mon Jan 6 21:48:25 2014 +0100 Update popplers (C) diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index 71a3278..c4067c0 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -117,7 +117,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org"; +#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"; #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in index c5e181c..ada3434 100644 --- a/poppler/poppler-config.h.in +++ b/poppler/poppler-config.h.in @@ -117,7 +117,7 @@ //------------------------------------------------------------------------ // copyright notice -#define popplerCopyright "Copyright 2005-2013 The Poppler Developers - http://poppler.freedesktop.org"; +#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"; #define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" //------------------------------------------------------------------------ commit 7ca2f42b06757587dfd9521fb1c6c7d657545553 Author: Albert Astals Cid <[email protected]> Date: Mon Jan 6 15:48:22 2014 +0100 Learn about automake 1.14 diff --git a/autogen.sh b/autogen.sh index f895462..ab51eb3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,15 +10,16 @@ REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.7} case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.13 automake-1.12" ;; - 1.13*) automake_progs="automake-1.13" ;; + 1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; + 1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; + 1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; + 1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;; + 1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;; + 1.13*) automake_progs="automake-1.14 automake-1.13" ;; + 1.14*) automake_progs="automake-1.14" ;; esac # Print types _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
