Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2013-03-12 17:18:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-03-04 17:33:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2013-03-12 17:18:28.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Mar 12 12:51:07 UTC 2013 - [email protected] + +- Update to version 0.22.2: + + core: + - Correct rendering of underline and strike out annotations + (fdo#61518) + - Workaround broken jpeg stream definitions (fdo#61994) + - SplashOutputDev: Restore CTM on early exits (fdo#61413) + - SplashOutputDev: Make sure we don't try to paint in x < 0 + (kde#315432) + - Fix latin page labels. (fdo#61034) + - Fix minor valgrind warning + + utils: + - pdfimages: Fix extraction of some images (fdo#61168) + + build system: + - Fix the build with automake-1.13 + +------------------------------------------------------------------- poppler.changes: same change Old: ---- poppler-0.22.1.tar.gz New: ---- poppler-0.22.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.hzMqBP/_old 2013-03-12 17:18:31.000000000 +0100 +++ /var/tmp/diff_new_pack.hzMqBP/_new 2013-03-12 17:18:31.000000000 +0100 @@ -20,11 +20,11 @@ Name: poppler-qt %define _name poppler -Version: 0.22.1 +Version: 0.22.2 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 34 +%define poppler_soname 35 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.hzMqBP/_old 2013-03-12 17:18:31.000000000 +0100 +++ /var/tmp/diff_new_pack.hzMqBP/_new 2013-03-12 17:18:31.000000000 +0100 @@ -20,11 +20,11 @@ Name: poppler %define _name poppler -Version: 0.22.1 +Version: 0.22.2 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 34 +%define poppler_soname 35 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler-0.22.1.tar.gz -> poppler-0.22.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/CMakeLists.txt new/poppler-0.22.2/CMakeLists.txt --- old/poppler-0.22.1/CMakeLists.txt 2013-02-10 11:47:03.000000000 +0100 +++ new/poppler-0.22.2/CMakeLists.txt 2013-03-11 18:46:37.000000000 +0100 @@ -16,7 +16,7 @@ set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "22") -set(POPPLER_MICRO_VERSION "1") +set(POPPLER_MICRO_VERSION "2") 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 34.0.0 SOVERSION 34) +set_target_properties(poppler PROPERTIES VERSION 35.0.0 SOVERSION 35) 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.22.1/ChangeLog new/poppler-0.22.2/ChangeLog --- old/poppler-0.22.1/ChangeLog 2013-02-10 11:50:21.000000000 +0100 +++ new/poppler-0.22.2/ChangeLog 2013-03-11 18:54:56.000000000 +0100 @@ -1,3 +1,161 @@ +commit 5db6585c2b02dd4071f1adabd53509506333dcf8 +Author: Albert Astals Cid <[email protected]> +Date: Fri Mar 8 16:38:49 2013 +0100 + + Make the non jpeglib based DCTStream compile + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6402e291e1f9374fbaf4de3b97b21f43d38d6ab8 +Author: Thomas Freitag <[email protected]> +Date: Fri Mar 8 16:37:11 2013 +0100 + + Workaround broken jpeg stream definitions + + Bug #61994 + + poppler/DCTStream.cc | 22 +++++++++++++++++++--- + poppler/DCTStream.h | 6 +++++- + poppler/Stream.cc | 8 ++++---- + poppler/Stream.h | 4 ++-- + 4 files changed, 30 insertions(+), 10 deletions(-) + +commit 4e142b60790638e4495b4fd6551702470cf4c38f +Author: Albert Astals Cid <[email protected]> +Date: Mon Mar 4 20:12:01 2013 +0100 + + Make sure we don't try to paint in x < 0 + + Fixes crash in KDE bug #315432 + + splash/Splash.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a766740cf5a5a7580935a026bf15fbd668aa0fdf +Author: Thomas Freitag <[email protected]> +Date: Fri Mar 1 19:12:22 2013 +0100 + + Restore CTM on early exits + + Bug #61413 + + poppler/SplashOutputDev.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 39882dfecdccc00db353946a31d395582ee37022 +Author: José Aliste <[email protected]> +Date: Wed Feb 27 01:33:38 2013 +0100 + + Correct rendering of underline and strike out annotations + + Current code assumes that the text to underline or strike out is + horizontal. + Fixes bug #61518 + + poppler/Annot.cc | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit 8d62625610746ad70ffb88d845791fa03f5e35cc +Author: Thomas Fischer <[email protected]> +Date: Wed Feb 20 21:07:10 2013 +0100 + + height -> maskHeight + + Bug #61168 + + utils/ImageOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8fb243bf11a979af8bfa36427436940706c9f71d +Author: Albert Astals Cid <[email protected]> +Date: Tue Feb 19 23:59:17 2013 +0100 + + Initialize cSrcNonIso[3] in splashModeXBGR8 + + Fixes valgrind warning + + splash/Splash.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8a0199a0247c1a03a4d64375ca8bc900570d1817 +Author: Albert Astals Cid <[email protected]> +Date: Tue Feb 19 23:11:46 2013 +0100 + + Fix indent + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1389aa41b2984de9da7bb66c11485f6c6aeaea41 +Author: Albert Astals Cid <[email protected]> +Date: Tue Feb 19 22:25:56 2013 +0100 + + fix indent + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ffd33e7b5aea44bc54a74f433f6bfff859b913dd +Author: Albert Astals Cid <[email protected]> +Date: Tue Feb 19 11:31:22 2013 +0100 + + Fix missing ) here too + + README.contributors | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14466ecc320387c9b6568280614a96e6f56309b4 +Author: Albert Astals Cid <[email protected]> +Date: Tue Feb 19 11:31:02 2013 +0100 + + Forgot my C here + + poppler/PageLabelInfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 47f30fa96e62fc215c0e80f42517908760ef8065 +Author: Brad Hards <[email protected]> +Date: Mon Feb 18 20:38:10 2013 +1100 + + Minor rewording of contributor README + + README.contributors | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 95609be551fc4413874b8980010be70fbbab112a +Author: Albert Astals Cid <[email protected]> +Date: Mon Feb 18 19:47:19 2013 +0100 + + Use the toLatin function in PageLabelInfo::indexToLabel + + Wonder why Kristian never enabled it? + Fixes bug #61034 + + poppler/PageLabelInfo.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5c7057c61ed6e270e001c1f86632f265bebb6890 +Author: Nuno Araujo <[email protected]> +Date: Tue Feb 12 23:54:47 2013 +0100 + + Fix the build with automake-1.13 + + autogen.sh | 17 +++++++++-------- + configure.ac | 3 +-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 9fc4b9f7a7e6105a6fd85aed9c21b78742e89ddd +Author: Peter Breitenlohner <[email protected]> +Date: Tue Feb 12 22:58:17 2013 +0100 + + true->TRUE + + Fixes compilation with jpeglib9 + + goo/JpegWriter.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + commit dca21f86359b6b2a925f7b05a2f36ab854cefbce Author: Albert Astals Cid <[email protected]> Date: Sun Feb 10 11:47:21 2013 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/NEWS new/poppler-0.22.2/NEWS --- old/poppler-0.22.1/NEWS 2013-02-10 11:46:34.000000000 +0100 +++ new/poppler-0.22.2/NEWS 2013-03-11 18:45:23.000000000 +0100 @@ -1,3 +1,19 @@ +Release 0.22.2 + core: + * Correct rendering of underline and strike out annotations (Bug #61518) + * Workaround broken jpeg stream definitions (Bug #61994) + * SplashOutputDev: Restore CTM on early exits (Bug #61413) + * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432) + * Fix latin page labels. (Bug #61034) + * Fix compilation with jpeglib9 + * Fix minor valgrind warning + + utils: + * pdfimages: Fix extraction of some images (Bug #61168) + + build system: + * Fix the build with automake-1.13 + Release 0.22.1 core: * Fix crash in some pdf files when extracting text (Bug #59561) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/aclocal.m4 new/poppler-0.22.2/aclocal.m4 --- old/poppler-0.22.1/aclocal.m4 2013-02-10 11:48:36.000000000 +0100 +++ new/poppler-0.22.2/aclocal.m4 2013-03-11 18:47:31.000000000 +0100 @@ -1576,18 +1576,6 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/configure new/poppler-0.22.2/configure --- old/poppler-0.22.1/configure 2013-02-10 11:48:37.000000000 +0100 +++ new/poppler-0.22.2/configure 2013-03-11 18:47:32.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.22.1. +# Generated by GNU Autoconf 2.69 for poppler 0.22.2. # # 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.22.1' -PACKAGE_STRING='poppler 0.22.1' +PACKAGE_VERSION='0.22.2' +PACKAGE_STRING='poppler 0.22.2' 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.22.1 to adapt to many kinds of systems. +\`configure' configures poppler 0.22.2 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.22.1:";; + short | recursive ) echo "Configuration of poppler 0.22.2:";; 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.22.1 +poppler configure 0.22.2 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.22.1, which was +It was created by poppler $as_me 0.22.2, 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.22.1' + VERSION='0.22.2' cat >>confdefs.h <<_ACEOF @@ -3375,9 +3375,7 @@ fi AM_BACKSLASH='\' -ac_config_headers="$ac_config_headers config.h" - -ac_config_headers="$ac_config_headers poppler/poppler-config.h" +ac_config_headers="$ac_config_headers config.h poppler/poppler-config.h" DEPDIR="${am__leading_dot}deps" @@ -17621,7 +17619,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.22.1" +#define POPPLER_VERSION "0.22.2" _ACEOF @@ -23969,9 +23967,9 @@ POPPLER_MINOR_VERSION=22 -POPPLER_MICRO_VERSION=1 +POPPLER_MICRO_VERSION=2 -POPPLER_VERSION=0.22.1 +POPPLER_VERSION=0.22.2 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" @@ -24607,7 +24605,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.22.1, which was +This file was extended by poppler $as_me 0.22.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24673,7 +24671,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.22.1 +poppler config.status 0.22.2 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.22.1/configure.ac new/poppler-0.22.2/configure.ac --- old/poppler-0.22.1/configure.ac 2013-02-10 11:46:52.000000000 +0100 +++ new/poppler-0.22.2/configure.ac 2013-03-11 18:45:38.000000000 +0100 @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[22]) -m4_define([poppler_version_micro],[1]) +m4_define([poppler_version_micro],[2]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) @@ -8,8 +8,7 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -AM_CONFIG_HEADER(config.h) -AM_CONFIG_HEADER(poppler/poppler-config.h) +AC_CONFIG_HEADERS([config.h poppler/poppler-config.h]) AC_C_BIGENDIAN dnl ##### Initialize libtool. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/cpp/poppler-version.h new/poppler-0.22.2/cpp/poppler-version.h --- old/poppler-0.22.1/cpp/poppler-version.h 2013-02-10 11:48:46.000000000 +0100 +++ new/poppler-0.22.2/cpp/poppler-version.h 2013-03-11 18:47:43.000000000 +0100 @@ -21,10 +21,10 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.22.1" +#define POPPLER_VERSION "0.22.2" #define POPPLER_VERSION_MAJOR 0 #define POPPLER_VERSION_MINOR 22 -#define POPPLER_VERSION_MICRO 1 +#define POPPLER_VERSION_MICRO 2 namespace poppler { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/glib/Poppler-0.18.gir new/poppler-0.22.2/glib/Poppler-0.18.gir --- old/poppler-0.22.1/glib/Poppler-0.18.gir 2013-02-10 11:49:30.000000000 +0100 +++ new/poppler-0.22.2/glib/Poppler-0.18.gir 2013-03-11 18:48:29.000000000 +0100 @@ -2849,7 +2849,7 @@ <constant name="MAJOR_VERSION" value="0" c:type="POPPLER_MAJOR_VERSION"> <type name="gint" c:type="gint"/> </constant> - <constant name="MICRO_VERSION" value="1" c:type="POPPLER_MICRO_VERSION"> + <constant name="MICRO_VERSION" value="2" c:type="POPPLER_MICRO_VERSION"> <type name="gint" c:type="gint"/> </constant> <constant name="MINOR_VERSION" value="22" c:type="POPPLER_MINOR_VERSION"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/glib/reference/html/ch01.html new/poppler-0.22.2/glib/reference/html/ch01.html --- old/poppler-0.22.1/glib/reference/html/ch01.html 2013-02-10 11:50:23.000000000 +0100 +++ new/poppler-0.22.2/glib/reference/html/ch01.html 2013-03-11 18:54:58.000000000 +0100 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp5000896"></a>Poppler</h2></div></div></div> +<a name="idp203456"></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.22.1/glib/reference/html/index.html new/poppler-0.22.2/glib/reference/html/index.html --- old/poppler-0.22.1/glib/reference/html/index.html 2013-02-10 11:50:23.000000000 +0100 +++ new/poppler-0.22.2/glib/reference/html/index.html 2013-03-11 18:54:58.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.22.1 + for Poppler 0.22.2 </p></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.22.2/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.22.1/glib/reference/html/poppler-Version-and-Features-Information.html 2013-02-10 11:50:23.000000000 +0100 +++ new/poppler-0.22.2/glib/reference/html/poppler-Version-and-Features-Information.html 2013-03-11 18:54:58.000000000 +0100 @@ -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 (1) +<pre class="programlisting">#define POPPLER_MICRO_VERSION (2) </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.22.1/glib/reference/version.xml new/poppler-0.22.2/glib/reference/version.xml --- old/poppler-0.22.1/glib/reference/version.xml 2013-02-10 11:48:46.000000000 +0100 +++ new/poppler-0.22.2/glib/reference/version.xml 2013-03-11 18:47:43.000000000 +0100 @@ -1 +1 @@ -0.22.1 +0.22.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/goo/JpegWriter.cc new/poppler-0.22.2/goo/JpegWriter.cc --- old/poppler-0.22.1/goo/JpegWriter.cc 2013-01-07 00:55:40.000000000 +0100 +++ new/poppler-0.22.2/goo/JpegWriter.cc 2013-02-20 21:08:45.000000000 +0100 @@ -8,6 +8,7 @@ // Copyright (C) 2010, 2012 Adrian Johnson <[email protected]> // Copyright (C) 2010 Harry Roberts <[email protected]> // Copyright (C) 2011 Thomas Freitag <[email protected]> +// Copyright (C) 2013 Peter Breitenlohner <[email protected]> // //======================================================================== @@ -117,7 +118,7 @@ // Set quality if (priv->quality >= 0 && priv->quality <= 100) { - jpeg_set_quality(&priv->cinfo, priv->quality, true); + jpeg_set_quality(&priv->cinfo, priv->quality, TRUE); } // Use progressive mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/poppler/Annot.cc new/poppler-0.22.2/poppler/Annot.cc --- old/poppler-0.22.1/poppler/Annot.cc 2013-01-07 00:55:40.000000000 +0100 +++ new/poppler-0.22.2/poppler/Annot.cc 2013-02-28 19:44:09.000000000 +0100 @@ -23,7 +23,7 @@ // Copyright (C) 2008 Michael Vrable <[email protected]> // Copyright (C) 2008 Hugo Mercier <[email protected]> // Copyright (C) 2009 Ilya Gorenbein <[email protected]> -// Copyright (C) 2011 José Aliste <[email protected]> +// Copyright (C) 2011, 2013 José Aliste <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> // Copyright (C) 2012 Tobias Koenig <[email protected]> @@ -3601,14 +3601,15 @@ appearBuf->append ("[] 0 d 1 w\n"); for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { - double x1, x2, y3; + double x3, y3, x4, y4; - x1 = quadrilaterals->getX1(i); - x2 = quadrilaterals->getX2(i); + x3 = quadrilaterals->getX3(i); y3 = quadrilaterals->getY3(i); + x4 = quadrilaterals->getX4(i); + y4 = quadrilaterals->getY4(i); - appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3); - appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3); + appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3); + appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x4, y4); appearBuf->append ("S\n"); } break; @@ -3620,17 +3621,21 @@ appearBuf->append ("[] 0 d 1 w\n"); for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { - double x1, y1, x2, y3; - double h2; + double x1, y1, x2, y2; + double x3, y3, x4, y4; x1 = quadrilaterals->getX1(i); y1 = quadrilaterals->getY1(i); x2 = quadrilaterals->getX2(i); + y2 = quadrilaterals->getY2(i); + + x3 = quadrilaterals->getX3(i); y3 = quadrilaterals->getY3(i); - h2 = (y1 - y3) / 2.0; + x4 = quadrilaterals->getX4(i); + y4 = quadrilaterals->getY4(i); - appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3+h2); - appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3+h2); + appearBuf->appendf ("{0:.2f} {1:.2f} m\n", (x1+x3)/2., (y1+y3)/2.); + appearBuf->appendf ("{0:.2f} {1:.2f} l\n", (x2+x4)/2., (y2+y4)/2.); appearBuf->append ("S\n"); } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/poppler/DCTStream.cc new/poppler-0.22.2/poppler/DCTStream.cc --- old/poppler-0.22.1/poppler/DCTStream.cc 2012-12-30 23:43:26.000000000 +0100 +++ new/poppler-0.22.2/poppler/DCTStream.cc 2013-03-08 16:36:46.000000000 +0100 @@ -10,7 +10,7 @@ // Copyright 2010 Carlos Garcia Campos <[email protected]> // Copyright 2011 Daiki Ueno <[email protected]> // Copyright 2011 Tomas Hoger <[email protected]> -// Copyright 2012 Thomas Freitag <[email protected]> +// Copyright 2012, 2013 Thomas Freitag <[email protected]> // //======================================================================== @@ -60,9 +60,20 @@ { } -DCTStream::DCTStream(Stream *strA, int colorXformA) : +DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict) : FilterStream(strA) { colorXform = colorXformA; + if (dict != NULL) { + Object obj; + + dict->dictLookup("Width", &obj); + err.width = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; + obj.free(); + dict->dictLookup("Height", &obj); + err.height = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; + obj.free(); + } else + err.height = err.width = 0; init(); } @@ -74,7 +85,12 @@ static void exitErrorHandler(jpeg_common_struct *error) { j_decompress_ptr cinfo = (j_decompress_ptr)error; str_error_mgr * err = (struct str_error_mgr *)cinfo->err; - longjmp(err->setjmp_buffer, 1); + if (cinfo->err->msg_code == JERR_IMAGE_TOO_BIG && err->width != 0 && err->height != 0) { + cinfo->image_height = err->height; + cinfo->image_width = err->width; + } else { + longjmp(err->setjmp_buffer, 1); + } } void DCTStream::init() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/poppler/DCTStream.h new/poppler-0.22.2/poppler/DCTStream.h --- old/poppler-0.22.1/poppler/DCTStream.h 2012-12-30 23:43:26.000000000 +0100 +++ new/poppler-0.22.2/poppler/DCTStream.h 2013-03-08 16:36:39.000000000 +0100 @@ -9,6 +9,7 @@ // Copyright 2005-2007, 2009-2011 Albert Astals Cid <[email protected]> // Copyright 2010 Carlos Garcia Campos <[email protected]> // Copyright 2011 Daiki Ueno <[email protected]> +// Copyright 2013 Thomas Freitag <[email protected]> // //======================================================================== @@ -43,6 +44,7 @@ extern "C" { #include <jpeglib.h> +#include <jerror.h> } struct str_src_mgr { @@ -55,12 +57,14 @@ struct str_error_mgr { struct jpeg_error_mgr pub; jmp_buf setjmp_buffer; + int width; + int height; }; class DCTStream: public FilterStream { public: - DCTStream(Stream *strA, int colorXformA); + DCTStream(Stream *strA, int colorXformA, Object *dict); virtual ~DCTStream(); virtual StreamKind getKind() { return strDCT; } virtual void reset(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/poppler/Makefile.am new/poppler-0.22.2/poppler/Makefile.am --- old/poppler-0.22.1/poppler/Makefile.am 2013-01-07 00:55:40.000000000 +0100 +++ new/poppler-0.22.2/poppler/Makefile.am 2013-03-11 18:46:47.000000000 +0100 @@ -177,7 +177,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 35: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.22.1/poppler/Makefile.in new/poppler-0.22.2/poppler/Makefile.in --- old/poppler-0.22.1/poppler/Makefile.in 2013-02-10 11:48:38.000000000 +0100 +++ new/poppler-0.22.2/poppler/Makefile.in 2013-03-11 18:47:33.000000000 +0100 @@ -592,7 +592,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 35: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.22.1/poppler/PageLabelInfo.cc new/poppler-0.22.2/poppler/PageLabelInfo.cc --- old/poppler-0.22.1/poppler/PageLabelInfo.cc 2012-12-30 23:43:26.000000000 +0100 +++ new/poppler-0.22.2/poppler/PageLabelInfo.cc 2013-02-20 21:09:05.000000000 +0100 @@ -3,7 +3,7 @@ // This file is under the GPLv2 or later license // // Copyright (C) 2005-2006 Kristian Høgsberg <[email protected]> -// Copyright (C) 2005, 2009 Albert Astals Cid <[email protected]> +// Copyright (C) 2005, 2009, 2013 Albert Astals Cid <[email protected]> // Copyright (C) 2011 Simon Kellner <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // @@ -136,7 +136,6 @@ return -1; } -#ifdef TEST static void toLatin(int number, GooString *str, GBool uppercase) { char base, letter; int i, count; @@ -152,7 +151,6 @@ for (i = 0; i < count; i++) str->append(letter); } -#endif PageLabelInfo::Interval::Interval(Object *dict, int baseA) { Object obj; @@ -332,9 +330,11 @@ case Interval::UppercaseRoman: toRoman(number, &number_string, gTrue); break; - case Interval::UppercaseLatin: case Interval::LowercaseLatin: - number = 0; + toLatin(number, &number_string, gFalse); + break; + case Interval::UppercaseLatin: + toLatin(number, &number_string, gTrue); break; case Interval::None: break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/poppler/SplashOutputDev.cc new/poppler-0.22.2/poppler/SplashOutputDev.cc --- old/poppler-0.22.1/poppler/SplashOutputDev.cc 2013-01-07 00:55:40.000000000 +0100 +++ new/poppler-0.22.2/poppler/SplashOutputDev.cc 2013-03-01 19:15:55.000000000 +0100 @@ -20,7 +20,7 @@ // Copyright (C) 2006 Scott Turner <[email protected]> // Copyright (C) 2007 Koji Otani <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> -// Copyright (C) 2009-2012 Thomas Freitag <[email protected]> +// Copyright (C) 2009-2013 Thomas Freitag <[email protected]> // Copyright (C) 2009 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 William Bader <[email protected]> // Copyright (C) 2010 Patrick Spendrin <[email protected]> @@ -4109,8 +4109,10 @@ state->concatCTM(1, 0, 0, 1, bbox[0], bbox[1]); ctm = state->getCTM(); for (i = 0; i < 6; ++i) { - if (!isfinite(ctm[i])) + if (!isfinite(ctm[i])) { + state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]); return gFalse; + } } matc[4] = x0 * xStep * ctm[0] + y0 * yStep * ctm[2] + ctm[4]; matc[5] = x0 * xStep * ctm[1] + y0 * yStep * ctm[3] + ctm[5]; @@ -4152,8 +4154,10 @@ repeatX = x1 - x0; repeatY = y1 - y0; } else { - if ((unsigned long) result_width * result_height > 0x800000L) + if ((unsigned long) result_width * result_height > 0x800000L) { + state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]); return gFalse; + } while(fabs(kx) > 16384 || fabs(ky) > 16384) { // limit pattern bitmap size m1.m[0] /= 2; @@ -4184,8 +4188,10 @@ matc[2] = ctm[2]; matc[3] = ctm[3]; - if (surface_width == 0 || surface_height == 0) + if (surface_width == 0 || surface_height == 0) { + state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]); return gFalse; + } m1.transform(bbox[0], bbox[1], &kx, &ky); m1.m[4] = -kx; m1.m[5] = -ky; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/poppler/Stream.cc new/poppler-0.22.2/poppler/Stream.cc --- old/poppler-0.22.1/poppler/Stream.cc 2013-01-11 00:35:03.000000000 +0100 +++ new/poppler-0.22.2/poppler/Stream.cc 2013-03-08 16:38:39.000000000 +0100 @@ -23,7 +23,7 @@ // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2010 Tomas Hoger <[email protected]> // Copyright (C) 2011, 2012 William Bader <[email protected]> -// Copyright (C) 2012 Thomas Freitag <[email protected]> +// Copyright (C) 2012, 2013 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]> @@ -157,7 +157,7 @@ dict->dictLookup("DP", ¶ms); } if (obj.isName()) { - str = makeFilter(obj.getName(), str, ¶ms); + str = makeFilter(obj.getName(), str, ¶ms, dict); } else if (obj.isArray()) { for (i = 0; i < obj.arrayGetLength(); ++i) { obj.arrayGet(i, &obj2); @@ -183,7 +183,7 @@ return str; } -Stream *Stream::makeFilter(char *name, Stream *str, Object *params) { +Stream *Stream::makeFilter(char *name, Stream *str, Object *params, Object *dict) { int pred; // parameters int colors; int bits; @@ -284,7 +284,7 @@ } obj.free(); } - str = new DCTStream(str, colorXform); + str = new DCTStream(str, colorXform, dict); } else if (!strcmp(name, "FlateDecode") || !strcmp(name, "Fl")) { pred = 1; columns = 1; @@ -2410,7 +2410,7 @@ 63 }; -DCTStream::DCTStream(Stream *strA, int colorXformA): +DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict): FilterStream(strA) { int i, j; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/poppler/Stream.h new/poppler-0.22.2/poppler/Stream.h --- old/poppler-0.22.1/poppler/Stream.h 2013-01-07 00:55:40.000000000 +0100 +++ new/poppler-0.22.2/poppler/Stream.h 2013-03-08 16:36:25.000000000 +0100 @@ -20,7 +20,7 @@ // Copyright (C) 2009 Stefan Thomas <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2011, 2012 William Bader <[email protected]> -// Copyright (C) 2012 Thomas Freitag <[email protected]> +// Copyright (C) 2012, 2013 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 @@ -224,7 +224,7 @@ virtual GBool hasGetChars() { return false; } virtual int getChars(int nChars, Guchar *buffer); - Stream *makeFilter(char *name, Stream *str, Object *params); + Stream *makeFilter(char *name, Stream *str, Object *params, Object *dict = NULL); int ref; // reference count }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/splash/Splash.cc new/poppler-0.22.2/splash/Splash.cc --- old/poppler-0.22.1/splash/Splash.cc 2013-01-11 00:35:03.000000000 +0100 +++ new/poppler-0.22.2/splash/Splash.cc 2013-03-04 19:45:35.000000000 +0100 @@ -525,8 +525,9 @@ cSrcNonIso[3] = clip255(pipe->cSrc[3] + ((pipe->cSrc[3] - cDest[3]) * t) / 255); #endif + case splashModeXBGR8: + cSrcNonIso[3] = 255; case splashModeRGB8: - case splashModeXBGR8: case splashModeBGR8: cSrcNonIso[2] = clip255(pipe->cSrc[2] + ((pipe->cSrc[2] - cDest[2]) * t) / 255); @@ -3926,6 +3927,8 @@ xa = imgCoordMungeLower(section[i].xa0 + ((SplashCoord)y + 0.5 - section[i].ya0) * section[i].dxdya); + if (unlikely(xa < 0)) + xa = 0; xb = imgCoordMungeUpper(section[i].xb0 + ((SplashCoord)y + 0.5 - section[i].yb0) * section[i].dxdyb); @@ -5087,7 +5090,7 @@ alpha = *ap++; // this uses shape instead of alpha, which isn't technically // correct, but works out the same - pipe.shape = alpha; + pipe.shape = alpha; (this->*pipe.run)(&pipe); } } @@ -5105,7 +5108,7 @@ if (state->clip->test(xDest + x, yDest + y)) { // this uses shape instead of alpha, which isn't technically // correct, but works out the same - pipe.shape = alpha; + pipe.shape = alpha; (this->*pipe.run)(&pipe); updateModX(xDest + x); updateModY(yDest + y); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.1/utils/ImageOutputDev.cc new/poppler-0.22.2/utils/ImageOutputDev.cc --- old/poppler-0.22.1/utils/ImageOutputDev.cc 2012-12-30 23:43:26.000000000 +0100 +++ new/poppler-0.22.2/utils/ImageOutputDev.cc 2013-02-20 21:08:53.000000000 +0100 @@ -21,6 +21,7 @@ // Copyright (C) 2009 William Bader <[email protected]> // Copyright (C) 2010 Jakob Voss <[email protected]> // Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2013 Thomas Fischer <[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 @@ -416,7 +417,7 @@ GfxImageColorMap *maskColorMap, GBool maskInterpolate) { if (listImages) { listImage(state, ref, str, width, height, colorMap, interpolate, gFalse, imgImage); - listImage(state, ref, maskStr, maskWidth, height, maskColorMap, maskInterpolate, gFalse, imgSmask); + listImage(state, ref, maskStr, maskWidth, maskHeight, maskColorMap, maskInterpolate, gFalse, imgSmask); } else { drawImage(state, ref, str, width, height, colorMap, interpolate, NULL, gFalse); drawImage(state, ref, maskStr, maskWidth, maskHeight, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
