Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2012-09-20 16:00:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-09 16:55:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2012-09-20 16:00:31.000000000 +0200 @@ -1,0 +2,33 @@ +Fri Sep 7 20:20:16 UTC 2012 - [email protected] + +- Update to version 0.20.3: + + core: + - If NULL, NULL fails as password try EMPTY, EMPTY before + failing (Bug #3498) + - SplashOutputDev: + . Fix bogus memory allocation size in + Splash::arbitraryTransformImage (Bug #49523) + . Fix segfault when scaleImage returns NULL (Bug #52488) + . Blend mode enhancements for CMYK + - PSOutputDev: + . Fix conversion when creating multiple strips (Bug #51982) + . Fix Bitmaps in level2sep or level3sep (Bug #52384) + . Fix DeviceN images with alternate Lab colorspace in level 3 + PostScript (Bug #51822) + . Make sure xScale and yScale are always initialized + (Bug #52215) + - Unify poppler-config.h includes in core "installed" headers + (Bug #52193) + - Replace c++ style includes with c style ones (Bug #52426) + + utils: + - pdfseparate: Return 0 on success. +- Bump poppler_soname to 27, following library soversion change. + +------------------------------------------------------------------- +Tue Aug 21 15:10:28 UTC 2012 - [email protected] + +- license update: GPL-2.0 or GPL-3.0 + poppler has a dual license (either GPL-2.0 or GPL-3.0) and emphasise that + it does not use "or later" + +------------------------------------------------------------------- @@ -4 +37 @@ -- Update to version 0.20.2: +- Update to version 0.20.2 (bnc#774627): --- /work/SRC/openSUSE:Factory/poppler/poppler.changes 2012-08-22 12:16:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler.changes 2012-09-20 16:00:32.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Sep 7 20:20:16 UTC 2012 - [email protected] + +- Update to version 0.20.3: + + core: + - If NULL, NULL fails as password try EMPTY, EMPTY before + failing (Bug #3498) + - SplashOutputDev: + . Fix bogus memory allocation size in + Splash::arbitraryTransformImage (Bug #49523) + . Fix segfault when scaleImage returns NULL (Bug #52488) + . Blend mode enhancements for CMYK + - PSOutputDev: + . Fix conversion when creating multiple strips (Bug #51982) + . Fix Bitmaps in level2sep or level3sep (Bug #52384) + . Fix DeviceN images with alternate Lab colorspace in level 3 + PostScript (Bug #51822) + . Make sure xScale and yScale are always initialized + (Bug #52215) + - Unify poppler-config.h includes in core "installed" headers + (Bug #52193) + - Replace c++ style includes with c style ones (Bug #52426) + + utils: + - pdfseparate: Return 0 on success. +- Bump poppler_soname to 27, following library soversion change. + +------------------------------------------------------------------- Old: ---- poppler-0.20.2.tar.gz New: ---- poppler-0.20.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.hBITky/_old 2012-09-20 16:00:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hBITky/_new 2012-09-20 16:00:36.000000000 +0200 @@ -20,11 +20,11 @@ Name: poppler-qt %define _name poppler -Version: 0.20.2 +Version: 0.20.3 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 26 +%define poppler_soname 27 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 @@ -32,7 +32,7 @@ %define poppler_apipkg 0_18 Url: http://poppler.freedesktop.org/ Summary: PDF Rendering Library -License: GPL-2.0+ +License: GPL-2.0 or GPL-3.0 Group: System/Libraries Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.gz BuildRequires: gcc-c++ @@ -65,7 +65,6 @@ %package -n libpoppler%{poppler_soname} Summary: PDF Rendering Library -License: GPL-2.0 Group: System/Libraries Recommends: poppler-data >= %{poppler_data_version} # Last appeared in OpenSUSE 10.3: @@ -78,7 +77,6 @@ %package -n libpoppler-cpp%{poppler_cpp_soname} Summary: PDF Rendering Library -License: GPL-2.0 Group: System/Libraries %description -n libpoppler-cpp%{poppler_cpp_soname} @@ -87,7 +85,6 @@ %package -n libpoppler-glib%{poppler_glib_soname} Summary: PDF Rendering Library - GLib Wrapper -License: GPL-2.0+ Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: @@ -100,7 +97,6 @@ %package -n typelib-1_0-Poppler-%{poppler_apipkg} Summary: PDF Rendering Library - Introspection bindings -License: GPL-2.0+ Group: System/Libraries %description -n typelib-1_0-Poppler-%{poppler_apipkg} @@ -113,7 +109,6 @@ %package -n libpoppler-qt4-%{poppler_qt4_soname} Summary: PDF Rendering Library - Qt4 Wrapper -License: GPL-2.0+ Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: @@ -127,7 +122,6 @@ %package tools Summary: PDF Rendering Library Tools -License: GPL-2.0 Group: Productivity/Publishing/PDF Requires: libpoppler%{poppler_soname} >= %{version} # last version in openSUSE 11.1/SLE11 @@ -141,7 +135,6 @@ %package -n libpoppler-devel Summary: PDF rendering library -License: GPL-2.0 Group: Development/Libraries/C and C++ Requires: libpoppler%{poppler_soname} = %{version} Requires: libstdc++-devel @@ -155,7 +148,6 @@ %package -n libpoppler-glib-devel Summary: PDF rendering library - GLib Wrapper -License: GPL-2.0 Group: Development/Libraries/C and C++ Requires: libpoppler-glib%{poppler_glib_soname} = %{version} Requires: typelib-1_0-Poppler-%{poppler_apipkg} = %{version} @@ -176,7 +168,6 @@ %package -n libpoppler-qt4-devel Summary: PDF rendering library - Qt4 Wrapper -License: GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version} ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.hBITky/_old 2012-09-20 16:00:36.000000000 +0200 +++ /var/tmp/diff_new_pack.hBITky/_new 2012-09-20 16:00:36.000000000 +0200 @@ -20,11 +20,11 @@ Name: poppler %define _name poppler -Version: 0.20.2 +Version: 0.20.3 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 26 +%define poppler_soname 27 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 @@ -65,7 +65,6 @@ %package -n libpoppler%{poppler_soname} Summary: PDF Rendering Library -License: GPL-2.0 or GPL-3.0 Group: System/Libraries Recommends: poppler-data >= %{poppler_data_version} # Last appeared in OpenSUSE 10.3: @@ -78,7 +77,6 @@ %package -n libpoppler-cpp%{poppler_cpp_soname} Summary: PDF Rendering Library -License: GPL-2.0 or GPL-3.0 Group: System/Libraries %description -n libpoppler-cpp%{poppler_cpp_soname} @@ -87,7 +85,6 @@ %package -n libpoppler-glib%{poppler_glib_soname} Summary: PDF Rendering Library - GLib Wrapper -License: GPL-2.0 or GPL-3.0 Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: @@ -100,7 +97,6 @@ %package -n typelib-1_0-Poppler-%{poppler_apipkg} Summary: PDF Rendering Library - Introspection bindings -License: GPL-2.0 or GPL-3.0 Group: System/Libraries %description -n typelib-1_0-Poppler-%{poppler_apipkg} @@ -113,7 +109,6 @@ %package -n libpoppler-qt4-%{poppler_qt4_soname} Summary: PDF Rendering Library - Qt4 Wrapper -License: GPL-2.0 or GPL-3.0 Group: System/Libraries Requires: libpoppler%{poppler_soname} >= %{version} # Last appeared in OpenSUSE 10.3: @@ -127,7 +122,6 @@ %package tools Summary: PDF Rendering Library Tools -License: GPL-2.0 or GPL-3.0 Group: Productivity/Publishing/PDF Requires: libpoppler%{poppler_soname} >= %{version} # last version in openSUSE 11.1/SLE11 @@ -141,7 +135,6 @@ %package -n libpoppler-devel Summary: PDF rendering library -License: GPL-2.0 or GPL-3.0 Group: Development/Libraries/C and C++ Requires: libpoppler%{poppler_soname} = %{version} Requires: libstdc++-devel @@ -155,7 +148,6 @@ %package -n libpoppler-glib-devel Summary: PDF rendering library - GLib Wrapper -License: GPL-2.0 or GPL-3.0 Group: Development/Libraries/C and C++ Requires: libpoppler-glib%{poppler_glib_soname} = %{version} Requires: typelib-1_0-Poppler-%{poppler_apipkg} = %{version} @@ -176,7 +168,6 @@ %package -n libpoppler-qt4-devel Summary: PDF rendering library - Qt4 Wrapper -License: GPL-2.0 or GPL-3.0 Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version} ++++++ poppler-0.20.2.tar.gz -> poppler-0.20.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/CMakeLists.txt new/poppler-0.20.3/CMakeLists.txt --- old/poppler-0.20.2/CMakeLists.txt 2012-07-10 22:54:40.000000000 +0200 +++ new/poppler-0.20.3/CMakeLists.txt 2012-08-11 00:04:54.000000000 +0200 @@ -16,7 +16,7 @@ set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "20") -set(POPPLER_MICRO_VERSION "2") +set(POPPLER_MICRO_VERSION "3") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -386,7 +386,7 @@ else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 26.0.0 SOVERSION 26) +set_target_properties(poppler PROPERTIES VERSION 27.0.0 SOVERSION 27) 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.20.2/ChangeLog new/poppler-0.20.3/ChangeLog --- old/poppler-0.20.2/ChangeLog 2012-07-10 22:59:47.000000000 +0200 +++ new/poppler-0.20.3/ChangeLog 2012-08-11 00:07:44.000000000 +0200 @@ -1,3 +1,177 @@ +commit 1b2903c104012fdd3c982d57898910945dff9a15 +Author: Albert Astals Cid <[email protected]> +Date: Sat Aug 11 00:05:10 2012 +0200 + + 0.20.3 + + CMakeLists.txt | 4 ++-- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 22 insertions(+), 6 deletions(-) + +commit 40e7b744d32152ab4c6201b8bda7fb7caf6bfd4e +Author: Albert Astals Cid <[email protected]> +Date: Sun Aug 5 15:07:16 2012 +0200 + + If NULL, NULL fails as password try EMPTY, EMPTY before failing + + Reviewed by Jose Aliste + Bug #3498 + + poppler/SecurityHandler.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 3ca2bc0d3abdf92741b7921ea402c9de09e531f6 +Author: Markus Trippelsdorf <[email protected]> +Date: Fri Aug 3 00:48:12 2012 +0200 + + Fix segfault when scaleImage returns NULL + + Bug 52488 + + splash/Splash.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 768cf5877f48f8cee80fe96e2ee52f42f230dfdf +Author: Thomas Freitag <[email protected]> +Date: Thu Aug 2 00:22:19 2012 +0200 + + PSOutputDev: Fix Bitmaps in level2sep or level3sep + + Bug #52384 + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 315447843a368556a8536bc30e579c9bf338682e +Author: Thomas Freitag <[email protected]> +Date: Wed Aug 1 22:56:49 2012 +0200 + + Splash: Blend mode enhancements for CMYK + + poppler/SplashOutputDev.cc | 76 + +++++++++++++++++++++++++++++++------------- + splash/Splash.cc | 22 ------------- + 2 files changed, 54 insertions(+), 44 deletions(-) + +commit c0c88b3707fc7337e814ae4252d80002641a19ee +Author: Albert Astals Cid <[email protected]> +Date: Tue Jul 31 23:32:19 2012 +0200 + + Replace c++ style includes with c style ones + + Fixes build in Solaris 10 + Bug #52426 + + goo/gstrtod.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit dcbc923bd3592a81876f84005fbaddcea18641cc +Author: Thomas Freitag <[email protected]> +Date: Sun Jul 22 18:40:46 2012 +0200 + + Make sure xScale and yScale are always initialized + + Bug #52215 + + poppler/PSOutputDev.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit ef7c2418e12d3e6a79f1d89a0051b005fadbc344 +Author: Thomas Freitag <[email protected]> +Date: Sat Jul 21 00:01:49 2012 +0200 + + Fix conversion to ps when having multiple strips + + Bug 51982 + + poppler/PSOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 349b21acc249c130fb053bc4a0c75019f75bd35b +Author: Torsten Kasch <[email protected]> +Date: Thu Jul 19 00:18:14 2012 +0200 + + Unify poppler-config.h includes in core "installed" headers + + Bug 52193 + + goo/FixedPoint.h | 2 +- + goo/GooTimer.h | 2 +- + goo/JpegWriter.h | 2 +- + goo/PNGWriter.h | 2 +- + goo/TiffWriter.h | 2 +- + goo/gfile.h | 2 +- + goo/gmem.h | 2 +- + splash/SplashFTFont.h | 2 +- + splash/SplashMath.h | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +commit 15c6ae699f083ea6c9716c1098ae9833a56eeb3e +Author: Torsten Kasch <[email protected]> +Date: Thu Jul 19 00:06:45 2012 +0200 + + autoconf: Do not assume the shell is bash compatible + + Bug 52197 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5311da76ec7cd7c1e6cdfc4e18df6dd56e8398b +Author: Albert Astals Cid <[email protected]> +Date: Thu Jul 19 00:01:49 2012 +0200 + + pdfseparate: Return 0 on success + + utils/pdfseparate.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 51f22ca0badfc41c19cba66cabd63184244f81c7 +Author: Thomas Freitag <[email protected]> +Date: Mon Jul 16 23:32:23 2012 +0200 + + PSOutputDev: Fix DeviceN images with alternate Lab colorspace in + level 3 PostScript + + Bug #51822 + + poppler/PSOutputDev.cc | 54 + +++++++++++++++++++++++++++++++++++++++++------- + poppler/PSOutputDev.h | 2 +- + 2 files changed, 48 insertions(+), 8 deletions(-) + +commit 950d5f3dec4bff5d3c523d55689d7b70215dc110 +Author: Thomas Freitag <[email protected]> +Date: Fri Jul 13 00:56:48 2012 +0200 + + Fix Splash::arbitraryTransformImage causes bogus memory allocation + size + + Bug #49523 + + poppler/SplashOutputDev.cc | 2 +- + splash/Splash.cc | 79 + +++++++++++++++++++++++++------------------- + splash/Splash.h | 4 +-- + 3 files changed, 48 insertions(+), 37 deletions(-) + +commit e09be3bc6ba1290fd31bde0c3d19c4ffcbadbf00 +Author: Albert Astals Cid <[email protected]> +Date: Tue Jul 10 23:06:53 2012 +0200 + + 0.20.2 + + CMakeLists.txt | 2 +- + NEWS | 11 +++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 15 insertions(+), 4 deletions(-) + commit e15fe0e1e6accf779caeb1179a8d62161c0aa650 Author: Thomas Freitag <[email protected]> Date: Thu Jul 5 17:44:02 2012 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/NEWS new/poppler-0.20.3/NEWS --- old/poppler-0.20.2/NEWS 2012-07-10 22:54:02.000000000 +0200 +++ new/poppler-0.20.3/NEWS 2012-08-11 00:02:30.000000000 +0200 @@ -1,3 +1,19 @@ +Release 0.20.3 + core: + * If NULL, NULL fails as password try EMPTY, EMPTY before failing (Bug #3498) + * SplashOutputDev: Fix bogus memory allocation size in Splash::arbitraryTransformImage (Bug #49523) + * SplashOutputDev: Fix segfault when scaleImage returns NULL (Bug #52488) + * SplashOutputDev: Blend mode enhancements for CMYK + * PSOutputDev: Fix conversion when creating multiple strips (Bug #51982) + * PSOutputDev: Fix Bitmaps in level2sep or level3sep (Bug #52384) + * PSOutputDev: Fix DeviceN images with alternate Lab colorspace in level 3 PostScript (Bug #51822) + * PSOutputDev: Make sure xScale and yScale are always initialized (Bug #52215) + * Unify poppler-config.h includes in core "installed" headers (Bug #52193) + * Replace c++ style includes with c style ones (Bug #52426) + + utils: + * pdfseparate: Return 0 on success + Release 0.20.2 core: * Fix compilation on Windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/configure new/poppler-0.20.3/configure --- old/poppler-0.20.2/configure 2012-07-10 22:56:00.000000000 +0200 +++ new/poppler-0.20.3/configure 2012-08-11 00:06:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for poppler 0.20.2. +# Generated by GNU Autoconf 2.68 for poppler 0.20.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='poppler' PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.20.2' -PACKAGE_STRING='poppler 0.20.2' +PACKAGE_VERSION='0.20.3' +PACKAGE_STRING='poppler 0.20.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -1492,7 +1492,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.20.2 to adapt to many kinds of systems. +\`configure' configures poppler 0.20.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.20.2:";; + short | recursive ) echo "Configuration of poppler 0.20.3:";; esac cat <<\_ACEOF @@ -1767,7 +1767,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.20.2 +poppler configure 0.20.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2461,7 +2461,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.20.2, which was +It was created by poppler $as_me 0.20.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3277,7 +3277,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.20.2' + VERSION='0.20.3' cat >>confdefs.h <<_ACEOF @@ -17605,7 +17605,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.20.2" +#define POPPLER_VERSION "0.20.3" _ACEOF @@ -23948,7 +23948,7 @@ -fno-common $CXXFLAGS" ;; esac -case $($PKG_CONFIG --version) in +case `$PKG_CONFIG --version` in 0.?|0.10-7) PC_REQUIRES_PRIVATE=""; PC_REQUIRES="poppler = $VERSION";; @@ -23964,9 +23964,9 @@ POPPLER_MINOR_VERSION=20 -POPPLER_MICRO_VERSION=2 +POPPLER_MICRO_VERSION=3 -POPPLER_VERSION=0.20.2 +POPPLER_VERSION=0.20.3 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" @@ -24614,7 +24614,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.20.2, which was +This file was extended by poppler $as_me 0.20.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24680,7 +24680,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.20.2 +poppler config.status 0.20.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/configure.ac new/poppler-0.20.3/configure.ac --- old/poppler-0.20.2/configure.ac 2012-07-10 22:54:35.000000000 +0200 +++ new/poppler-0.20.3/configure.ac 2012-08-11 00:02:57.000000000 +0200 @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[20]) -m4_define([poppler_version_micro],[2]) +m4_define([poppler_version_micro],[3]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) @@ -752,7 +752,7 @@ -fno-common $CXXFLAGS" ;; esac -case $($PKG_CONFIG --version) in +case `$PKG_CONFIG --version` in 0.?|0.1[0-7]) PC_REQUIRES_PRIVATE=""; PC_REQUIRES="poppler = $VERSION";; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/cpp/poppler-version.h new/poppler-0.20.3/cpp/poppler-version.h --- old/poppler-0.20.2/cpp/poppler-version.h 2012-07-10 22:56:12.000000000 +0200 +++ new/poppler-0.20.3/cpp/poppler-version.h 2012-08-11 00:06:22.000000000 +0200 @@ -21,10 +21,10 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.20.2" +#define POPPLER_VERSION "0.20.3" #define POPPLER_VERSION_MAJOR 0 #define POPPLER_VERSION_MINOR 20 -#define POPPLER_VERSION_MICRO 2 +#define POPPLER_VERSION_MICRO 3 namespace poppler { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/glib/Poppler-0.18.gir new/poppler-0.20.3/glib/Poppler-0.18.gir --- old/poppler-0.20.2/glib/Poppler-0.18.gir 2012-07-10 22:56:51.000000000 +0200 +++ new/poppler-0.20.3/glib/Poppler-0.18.gir 2012-08-11 00:07:01.000000000 +0200 @@ -2802,7 +2802,7 @@ <constant name="MAJOR_VERSION" value="0" c:type="POPPLER_MAJOR_VERSION"> <type name="gint" c:type="gint"/> </constant> - <constant name="MICRO_VERSION" value="2" c:type="POPPLER_MICRO_VERSION"> + <constant name="MICRO_VERSION" value="3" c:type="POPPLER_MICRO_VERSION"> <type name="gint" c:type="gint"/> </constant> <constant name="MINOR_VERSION" value="20" c:type="POPPLER_MINOR_VERSION"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/glib/reference/html/ch01.html new/poppler-0.20.3/glib/reference/html/ch01.html --- old/poppler-0.20.2/glib/reference/html/ch01.html 2012-07-10 22:59:48.000000000 +0200 +++ new/poppler-0.20.3/glib/reference/html/ch01.html 2012-08-11 00:07:46.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp140800"></a>Poppler</h2></div></div></div> +<a name="idp3928656"></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.20.2/glib/reference/html/index.html new/poppler-0.20.3/glib/reference/html/index.html --- old/poppler-0.20.2/glib/reference/html/index.html 2012-07-10 22:59:48.000000000 +0200 +++ new/poppler-0.20.3/glib/reference/html/index.html 2012-08-11 00:07:46.000000000 +0200 @@ -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.20.2 + for Poppler 0.20.3 </p></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.20.3/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.20.2/glib/reference/html/poppler-Version-and-Features-Information.html 2012-07-10 22:59:48.000000000 +0200 +++ new/poppler-0.20.3/glib/reference/html/poppler-Version-and-Features-Information.html 2012-08-11 00:07:46.000000000 +0200 @@ -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 (2) +<pre class="programlisting">#define POPPLER_MICRO_VERSION (3) </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.20.2/glib/reference/version.xml new/poppler-0.20.3/glib/reference/version.xml --- old/poppler-0.20.2/glib/reference/version.xml 2012-07-10 22:56:12.000000000 +0200 +++ new/poppler-0.20.3/glib/reference/version.xml 2012-08-11 00:06:22.000000000 +0200 @@ -1 +1 @@ -0.20.2 +0.20.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/FixedPoint.h new/poppler-0.20.3/goo/FixedPoint.h --- old/poppler-0.20.2/goo/FixedPoint.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/goo/FixedPoint.h 2012-07-19 00:21:44.000000000 +0200 @@ -11,7 +11,7 @@ #ifndef FIXEDPOINT_H #define FIXEDPOINT_H -#include "poppler/poppler-config.h" +#include "poppler-config.h" #if USE_FIXEDPOINT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/GooTimer.h new/poppler-0.20.3/goo/GooTimer.h --- old/poppler-0.20.2/goo/GooTimer.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/goo/GooTimer.h 2012-07-19 00:21:44.000000000 +0200 @@ -19,7 +19,7 @@ #pragma interface #endif -#include "poppler/poppler-config.h" +#include "poppler-config.h" #include "gtypes.h" #ifdef HAVE_GETTIMEOFDAY #include <sys/time.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/JpegWriter.h new/poppler-0.20.3/goo/JpegWriter.h --- old/poppler-0.20.2/goo/JpegWriter.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/goo/JpegWriter.h 2012-07-19 00:21:44.000000000 +0200 @@ -17,7 +17,7 @@ #ifndef JPEGWRITER_H #define JPEGWRITER_H -#include "poppler/poppler-config.h" +#include "poppler-config.h" #ifdef ENABLE_LIBJPEG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/PNGWriter.h new/poppler-0.20.3/goo/PNGWriter.h --- old/poppler-0.20.2/goo/PNGWriter.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/goo/PNGWriter.h 2012-07-19 00:21:44.000000000 +0200 @@ -15,7 +15,7 @@ #ifndef PNGWRITER_H #define PNGWRITER_H -#include "poppler/poppler-config.h" +#include "poppler-config.h" #ifdef ENABLE_LIBPNG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/TiffWriter.h new/poppler-0.20.3/goo/TiffWriter.h --- old/poppler-0.20.2/goo/TiffWriter.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/goo/TiffWriter.h 2012-07-19 00:21:44.000000000 +0200 @@ -12,7 +12,7 @@ #ifndef TIFFWRITER_H #define TIFFWRITER_H -#include "poppler/poppler-config.h" +#include "poppler-config.h" #ifdef ENABLE_LIBTIFF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/gfile.h new/poppler-0.20.3/goo/gfile.h --- old/poppler-0.20.2/goo/gfile.h 2012-06-11 15:19:41.000000000 +0200 +++ new/poppler-0.20.3/goo/gfile.h 2012-07-19 00:21:44.000000000 +0200 @@ -27,7 +27,7 @@ #ifndef GFILE_H #define GFILE_H -#include "poppler/poppler-config.h" +#include "poppler-config.h" #include <stdio.h> #include <stdlib.h> #include <stddef.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/gmem.h new/poppler-0.20.3/goo/gmem.h --- old/poppler-0.20.2/goo/gmem.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/goo/gmem.h 2012-07-19 00:21:44.000000000 +0200 @@ -26,7 +26,7 @@ #define GMEM_H #include <stdio.h> -#include "poppler/poppler-config.h" +#include "poppler-config.h" #ifdef __cplusplus extern "C" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/goo/gstrtod.cc new/poppler-0.20.3/goo/gstrtod.cc --- old/poppler-0.20.2/goo/gstrtod.cc 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/goo/gstrtod.cc 2012-07-31 23:32:16.000000000 +0200 @@ -1,6 +1,6 @@ /* This file is part of Libspectre. * - * Copyright (C) 2007 Albert Astals Cid <[email protected]> + * Copyright (C) 2007, 2012 Albert Astals Cid <[email protected]> * Copyright (C) 2007 Carlos Garcia Campos <[email protected]> * * Libspectre is free software; you can redistribute it and/or modify @@ -22,10 +22,10 @@ #include "gstrtod.h" -#include <clocale> -#include <cerrno> -#include <cstdlib> -#include <cstring> +#include <locale.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> #define ascii_isspace(c) \ (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/poppler/Makefile.am new/poppler-0.20.3/poppler/Makefile.am --- old/poppler-0.20.2/poppler/Makefile.am 2012-06-11 15:19:41.000000000 +0200 +++ new/poppler-0.20.3/poppler/Makefile.am 2012-08-11 00:04:47.000000000 +0200 @@ -177,7 +177,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 26:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 27: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.20.2/poppler/Makefile.in new/poppler-0.20.3/poppler/Makefile.in --- old/poppler-0.20.2/poppler/Makefile.in 2012-07-10 22:56:01.000000000 +0200 +++ new/poppler-0.20.3/poppler/Makefile.in 2012-08-11 00:06:12.000000000 +0200 @@ -570,7 +570,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 26:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 27: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.20.2/poppler/PSOutputDev.cc new/poppler-0.20.3/poppler/PSOutputDev.cc --- old/poppler-0.20.2/poppler/PSOutputDev.cc 2012-07-05 17:46:06.000000000 +0200 +++ new/poppler-0.20.3/poppler/PSOutputDev.cc 2012-08-02 00:22:01.000000000 +0200 @@ -3049,7 +3049,7 @@ double m0, m1, m2, m3, m4, m5; int nStripes, stripeH, stripeY; int c, w, h, x, y, comp, i; - int numComps; + int numComps, initialNumComps; #endif char hexBuf[32*2 + 2]; // 32 values X 2 chars/value + line ending + null Guchar digit; @@ -3132,6 +3132,7 @@ stripeH = (sliceH + nStripes - 1) / nStripes; // render the stripes + initialNumComps = numComps; for (stripeY = sliceY; stripeY < sliceH; stripeY += stripeH) { // rasterize a stripe @@ -3151,6 +3152,7 @@ // draw the rasterized image bitmap = splashOut->getBitmap(); + numComps = initialNumComps; w = bitmap->getWidth(); h = bitmap->getHeight(); writePS("gsave\n"); @@ -3519,6 +3521,7 @@ saveState(NULL); } + xScale = yScale = 1; switch (mode) { case psModePSOrigPageSizes: @@ -3629,8 +3632,6 @@ } else { yScale = xScale; } - } else { - xScale = yScale = 1; } // deal with odd bounding boxes or clipping if (clipLLX0 < clipURX0 && clipLLY0 < clipURY0) { @@ -3692,7 +3693,6 @@ if (tx != 0 || ty != 0) { writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty); } - xScale = yScale = 1; break; case psModeForm: @@ -3700,7 +3700,6 @@ writePS("begin xpdf begin\n"); writePS("pdfStartPage\n"); tx = ty = 0; - xScale = yScale = 1; rotate = 0; break; } @@ -5840,7 +5839,7 @@ } #endif if ((level == psLevel2Sep || level == psLevel3Sep) && colorMap && - colorMap->getColorSpace()->getMode() == csSeparation) { + colorMap->getColorSpace()->getMode() == csSeparation && colorMap->getBits() == 8) { color.c[0] = gfxColorComp1; sepCS = (GfxSeparationColorSpace *)colorMap->getColorSpace(); sepCS->getCMYK(&color, &cmyk); @@ -6199,7 +6198,7 @@ } else { if ((level == psLevel2Sep || level == psLevel3Sep) && colorMap && - colorMap->getColorSpace()->getMode() == csSeparation) { + colorMap->getColorSpace()->getMode() == csSeparation && colorMap->getBits() == 8) { color.c[0] = gfxColorComp1; sepCS = (GfxSeparationColorSpace *)colorMap->getColorSpace(); sepCS->getCMYK(&color, &cmyk); @@ -6514,9 +6513,9 @@ writePS(" "); } writePS("]\n"); - dumpColorSpaceL2(deviceNCS->getAlt(), gFalse, updateColors, map01); + dumpColorSpaceL2(deviceNCS->getAlt(), gFalse, updateColors, gFalse); writePS("\n"); - cvtFunction(deviceNCS->getTintTransformFunc()); + cvtFunction(deviceNCS->getTintTransformFunc(), map01 && deviceNCS->getAlt()->getMode() == csLab); writePS("]\n"); if (genXform) { writePS(" {}"); @@ -6979,7 +6978,7 @@ //~ can nextFunc be reset to 0 -- maybe at the start of each page? //~ or maybe at the start of each color space / pattern? -void PSOutputDev::cvtFunction(Function *func) { +void PSOutputDev::cvtFunction(Function *func, GBool invertPSFunction) { SampledFunction *func0; ExponentialFunction *func2; StitchingFunction *func3; @@ -7069,7 +7068,14 @@ // [e01] [efrac] y(0) ... y(i-1) y(i) } // [e01] [efrac] y(0) ... y(n-1) - writePSFmt("{0:d} {1:d} roll pop pop }}\n", n+2, n); + writePSFmt("{0:d} {1:d} roll pop pop \n", n+2, n); + if (invertPSFunction) { + for (i = 0; i < n; ++i) { + writePSFmt("{0:d} -1 roll ", n); + writePSFmt("{0:.6g} sub {1:.6g} div ", func0->getRangeMin(i), func0->getRangeMax(i) - func0->getRangeMin(i)); + } + } + writePS("}\n"); break; case 2: // exponential @@ -7091,7 +7097,14 @@ } } // x y(0) .. y(n-1) - writePSFmt("{0:d} {1:d} roll pop }}\n", n+1, n); + writePSFmt("{0:d} {1:d} roll pop \n", n+1, n); + if (invertPSFunction && func2->getHasRange()) { + for (i = 0; i < n; ++i) { + writePSFmt("{0:d} -1 roll ", n); + writePSFmt("{0:.6g} sub {1:.6g} div ", func2->getRangeMin(i), func2->getRangeMax(i) - func2->getRangeMin(i)); + } + } + writePS("}\n"); break; case 3: // stitching @@ -7120,13 +7133,39 @@ for (i = 0; i < func3->getNumFuncs() - 1; ++i) { writePS("} ifelse\n"); } + if (invertPSFunction && func3->getHasRange()) { + n = func3->getOutputSize(); + for (i = 0; i < n; ++i) { + writePSFmt("{0:d} -1 roll ", n); + writePSFmt("{0:.6g} sub {1:.6g} div ", func3->getRangeMin(i), func3->getRangeMax(i) - func3->getRangeMin(i)); + } + } writePS("}\n"); break; case 4: // PostScript func4 = (PostScriptFunction *)func; - writePS(func4->getCodeString()->getCString()); - writePS("\n"); + if (invertPSFunction) { + GooString *codeString = new GooString(func4->getCodeString()); + for (i = codeString->getLength() -1; i > 0; i--) { + if (codeString->getChar(i) == '}') { + codeString->del(i); + break; + } + } + writePS(codeString->getCString()); + writePS("\n"); + delete codeString; + n = func4->getOutputSize(); + for (i = 0; i < n; ++i) { + writePSFmt("{0:d} -1 roll ", n); + writePSFmt("{0:.6g} sub {1:.6g} div ", func4->getRangeMin(i), func4->getRangeMax(i) - func4->getRangeMin(i)); + } + writePS("}\n"); + } else { + writePS(func4->getCodeString()->getCString()); + writePS("\n"); + } break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/poppler/PSOutputDev.h new/poppler-0.20.3/poppler/PSOutputDev.h --- old/poppler-0.20.2/poppler/PSOutputDev.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/poppler/PSOutputDev.h 2012-07-16 23:33:49.000000000 +0200 @@ -378,7 +378,7 @@ void opiTransform(GfxState *state, double x0, double y0, double *x1, double *y1); #endif - void cvtFunction(Function *func); + void cvtFunction(Function *func, GBool invertPSFunction = gFalse); GooString *filterPSName(GooString *name); // Write the document-level setup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/poppler/SecurityHandler.cc new/poppler-0.20.3/poppler/SecurityHandler.cc --- old/poppler-0.20.2/poppler/SecurityHandler.cc 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/poppler/SecurityHandler.cc 2012-08-05 15:12:56.000000000 +0200 @@ -105,7 +105,12 @@ } } if (!ok) { - error(errCommandLine, -1, "Incorrect password"); + if (!ownerPassword && !userPassword) { + GooString dummy; + return checkEncryption(&dummy, &dummy); + } else { + error(errCommandLine, -1, "Incorrect password"); + } } return ok; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/poppler/SplashOutputDev.cc new/poppler-0.20.3/poppler/SplashOutputDev.cc --- old/poppler-0.20.2/poppler/SplashOutputDev.cc 2012-06-11 15:19:36.000000000 +0200 +++ new/poppler-0.20.3/poppler/SplashOutputDev.cc 2012-08-01 22:55:47.000000000 +0200 @@ -661,11 +661,6 @@ SplashColor rgbSrc; SplashColor rgbDest; SplashColor rgbBlend; - for (i = 0; i < 4; i++) { - // convert back to subtractive (s. Splash.cc) - src[i] = 0xff - src[i]; - dest[i] = 0xff - dest[i]; - } cmykToRGB(src, rgbSrc); cmykToRGB(dest, rgbDest); for (i = 0; i < 3; ++i) { @@ -681,10 +676,6 @@ } } rgbToCMYK(rgbBlend, blend); - for (i = 0; i < 4; i++) { - // convert back to additive (s. Splash.cc) - blend[i] = 0xff - blend[i]; - } } else #endif { @@ -848,6 +839,8 @@ Guchar r0, g0, b0; #ifdef SPLASH_CMYK Guchar r1, g1, b1; + int i; + SplashColor src2, dest2; #endif switch (cm) { @@ -866,15 +859,24 @@ break; #if SPLASH_CMYK case splashModeCMYK8: + for (i = 0; i < 4; i++) { + // convert to additive + src2[i] = 0xff - src[i]; + dest2[i] = 0xff - dest[i]; + } // NB: inputs have already been converted to additive mode - setSat(src[0], src[1], src[2], getSat(dest[0], dest[1], dest[2]), + setSat(src2[0], src2[1], src2[2], getSat(dest2[0], dest2[1], dest2[2]), &r0, &g0, &b0); - setLum(r0, g0, b0, getLum(dest[0], dest[1], dest[2]), + setLum(r0, g0, b0, getLum(dest2[0], dest2[1], dest2[2]), &r1, &g1, &b1); blend[0] = r1; blend[1] = g1; blend[2] = b1; - blend[3] = dest[3]; + blend[3] = dest2[3]; + for (i = 0; i < 4; i++) { + // convert back to subtractive + blend[i] = 0xff - blend[i]; + } break; #endif } @@ -886,6 +888,8 @@ Guchar r0, g0, b0; #ifdef SPLASH_CMYK Guchar r1, g1, b1; + int i; + SplashColor src2, dest2; #endif switch (cm) { @@ -904,15 +908,23 @@ break; #if SPLASH_CMYK case splashModeCMYK8: - // NB: inputs have already been converted to additive mode - setSat(dest[0], dest[1], dest[2], getSat(src[0], src[1], src[2]), + for (i = 0; i < 4; i++) { + // convert to additive + src2[i] = 0xff - src[i]; + dest2[i] = 0xff - dest[i]; + } + setSat(dest2[0], dest2[1], dest2[2], getSat(src2[0], src2[1], src2[2]), &r0, &g0, &b0); - setLum(r0, g0, b0, getLum(dest[0], dest[1], dest[2]), + setLum(r0, g0, b0, getLum(dest2[0], dest2[1], dest2[2]), &r1, &g1, &b1); blend[0] = r1; blend[1] = g1; blend[2] = b1; - blend[3] = dest[3]; + blend[3] = dest2[3]; + for (i = 0; i < 4; i++) { + // convert back to subtractive + blend[i] = 0xff - blend[i]; + } break; #endif } @@ -922,6 +934,8 @@ SplashColorPtr blend, SplashColorMode cm) { #if SPLASH_CMYK Guchar r, g, b; + int i; + SplashColor src2, dest2; #endif switch (cm) { @@ -938,13 +952,21 @@ break; #if SPLASH_CMYK case splashModeCMYK8: - // NB: inputs have already been converted to additive mode - setLum(src[0], src[1], src[2], getLum(dest[0], dest[1], dest[2]), + for (i = 0; i < 4; i++) { + // convert to additive + src2[i] = 0xff - src[i]; + dest2[i] = 0xff - dest[i]; + } + setLum(src2[0], src2[1], src2[2], getLum(dest2[0], dest2[1], dest2[2]), &r, &g, &b); blend[0] = r; blend[1] = g; blend[2] = b; - blend[3] = dest[3]; + blend[3] = dest2[3]; + for (i = 0; i < 4; i++) { + // convert back to subtractive + blend[i] = 0xff - blend[i]; + } break; #endif } @@ -955,6 +977,8 @@ SplashColorMode cm) { #if SPLASH_CMYK Guchar r, g, b; + int i; + SplashColor src2, dest2; #endif switch (cm) { @@ -971,13 +995,21 @@ break; #if SPLASH_CMYK case splashModeCMYK8: - // NB: inputs have already been converted to additive mode - setLum(dest[0], dest[1], dest[2], getLum(src[0], src[1], src[2]), + for (i = 0; i < 4; i++) { + // convert to additive + src2[i] = 0xff - src[i]; + dest2[i] = 0xff - dest[i]; + } + setLum(dest2[0], dest2[1], dest2[2], getLum(src2[0], src2[1], src2[2]), &r, &g, &b); blend[0] = r; blend[1] = g; blend[2] = b; - blend[3] = src[3]; + blend[3] = src2[3]; + for (i = 0; i < 4; i++) { + // convert back to subtractive + blend[i] = 0xff - blend[i]; + } break; #endif } @@ -4059,7 +4091,7 @@ matc[1] = ctm[1]; matc[2] = ctm[2]; matc[3] = ctm[3]; - splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc); + splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc, gTrue); delete tBitmap; delete gfx; return gTrue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/splash/Splash.cc new/poppler-0.20.3/splash/Splash.cc --- old/poppler-0.20.2/splash/Splash.cc 2012-06-24 23:44:05.000000000 +0200 +++ new/poppler-0.20.3/splash/Splash.cc 2012-08-03 00:48:51.000000000 +0200 @@ -16,6 +16,7 @@ // Copyright (C) 2010-2012 Thomas Freitag <[email protected]> // Copyright (C) 2010 Christian Feuers�nger <[email protected]> // Copyright (C) 2011, 2012 William Bader <[email protected]> +// Copyright (C) 2012 Markus Trippelsdorf <[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 @@ -337,9 +338,6 @@ SplashColorPtr cSrc; Guchar cResult0, cResult1, cResult2, cResult3; int t; -#if SPLASH_CMYK - SplashColor cSrc2, cDest2; -#endif //----- source color @@ -521,25 +519,6 @@ //----- blend function if (state->blendFunc) { -#if SPLASH_CMYK - if (bitmap->mode == splashModeCMYK8) { - // convert colors to additive - cSrc2[0] = 0xff - cSrc[0]; - cSrc2[1] = 0xff - cSrc[1]; - cSrc2[2] = 0xff - cSrc[2]; - cSrc2[3] = 0xff - cSrc[3]; - cDest2[0] = 0xff - cDest[0]; - cDest2[1] = 0xff - cDest[1]; - cDest2[2] = 0xff - cDest[2]; - cDest2[3] = 0xff - cDest[3]; - (*state->blendFunc)(cSrc2, cDest2, cBlend, bitmap->mode); - // convert result back to subtractive - cBlend[0] = 0xff - cBlend[0]; - cBlend[1] = 0xff - cBlend[1]; - cBlend[2] = 0xff - cBlend[2]; - cBlend[3] = 0xff - cBlend[3]; - } else -#endif (*state->blendFunc)(cSrc, cDest, cBlend, bitmap->mode); } @@ -3375,7 +3354,8 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData, SplashColorMode srcMode, GBool srcAlpha, - int w, int h, SplashCoord *mat) { + int w, int h, SplashCoord *mat, + GBool tilingPattern) { GBool ok; SplashBitmap *scaledImg; SplashClipResult clipRes; @@ -3456,6 +3436,9 @@ } scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h, scaledWidth, scaledHeight); + if (scaledImg == NULL) { + return splashErrBadArg; + } blitImage(scaledImg, srcAlpha, x0, y0, clipRes); delete scaledImg; } @@ -3491,6 +3474,9 @@ } scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h, scaledWidth, scaledHeight); + if (scaledImg == NULL) { + return splashErrBadArg; + } vertFlipImage(scaledImg, scaledWidth, scaledHeight, nComps); blitImage(scaledImg, srcAlpha, x0, y0, clipRes); delete scaledImg; @@ -3499,7 +3485,7 @@ // all other cases } else { return arbitraryTransformImage(src, srcData, srcMode, nComps, srcAlpha, - w, h, mat); + w, h, mat, tilingPattern); } return splashOk; @@ -3509,7 +3495,8 @@ SplashColorMode srcMode, int nComps, GBool srcAlpha, int srcWidth, int srcHeight, - SplashCoord *mat) { + SplashCoord *mat, + GBool tilingPattern) { SplashBitmap *scaledImg; SplashClipResult clipRes, clipRes2; SplashPipe pipe; @@ -3558,44 +3545,53 @@ } // compute the scale factors - if (mat[0] >= 0) { - t0 = imgCoordMungeUpper(mat[0] + mat[4]) - imgCoordMungeLower(mat[4]); + if (splashAbs(mat[0]) >= splashAbs(mat[1])) { + scaledWidth = xMax - xMin; + scaledHeight = yMax - yMin; } else { - t0 = imgCoordMungeUpper(mat[4]) - imgCoordMungeLower(mat[0] + mat[4]); + scaledWidth = yMax - yMin; + scaledHeight = xMax - xMin; } - if (mat[1] >= 0) { - t1 = imgCoordMungeUpper(mat[1] + mat[5]) - imgCoordMungeLower(mat[5]); - } else { - t1 = imgCoordMungeUpper(mat[5]) - imgCoordMungeLower(mat[1] + mat[5]); - } - scaledWidth = t0 > t1 ? t0 : t1; - if (mat[2] >= 0) { - t0 = imgCoordMungeUpper(mat[2] + mat[4]) - imgCoordMungeLower(mat[4]); - if (splashAbs(mat[1]) >= 1) { - th = imgCoordMungeUpper(mat[2]) - imgCoordMungeLower(mat[0] * mat[3] / mat[1]); - if (th > t0) t0 = th; + if (scaledHeight <= 1 || scaledHeight <= 1 || tilingPattern) { + if (mat[0] >= 0) { + t0 = imgCoordMungeUpper(mat[0] + mat[4]) - imgCoordMungeLower(mat[4]); + } else { + t0 = imgCoordMungeUpper(mat[4]) - imgCoordMungeLower(mat[0] + mat[4]); } - } else { - t0 = imgCoordMungeUpper(mat[4]) - imgCoordMungeLower(mat[2] + mat[4]); - if (splashAbs(mat[1]) >= 1) { - th = imgCoordMungeUpper(mat[0] * mat[3] / mat[1]) - imgCoordMungeLower(mat[2]); - if (th > t0) t0 = th; + if (mat[1] >= 0) { + t1 = imgCoordMungeUpper(mat[1] + mat[5]) - imgCoordMungeLower(mat[5]); + } else { + t1 = imgCoordMungeUpper(mat[5]) - imgCoordMungeLower(mat[1] + mat[5]); } - } - if (mat[3] >= 0) { - t1 = imgCoordMungeUpper(mat[3] + mat[5]) - imgCoordMungeLower(mat[5]); - if (splashAbs(mat[0]) >= 1) { - th = imgCoordMungeUpper(mat[3]) - imgCoordMungeLower(mat[1] * mat[2] / mat[0]); - if (th > t1) t1 = th; + scaledWidth = t0 > t1 ? t0 : t1; + if (mat[2] >= 0) { + t0 = imgCoordMungeUpper(mat[2] + mat[4]) - imgCoordMungeLower(mat[4]); + if (splashAbs(mat[1]) >= 1) { + th = imgCoordMungeUpper(mat[2]) - imgCoordMungeLower(mat[0] * mat[3] / mat[1]); + if (th > t0) t0 = th; + } + } else { + t0 = imgCoordMungeUpper(mat[4]) - imgCoordMungeLower(mat[2] + mat[4]); + if (splashAbs(mat[1]) >= 1) { + th = imgCoordMungeUpper(mat[0] * mat[3] / mat[1]) - imgCoordMungeLower(mat[2]); + if (th > t0) t0 = th; + } } - } else { - t1 = imgCoordMungeUpper(mat[5]) - imgCoordMungeLower(mat[3] + mat[5]); - if (splashAbs(mat[0]) >= 1) { - th = imgCoordMungeUpper(mat[1] * mat[2] / mat[0]) - imgCoordMungeLower(mat[3]); - if (th > t1) t1 = th; + if (mat[3] >= 0) { + t1 = imgCoordMungeUpper(mat[3] + mat[5]) - imgCoordMungeLower(mat[5]); + if (splashAbs(mat[0]) >= 1) { + th = imgCoordMungeUpper(mat[3]) - imgCoordMungeLower(mat[1] * mat[2] / mat[0]); + if (th > t1) t1 = th; + } + } else { + t1 = imgCoordMungeUpper(mat[5]) - imgCoordMungeLower(mat[3] + mat[5]); + if (splashAbs(mat[0]) >= 1) { + th = imgCoordMungeUpper(mat[1] * mat[2] / mat[0]) - imgCoordMungeLower(mat[3]); + if (th > t1) t1 = th; + } } + scaledHeight = t0 > t1 ? t0 : t1; } - scaledHeight = t0 > t1 ? t0 : t1; if (scaledWidth == 0) { scaledWidth = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/splash/Splash.h new/poppler-0.20.3/splash/Splash.h --- old/poppler-0.20.2/splash/Splash.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/splash/Splash.h 2012-07-12 22:18:53.000000000 +0200 @@ -209,7 +209,7 @@ // The matrix behaves as for fillImageMask. SplashError drawImage(SplashImageSource src, void *srcData, SplashColorMode srcMode, GBool srcAlpha, - int w, int h, SplashCoord *mat); + int w, int h, SplashCoord *mat, GBool tilingPattern = gFalse); // Composite a rectangular region from <src> onto this Splash // object. @@ -348,7 +348,7 @@ SplashColorMode srcMode, int nComps, GBool srcAlpha, int srcWidth, int srcHeight, - SplashCoord *mat); + SplashCoord *mat, GBool tilingPattern = gFalse); SplashBitmap *scaleImage(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, GBool srcAlpha, int srcWidth, int srcHeight, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/splash/SplashFTFont.h new/poppler-0.20.3/splash/SplashFTFont.h --- old/poppler-0.20.2/splash/SplashFTFont.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/splash/SplashFTFont.h 2012-07-19 00:21:44.000000000 +0200 @@ -23,7 +23,7 @@ #ifndef SPLASHFTFONT_H #define SPLASHFTFONT_H -#include "poppler/poppler-config.h" +#include "poppler-config.h" #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/splash/SplashMath.h new/poppler-0.20.3/splash/SplashMath.h --- old/poppler-0.20.2/splash/SplashMath.h 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/splash/SplashMath.h 2012-07-19 00:21:44.000000000 +0200 @@ -21,7 +21,7 @@ #ifndef SPLASHMATH_H #define SPLASHMATH_H -#include "poppler/poppler-config.h" +#include "poppler-config.h" #if USE_FIXEDPOINT #include "goo/FixedPoint.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.20.2/utils/pdfseparate.cc new/poppler-0.20.3/utils/pdfseparate.cc --- old/poppler-0.20.2/utils/pdfseparate.cc 2012-05-10 22:05:44.000000000 +0200 +++ new/poppler-0.20.3/utils/pdfseparate.cc 2012-07-19 00:03:01.000000000 +0200 @@ -5,6 +5,7 @@ // This file is licensed under the GPLv2 or later // // Copyright (C) 2011, 2012 Thomas Freitag <[email protected]> +// Copyright (C) 2012 Albert Astals Cid <[email protected]> // //======================================================================== #include "config.h" @@ -109,7 +110,10 @@ goto err0; } globalParams = new GlobalParams(); - extractPages (argv[1], argv[2]); + ok = extractPages (argv[1], argv[2]); + if (ok) { + exitCode = 0; + } delete globalParams; err0: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
