Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2013-01-07 17:33:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2012-12-20 11:06:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2013-01-07 17:33:31.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Jan 4 12:01:11 UTC 2013 - [email protected] + +- Update to version 0.22.0: + + core: + - Fix crash in invalid files that define a <= 0 bits per image + value + - Fix a few issues in JPX decoding when not using OpenJPEG + - TextOutputDev: Use page size for max value in + TextPage::visitSelection + - Fix typo in error message + + utils: + - Fix pdfunite regression (fdo#358569) + - Demo fixes and improvements + + misc: + - pdf-inspector improvements + +------------------------------------------------------------------- poppler.changes: same change Old: ---- poppler-0.21.4.tar.gz New: ---- poppler-0.22.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.U1MgSQ/_old 2013-01-07 17:33:32.000000000 +0100 +++ /var/tmp/diff_new_pack.U1MgSQ/_new 2013-01-07 17:33:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler-qt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,11 @@ Name: poppler-qt %define _name poppler -Version: 0.21.4 +Version: 0.22.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 33 +%define poppler_soname 34 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.U1MgSQ/_old 2013-01-07 17:33:32.000000000 +0100 +++ /var/tmp/diff_new_pack.U1MgSQ/_new 2013-01-07 17:33:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,11 @@ Name: poppler %define _name poppler -Version: 0.21.4 +Version: 0.22.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 33 +%define poppler_soname 34 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler-0.21.4.tar.gz -> poppler-0.22.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/CMakeLists.txt new/poppler-0.22.0/CMakeLists.txt --- old/poppler-0.21.4/CMakeLists.txt 2012-12-15 16:38:27.000000000 +0100 +++ new/poppler-0.22.0/CMakeLists.txt 2012-12-29 19:45:50.000000000 +0100 @@ -15,8 +15,8 @@ test_big_endian(WORDS_BIGENDIAN) set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "21") -set(POPPLER_MICRO_VERSION "4") +set(POPPLER_MINOR_VERSION "22") +set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -396,7 +396,7 @@ else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 33.0.0 SOVERSION 33) +set_target_properties(poppler PROPERTIES VERSION 34.0.0 SOVERSION 34) target_link_libraries(poppler ${poppler_LIBS}) target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "") install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/ChangeLog new/poppler-0.22.0/ChangeLog --- old/poppler-0.21.4/ChangeLog 2012-12-15 16:42:39.000000000 +0100 +++ new/poppler-0.22.0/ChangeLog 2012-12-29 19:47:11.000000000 +0100 @@ -1,3 +1,162 @@ +commit 801f7feea79e5bc3b5417566552e4df1e6b8a51c +Author: Albert Astals Cid <[email protected]> +Date: Sat Dec 29 19:22:54 2012 +0100 + + 0.22.0 + + CMakeLists.txt | 6 +++--- + NEWS | 14 ++++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 22 insertions(+), 8 deletions(-) + +commit bf5ef68c89d4189b18458b764f807cfc6599bad7 +Author: Carlos Garcia Campos <[email protected]> +Date: Sat Dec 29 19:43:11 2012 +0100 + + regtest: Print test results when the test has finished + + To make sure the result corresponds to the test now that we are using + multiple threads. + + regtest/Printer.py | 25 +++++++++++++++++++------ + regtest/TestRun.py | 18 +++++++++--------- + 2 files changed, 28 insertions(+), 15 deletions(-) + +commit 80c7f6aa3fa83175fafc71fa8c834350d513a48f +Author: Jason Crain <[email protected]> +Date: Fri Nov 23 23:31:01 2012 -0600 + + TextOutputDev: Use page size for max value in TextPage::visitSelection + + https://bugs.freedesktop.org/show_bug.cgi?id=50138 + + poppler/TextOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0d31edfa5617f4fecb04d5476de54a63b6146686 +Author: Ross Lagerwall <[email protected]> +Date: Fri Nov 30 09:23:55 2012 +0000 + + pdf-inspector Change from the deprecated GtkTable to GtkGrid + + This fixes the problem of the description_label height changing after + its text changes which was introduced since the port to Gtk3. + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.ui | 39 +++++++++++++++------------------------ + 1 file changed, 15 insertions(+), 24 deletions(-) + +commit 9977a4f26b5698b0b85ca911e7392013941944e0 +Author: Ross Lagerwall <[email protected]> +Date: Tue Nov 13 15:49:44 2012 +0000 + + pdf-inspector: Remove deprectated has-separator property + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.ui | 1 - + 1 file changed, 1 deletion(-) + +commit 806d116a38c2a6552c9bcee2c6f753d7059c17aa +Author: Ross Lagerwall <[email protected]> +Date: Tue Nov 13 15:44:15 2012 +0000 + + pdf-inspector: Add correct title and copyright + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 7d5bf74c19768fa3447819a4debff06d5d83900a +Author: Ross Lagerwall <[email protected]> +Date: Tue Nov 13 15:23:36 2012 +0000 + + pdf-inspector: Fix crash by not freeing filename_g + + It is not necessary because PDFDoc takes over filename_g and destroys + it in its deconstructor. + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.cc | 1 - + 1 file changed, 1 deletion(-) + +commit d61c6d4944d6f7c9e8b517dd28958124f4923d08 +Author: Thomas Freitag <[email protected]> +Date: Fri Dec 28 01:18:48 2012 +0100 + + Repair pdfunite + + Sorry, when I implemented the support encrypted pdf files in + pdfseparate I + missed that writePageObjects of course is also used in pdfunite + for combining + pages, and even more that encrypted files are still not supported + by pdfunite, + I removed the numoffset from writing the objects itself. Therefore + there are + still all objects in the combined pdf file, but the references + missing the + numoffset and therefore were no more reachable. + The patch repairs it. + + Bug #58569 + + poppler/PDFDoc.cc | 6 ++++-- + poppler/PDFDoc.h | 4 ++-- + utils/pdfunite.cc | 4 ++-- + 3 files changed, 8 insertions(+), 6 deletions(-) + +commit be4804bff2b722ceac180da52ad436fee548f9ee +Author: Albert Astals Cid <[email protected]> +Date: Fri Dec 28 01:17:14 2012 +0100 + + dos2unix + + poppler/PDFDoc.cc | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 703c77eb59aa22ab6372d56a20ee81dc7dfa6e4a +Author: Even Rouault <[email protected]> +Date: Fri Dec 28 00:57:17 2012 +0100 + + Fix very long loop in JPXStream::getImageParams() + + poppler/JPXStream.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 7e0be7854adc49e4e00c0badb0dc470fbdf6d612 +Author: Even Rouault <[email protected]> +Date: Fri Dec 28 00:44:29 2012 +0100 + + Avoid DoS due to huge number of JPX tiles in a stream + + poppler/JPXStream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2017dbebd9afd4f172242ff8462fce739d911e64 +Author: Even Rouault <[email protected]> +Date: Fri Dec 28 00:30:13 2012 +0100 + + Do not crash on 0 or negative nBits values + + poppler/Stream.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 858df0dc04e2f306e806fe0fc4fb5c8ec804e263 +Author: Albert Astals Cid <[email protected]> +Date: Thu Dec 27 23:30:27 2012 +0100 + + Fix arg typo + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 1dd6280d79ad22461208702b3c929377887c99ff Author: Albert Astals Cid <[email protected]> Date: Sat Dec 15 16:39:23 2012 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/NEWS new/poppler-0.22.0/NEWS --- old/poppler-0.21.4/NEWS 2012-12-15 16:36:32.000000000 +0100 +++ new/poppler-0.22.0/NEWS 2012-12-29 19:45:50.000000000 +0100 @@ -1,3 +1,17 @@ +Release 0.22.0 + core: + * Fix crash in invalid files that define a <= 0 bits per image value + * Fix a few issues in JPX decoding when not using OpenJPEG + * TextOutputDev: Use page size for max value in TextPage::visitSelection + * Fix typo in error message + + utils: + * Fix pdfunite regression (Bug #58569) + * Demo fixes and improvements + + misc: + * pdf-inspector improvements + Release 0.21.4 core: * SplashOutputDev: Fix crash when rendering in monochrome mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/configure new/poppler-0.22.0/configure --- old/poppler-0.21.4/configure 2012-12-15 16:40:44.000000000 +0100 +++ new/poppler-0.22.0/configure 2012-12-29 19:45:55.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for poppler 0.21.4. +# Generated by GNU Autoconf 2.69 for poppler 0.22.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='poppler' PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.21.4' -PACKAGE_STRING='poppler 0.21.4' +PACKAGE_VERSION='0.22.0' +PACKAGE_STRING='poppler 0.22.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -1510,7 +1510,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures poppler 0.21.4 to adapt to many kinds of systems. +\`configure' configures poppler 0.22.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1584,7 +1584,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.21.4:";; + short | recursive ) echo "Configuration of poppler 0.22.0:";; esac cat <<\_ACEOF @@ -1786,7 +1786,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.21.4 +poppler configure 0.22.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2480,7 +2480,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by poppler $as_me 0.21.4, which was +It was created by poppler $as_me 0.22.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3296,7 +3296,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.21.4' + VERSION='0.22.0' cat >>confdefs.h <<_ACEOF @@ -17538,7 +17538,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.21.4" +#define POPPLER_VERSION "0.22.0" _ACEOF @@ -23884,11 +23884,11 @@ POPPLER_MAJOR_VERSION=0 -POPPLER_MINOR_VERSION=21 +POPPLER_MINOR_VERSION=22 -POPPLER_MICRO_VERSION=4 +POPPLER_MICRO_VERSION=0 -POPPLER_VERSION=0.21.4 +POPPLER_VERSION=0.22.0 ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc" @@ -24524,7 +24524,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poppler $as_me 0.21.4, which was +This file was extended by poppler $as_me 0.22.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24590,7 +24590,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -poppler config.status 0.21.4 +poppler config.status 0.22.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/configure.ac new/poppler-0.22.0/configure.ac --- old/poppler-0.21.4/configure.ac 2012-12-15 16:36:53.000000000 +0100 +++ new/poppler-0.22.0/configure.ac 2012-12-29 19:45:50.000000000 +0100 @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[21]) -m4_define([poppler_version_micro],[4]) +m4_define([poppler_version_minor],[22]) +m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/cpp/poppler-version.h new/poppler-0.22.0/cpp/poppler-version.h --- old/poppler-0.21.4/cpp/poppler-version.h 2012-12-15 16:40:55.000000000 +0100 +++ new/poppler-0.22.0/cpp/poppler-version.h 2012-12-29 19:46:06.000000000 +0100 @@ -21,10 +21,10 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.21.4" +#define POPPLER_VERSION "0.22.0" #define POPPLER_VERSION_MAJOR 0 -#define POPPLER_VERSION_MINOR 21 -#define POPPLER_VERSION_MICRO 4 +#define POPPLER_VERSION_MINOR 22 +#define POPPLER_VERSION_MICRO 0 namespace poppler { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/glib/Poppler-0.18.gir new/poppler-0.22.0/glib/Poppler-0.18.gir --- old/poppler-0.21.4/glib/Poppler-0.18.gir 2012-12-15 16:41:39.000000000 +0100 +++ new/poppler-0.22.0/glib/Poppler-0.18.gir 2012-12-29 19:46:15.000000000 +0100 @@ -2849,10 +2849,10 @@ <constant name="MAJOR_VERSION" value="0" c:type="POPPLER_MAJOR_VERSION"> <type name="gint" c:type="gint"/> </constant> - <constant name="MICRO_VERSION" value="4" c:type="POPPLER_MICRO_VERSION"> + <constant name="MICRO_VERSION" value="0" c:type="POPPLER_MICRO_VERSION"> <type name="gint" c:type="gint"/> </constant> - <constant name="MINOR_VERSION" value="21" c:type="POPPLER_MINOR_VERSION"> + <constant name="MINOR_VERSION" value="22" c:type="POPPLER_MINOR_VERSION"> <type name="gint" c:type="gint"/> </constant> <class name="Media" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/glib/reference/html/ch01.html new/poppler-0.22.0/glib/reference/html/ch01.html --- old/poppler-0.21.4/glib/reference/html/ch01.html 2012-12-15 16:42:42.000000000 +0100 +++ new/poppler-0.22.0/glib/reference/html/ch01.html 2012-12-29 19:47:13.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp2631696"></a>Poppler</h2></div></div></div> +<a name="idp209344"></a>Poppler</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="poppler-poppler.html">poppler</a></span><span class="refpurpose"></span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/glib/reference/html/index.html new/poppler-0.22.0/glib/reference/html/index.html --- old/poppler-0.21.4/glib/reference/html/index.html 2012-12-15 16:42:42.000000000 +0100 +++ new/poppler-0.22.0/glib/reference/html/index.html 2012-12-29 19:47:13.000000000 +0100 @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for Poppler 0.21.4 + for Poppler 0.22.0 </p></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.22.0/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.21.4/glib/reference/html/poppler-Version-and-Features-Information.html 2012-12-15 16:42:42.000000000 +0100 +++ new/poppler-0.22.0/glib/reference/html/poppler-Version-and-Features-Information.html 2012-12-29 19:47:13.000000000 +0100 @@ -82,7 +82,7 @@ <hr> <div class="refsect2"> <a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3> -<pre class="programlisting">#define POPPLER_MINOR_VERSION (21) +<pre class="programlisting">#define POPPLER_MINOR_VERSION (22) </pre> <p> The major version number of the poppler header files (e.g. in poppler version @@ -93,7 +93,7 @@ <hr> <div class="refsect2"> <a name="POPPLER-MICRO-VERSION:CAPS"></a><h3>POPPLER_MICRO_VERSION</h3> -<pre class="programlisting">#define POPPLER_MICRO_VERSION (4) +<pre class="programlisting">#define POPPLER_MICRO_VERSION (0) </pre> <p> The micro version number of the poppler header files (e.g. in poppler version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/glib/reference/version.xml new/poppler-0.22.0/glib/reference/version.xml --- old/poppler-0.21.4/glib/reference/version.xml 2012-12-15 16:40:55.000000000 +0100 +++ new/poppler-0.22.0/glib/reference/version.xml 2012-12-29 19:46:06.000000000 +0100 @@ -1 +1 @@ -0.21.4 +0.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/poppler/JPXStream.cc new/poppler-0.22.0/poppler/JPXStream.cc --- old/poppler-0.21.4/poppler/JPXStream.cc 2012-09-26 15:00:04.000000000 +0200 +++ new/poppler-0.22.0/poppler/JPXStream.cc 2012-12-28 01:17:03.000000000 +0100 @@ -15,6 +15,7 @@ // // Copyright (C) 2008, 2012 Albert Astals Cid <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> +// Copyright (C) 2012 Even Rouault <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -529,13 +530,19 @@ csPrec = csPrec1; haveCSMode = gTrue; } - for (i = 0; i < dataLen - 7; ++i) { - bufStr->getChar(); + if( dataLen >= 7 ) { + for (i = 0; i < dataLen - 7; ++i) { + if (bufStr->getChar() == EOF) + break; + } } } } else { - for (i = 0; i < dataLen - 3; ++i) { - bufStr->getChar(); + if( dataLen >= 3 ) { + for (i = 0; i < dataLen - 3; ++i) { + if (bufStr->getChar() == EOF) + break; + } } } } @@ -974,7 +981,7 @@ / img.yTileSize; // check for overflow before allocating memory if (img.nXTiles <= 0 || img.nYTiles <= 0 || - img.nXTiles >= INT_MAX / img.nYTiles) { + img.nXTiles >= 65535 / img.nYTiles) { error(errSyntaxError, getPos(), "Bad tile count in JPX SIZ marker segment"); return gFalse; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/poppler/Makefile.am new/poppler-0.22.0/poppler/Makefile.am --- old/poppler-0.21.4/poppler/Makefile.am 2012-12-15 16:38:34.000000000 +0100 +++ new/poppler-0.22.0/poppler/Makefile.am 2012-12-29 19:45:50.000000000 +0100 @@ -177,7 +177,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 33:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@ if ENABLE_XPDF_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/poppler/Makefile.in new/poppler-0.22.0/poppler/Makefile.in --- old/poppler-0.21.4/poppler/Makefile.in 2012-12-15 16:40:45.000000000 +0100 +++ new/poppler-0.22.0/poppler/Makefile.in 2012-12-29 19:45:56.000000000 +0100 @@ -592,7 +592,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 33:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@ @ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler @ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \ @ENABLE_XPDF_HEADERS_TRUE@ $(splash_headers) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/poppler/PDFDoc.cc new/poppler-0.22.0/poppler/PDFDoc.cc --- old/poppler-0.21.4/poppler/PDFDoc.cc 2012-12-01 21:17:45.000000000 +0100 +++ new/poppler-0.22.0/poppler/PDFDoc.cc 2012-12-28 01:17:52.000000000 +0100 @@ -153,7 +153,7 @@ // Keep a copy of the errno returned by fopen so that it can be // referred to later. fopenErrno = errno; - error(errIO, -1, "Couldn't open file '{0:t}': {0:s}.", fileName, strerror(errno)); + error(errIO, -1, "Couldn't open file '{0:t}': {1:s}.", fileName, strerror(errno)); errCode = errOpenFile; return; } @@ -610,15 +610,15 @@ OutStream *outStr; XRef *yRef, *countRef; int rootNum = getXRef()->getNumObjects() + 1; - - // Make sure that special flags are set, because we are going to read - // all objects, including Unencrypted ones. - xref->scanSpecialFlags(); - - Guchar *fileKey; - CryptAlgorithm encAlgorithm; - int keyLength; - xref->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength); + + // Make sure that special flags are set, because we are going to read + // all objects, including Unencrypted ones. + xref->scanSpecialFlags(); + + Guchar *fileKey; + CryptAlgorithm encAlgorithm; + int keyLength; + xref->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength); if (pageNo < 1 || pageNo > getNumPages()) { error(errInternal, -1, "Illegal pageNo: {0:d}({1:d})", pageNo, getNumPages() ); @@ -1526,13 +1526,13 @@ } } -Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset) +Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, GBool combine) { Guint objectsCount = 0; //count the number of objects in the XRef(s) - Guchar *fileKey; - CryptAlgorithm encAlgorithm; - int keyLength; - xRef->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength); + Guchar *fileKey; + CryptAlgorithm encAlgorithm; + int keyLength; + xRef->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength); for (int n = numOffset; n < xRef->getNumObjects(); n++) { if (xRef->getEntry(n)->type != xrefEntryFree) { @@ -1543,11 +1543,13 @@ objectsCount++; getXRef()->fetch(ref.num - numOffset, ref.gen, &obj); Guint offset = writeObjectHeader(&ref, outStr); - if (xRef->getEntry(n)->getFlag(XRefEntry::Unencrypted)) { - writeObject(&obj, outStr, NULL, cryptRC4, 0, 0, 0); - } else { - writeObject(&obj, outStr, fileKey, encAlgorithm, keyLength, ref.num, ref.gen); - } + if (combine) { + writeObject(&obj, outStr, getXRef(), numOffset, NULL, cryptRC4, 0, 0, 0); + } else if (xRef->getEntry(n)->getFlag(XRefEntry::Unencrypted)) { + writeObject(&obj, outStr, NULL, cryptRC4, 0, 0, 0); + } else { + writeObject(&obj, outStr, fileKey, encAlgorithm, keyLength, ref.num, ref.gen); + } writeObjectFooter(outStr); xRef->add(ref.num, ref.gen, offset, gTrue); obj.free(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/poppler/PDFDoc.h new/poppler-0.22.0/poppler/PDFDoc.h --- old/poppler-0.21.4/poppler/PDFDoc.h 2012-12-01 01:42:27.000000000 +0100 +++ new/poppler-0.22.0/poppler/PDFDoc.h 2012-12-28 01:18:27.000000000 +0100 @@ -22,7 +22,7 @@ // Copyright (C) 2009 Kovid Goyal <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2010 Srinivas Adicherla <[email protected]> -// Copyright (C) 2011 Thomas Freitag <[email protected]> +// Copyright (C) 2011, 2012 Thomas Freitag <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // // To see a description of the changes please see the Changelog file that @@ -243,7 +243,7 @@ void replacePageDict(int pageNo, int rotate, PDFRectangle *mediaBox, PDFRectangle *cropBox, Object *pageCTM); void markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset); // write all objects used by pageDict to outStr - Guint writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset); + Guint writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, GBool combine = gFalse); static void writeObject (Object *obj, OutStream* outStr, XRef *xref, Guint numOffset, Guchar *fileKey, CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen); static void writeHeader(OutStream *outStr, int major, int minor); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/poppler/Stream.cc new/poppler-0.22.0/poppler/Stream.cc --- old/poppler-0.21.4/poppler/Stream.cc 2012-12-01 01:42:27.000000000 +0100 +++ new/poppler-0.22.0/poppler/Stream.cc 2012-12-28 01:17:03.000000000 +0100 @@ -26,6 +26,7 @@ // Copyright (C) 2012 Thomas Freitag <[email protected]> // Copyright (C) 2012 Oliver Sander <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> +// Copyright (C) 2012 Even Rouault <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -419,11 +420,11 @@ nVals = width * nComps; inputLineSize = (nVals * nBits + 7) >> 3; - if (nVals > INT_MAX / nBits - 7) { + if (nBits <= 0 || nVals > INT_MAX / nBits - 7) { // force a call to gmallocn(-1,...), which will throw an exception inputLineSize = -1; } - inputLine = (Guchar *)gmallocn(inputLineSize, sizeof(char)); + inputLine = (Guchar *)gmallocn_checkoverflow(inputLineSize, sizeof(char)); if (nBits == 8) { imgLine = (Guchar *)inputLine; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/poppler/TextOutputDev.cc new/poppler-0.22.0/poppler/TextOutputDev.cc --- old/poppler-0.21.4/poppler/TextOutputDev.cc 2012-12-15 16:29:14.000000000 +0100 +++ new/poppler-0.22.0/poppler/TextOutputDev.cc 2012-12-29 19:11:54.000000000 +0100 @@ -4615,7 +4615,8 @@ if (!best_block[i] || d < best_d[i] || (!blk->next && !flow->next && - x[i] > xMax && y[i] > yMax)) { + x[i] >= fmin(xMax, pageWidth) && + y[i] >= fmin(yMax, pageHeight))) { best_block[i] = blk; best_flow[i] = flow; best_count[i] = count; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/test/pdf-inspector.cc new/poppler-0.22.0/test/pdf-inspector.cc --- old/poppler-0.21.4/test/pdf-inspector.cc 2012-04-27 01:11:04.000000000 +0200 +++ new/poppler-0.22.0/test/pdf-inspector.cc 2012-12-29 19:11:54.000000000 +0100 @@ -1,9 +1,8 @@ //======================================================================== // -// GDKSplashOutputDev.cc +// pdf-inspector.cc // -// Copyright 2003 Glyph & Cog, LLC -// Copyright 2004 Red Hat, Inc. (GDK port) +// Copyright 2005 Jonathan Blandford <[email protected]> // //======================================================================== @@ -287,7 +286,6 @@ filename_g = new GooString (file_name); doc = new PDFDoc(filename_g, 0, 0); - delete filename_g; } if (doc && !doc->isOk()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/test/pdf-inspector.ui new/poppler-0.22.0/test/pdf-inspector.ui --- old/poppler-0.21.4/test/pdf-inspector.ui 2012-04-27 01:11:04.000000000 +0200 +++ new/poppler-0.22.0/test/pdf-inspector.ui 2012-12-29 19:11:54.000000000 +0100 @@ -26,7 +26,6 @@ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="focus_on_map">True</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> @@ -218,11 +217,10 @@ </packing> </child> <child> - <object class="GtkTable" id="table2"> + <object class="GtkGrid" id="grid"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">3</property> - <property name="homogeneous">False</property> + <property name="row-homogeneous">False</property> + <property name="column-homogeneous">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> @@ -244,12 +242,10 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">0</property> - <property name="right_attach">1</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"/> + <property name="width">1</property> </packing> </child> <child> @@ -271,12 +267,10 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">1</property> - <property name="right_attach">3</property> <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"/> + <property name="width">2</property> </packing> </child> <child> @@ -298,12 +292,10 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">0</property> - <property name="right_attach">1</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="width">1</property> </packing> </child> <child> @@ -325,17 +317,16 @@ <property name="angle">0</property> </object> <packing> + <property name="height">1</property> <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options">fill</property> + <property name="width">1</property> </packing> </child> <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="xalign">0.5</property> + <property name="xalign">1</property> <property name="yalign">0</property> <property name="xscale">0.0</property> <property name="yscale">0.0</property> @@ -343,6 +334,7 @@ <property name="bottom_padding">0</property> <property name="left_padding">0</property> <property name="right_padding">0</property> + <property name="hexpand">True</property> <child> <object class="GtkButton" id="analyze_button"> <property name="visible">True</property> @@ -355,12 +347,10 @@ </child> </object> <packing> + <property name="height">1</property> <property name="left_attach">2</property> - <property name="right_attach">3</property> <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="width">1</property> </packing> </child> </object> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.21.4/utils/pdfunite.cc new/poppler-0.22.0/utils/pdfunite.cc --- old/poppler-0.21.4/utils/pdfunite.cc 2012-11-12 00:42:47.000000000 +0100 +++ new/poppler-0.22.0/utils/pdfunite.cc 2012-12-28 01:18:37.000000000 +0100 @@ -4,7 +4,7 @@ // // This file is licensed under the GPLv2 or later // -// Copyright (C) 2011 Thomas Freitag <[email protected]> +// Copyright (C) 2011, 2012 Thomas Freitag <[email protected]> // Copyright (C) 2012 Arseny Solokha <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2012 Albert Astals Cid <[email protected]> @@ -122,7 +122,7 @@ Dict *pageDict = page.getDict(); docs[i]->markPageObjects(pageDict, yRef, countRef, numOffset); } - objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset); + objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset, gTrue); numOffset = yRef->getNumObjects() + 1; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
