Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2015-11-23 07:29:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2015-10-17 16:36:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2015-11-23 07:29:57.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Nov 17 11:23:16 UTC 2015 - zai...@opensuse.org + +- Update to version 0.38.0: + + core: + - Splash: Multiply opacity in case of pattern colorspace + (fdo#92592). + - Small form improvements on non ascii character rendering. + - Clarify README. + + build system: Clarify internal DCT and JPX are only provided as + deprecated fallbacks. + + utils: pdftocairo: fix fit to page transformation. +- Bump soname following upstream changes. + +------------------------------------------------------------------- poppler-qt5.changes: same change poppler.changes: same change Old: ---- poppler-0.37.0.tar.xz New: ---- poppler-0.38.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.tJG61u/_old 2015-11-23 07:29:58.000000000 +0100 +++ /var/tmp/diff_new_pack.tJG61u/_new 2015-11-23 07:29:58.000000000 +0100 @@ -21,11 +21,11 @@ Name: poppler-qt %define _name poppler -Version: 0.37.0 +Version: 0.38.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 -%define poppler_soname 56 +%define poppler_soname 57 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 poppler-qt5.spec: same change ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.tJG61u/_old 2015-11-23 07:29:58.000000000 +0100 +++ /var/tmp/diff_new_pack.tJG61u/_new 2015-11-23 07:29:58.000000000 +0100 @@ -21,11 +21,11 @@ Name: poppler %define _name poppler -Version: 0.37.0 +Version: 0.38.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 -%define poppler_soname 56 +%define poppler_soname 57 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler-0.37.0.tar.xz -> poppler-0.38.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/CMakeLists.txt new/poppler-0.38.0/CMakeLists.txt --- old/poppler-0.37.0/CMakeLists.txt 2015-10-09 18:22:28.000000000 +0200 +++ new/poppler-0.38.0/CMakeLists.txt 2015-11-16 21:43:54.000000000 +0100 @@ -22,7 +22,7 @@ endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "37") +set(POPPLER_MINOR_VERSION "38") set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") @@ -478,7 +478,7 @@ else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 56.0.0 SOVERSION 56) +set_target_properties(poppler PROPERTIES VERSION 57.0.0 SOVERSION 57) 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}) @@ -737,6 +737,22 @@ show_end_message_yesno("command line utils" ENABLE_UTILS) show_end_message("test data dir" ${TESTDATADIR}) +if(NOT ENABLE_SPLASH AND NOT CAIRO_FOUND) + message("Warning: There is no rendering backend enabled") +endif(NOT ENABLE_SPLASH AND NOT CAIRO_FOUND) + if(USE_FIXEDPOINT AND USE_FLOAT) message("Warning: Single precision and fixed point options should not be enabled at the same time") endif(USE_FIXEDPOINT AND USE_FLOAT) + +if(NOT ENABLE_LIBJPEG) + message("Warning: Using libjpeg is recommended. The internal DCT decoder is unmaintained.") +endif(NOT ENABLE_LIBJPEG) + +if(ENABLE_ZLIB) + message("Warning: Using zlib is not totally safe") +endif(ENABLE_ZLIB) + +if(NOT WITH_OPENJPEG) + message("Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained.") +endif(NOT WITH_OPENJPEG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/ChangeLog new/poppler-0.38.0/ChangeLog --- old/poppler-0.37.0/ChangeLog 2015-10-09 22:08:47.000000000 +0200 +++ new/poppler-0.38.0/ChangeLog 2015-11-16 21:55:41.000000000 +0100 @@ -1,3 +1,130 @@ +commit c63aa0c153fc114e6457fc89a40a9aa2a5508b9a +Author: Albert Astals Cid <aa...@kde.org> +Date: Mon Nov 16 21:44:17 2015 +0100 + + Poppler 0.38 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 19 insertions(+), 7 deletions(-) + +commit 6ca4afcea790d9118af3cda4961a647485fb14e8 +Author: Albert Astals Cid <aa...@kde.org> +Date: Mon Nov 16 21:40:20 2015 +0100 + + Update copyright years + + utils/pdftocairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e14049bc5b85f8ae2e1a56bc09480a499343e49 +Author: Adrian Johnson <ajohn...@redneon.com> +Date: Sat Oct 31 18:32:49 2015 +1030 + + pdftocairo: fix fit to page transformation + + Testing with the test case in bug 87161 revealed some bugs. + + utils/pdftocairo.cc | 42 ++++++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 22 deletions(-) + +commit 3167964d70647d7b04e3ef8f415d5935990ecc9a +Author: Thomas Freitag <thomas.frei...@alfa.de> +Date: Wed Oct 28 23:13:44 2015 +0100 + + Multiply opacity in case of pattern colorspace + + Bug #92592 + + poppler/Gfx.cc | 4 +++- + poppler/OutputDev.h | 4 +++- + poppler/SplashOutputDev.cc | 8 ++++++++ + poppler/SplashOutputDev.h | 2 ++ + splash/Splash.cc | 16 ++++++++++++++-- + splash/Splash.h | 2 ++ + splash/SplashState.cc | 11 ++++++++++- + splash/SplashState.h | 5 ++++- + 8 files changed, 46 insertions(+), 6 deletions(-) + +commit c20f68ce434366bbec4077824da97ce843ecdff3 +Author: Marek Kasik <mka...@redhat.com> +Date: Thu Oct 22 16:15:23 2015 +0200 + + forms: Fix showing of some non-ASCII characters + + The &uChar is an array with just 1 member not 2. + This fixes mapping of some Unicode characters to + character codes. + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 64735113b203bb5adaaadc65641ef6c971f82bc6 +Author: Marek Kasik <mka...@redhat.com> +Date: Fri Oct 23 10:15:47 2015 +0200 + + forms: Find correct glyph or return 0 + + Function CharCodeToUnicode::mapToCharCode() could return + wrong character code for given unicode character because + of wrongly placed continue statement. + + poppler/CharCodeToUnicode.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fb906dca8b84d03267099cc3174c50e932a55236 +Author: Adrian Johnson <ajohn...@redneon.com> +Date: Thu Oct 15 07:19:16 2015 +1030 + + cmake: synchronize warnings with configure + + CMakeLists.txt | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 6329e3999d0a45b4c0cd0a8b675362e694bf1243 +Author: Adrian Johnson <ajohn...@redneon.com> +Date: Thu Oct 15 07:11:13 2015 +1030 + + configure: warn that the internal DCT/JPX decoders are unmaintained + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 67e1463dc65f85aec1f85b5bace9e810bf477e15 +Author: Albert Astals Cid <aa...@kde.org> +Date: Mon Oct 12 16:49:34 2015 +0200 + + Clarify getting a xpdf license does not allow you to use poppler in + closed source projects + + README | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 44e1a2f715d0da8bb2941da296faab7ee144cfc2 +Author: Albert Astals Cid <aa...@kde.org> +Date: Fri Oct 9 23:28:03 2015 +0200 + + Poppler 0.37 + + CMakeLists.txt | 4 ++-- + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + gtk-doc.make | 20 ++++++++++++-------- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 12 files changed, 36 insertions(+), 19 deletions(-) + commit e8cb16bff48dbe2d9efd988ddb09608406d2633b Author: Adrian Johnson <ajohn...@redneon.com> Date: Sun Sep 27 15:34:12 2015 +0930 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/Makefile.in new/poppler-0.38.0/Makefile.in --- old/poppler-0.37.0/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/Makefile.in 2015-11-16 21:45:23.000000000 +0100 @@ -457,6 +457,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/NEWS new/poppler-0.38.0/NEWS --- old/poppler-0.37.0/NEWS 2015-10-09 18:20:56.000000000 +0200 +++ new/poppler-0.38.0/NEWS 2015-11-16 21:42:49.000000000 +0100 @@ -1,3 +1,15 @@ +Release 0.38.0 + core: + * Splash: Multiply opacity in case of pattern colorspace. Bug #92592 + * Small form improvements on non ascii character rendering + * Clarify README + + build system: + * Clarify internal DCT and JPX are only provided as deprecated fallbacks + + utils: + * pdftocairo: fix fit to page transformation + Release 0.37.0 core: * CairoOutputDev: Use mask for even-odd fill. Bug #84527 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/README new/poppler-0.38.0/README --- old/poppler-0.37.0/README 2014-02-09 16:10:30.000000000 +0100 +++ new/poppler-0.38.0/README 2015-10-28 23:11:49.000000000 +0100 @@ -29,7 +29,9 @@ not the LGPL. Consequently, any application using poppler must also be licensed under the GPL. If you want to incorporate Xpdf based PDF rendering in a closed source product, please contact Glyph & Cog -(www.glyphandcog.com) for commercial licensing options. +(www.glyphandcog.com) for commercial licensing options. Note that +this only allows you to use xpdf in a closed source product, +not poppler itself. Kristian Høgsberg, Feb. 27, 2005 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/configure new/poppler-0.38.0/configure --- old/poppler-0.37.0/configure 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/configure 2015-11-16 21:45:23.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.37.0. +# Generated by GNU Autoconf 2.69 for poppler 0.38.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.37.0' -PACKAGE_STRING='poppler 0.37.0' +PACKAGE_VERSION='0.38.0' +PACKAGE_STRING='poppler 0.38.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -876,6 +876,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1028,6 +1029,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1280,6 +1282,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1417,7 +1428,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1530,7 +1541,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.37.0 to adapt to many kinds of systems. +\`configure' configures poppler 0.38.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1570,6 +1581,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1604,7 +1616,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.37.0:";; + short | recursive ) echo "Configuration of poppler 0.38.0:";; esac cat <<\_ACEOF @@ -1824,7 +1836,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.37.0 +poppler configure 0.38.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2518,7 +2530,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.37.0, which was +It was created by poppler $as_me 0.38.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3382,7 +3394,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.37.0' + VERSION='0.38.0' cat >>confdefs.h <<_ACEOF @@ -17778,7 +17790,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.37.0" +#define POPPLER_VERSION "0.38.0" _ACEOF @@ -25010,11 +25022,11 @@ POPPLER_MAJOR_VERSION=0 -POPPLER_MINOR_VERSION=37 +POPPLER_MINOR_VERSION=38 POPPLER_MICRO_VERSION=0 -POPPLER_VERSION=0.37.0 +POPPLER_VERSION=0.38.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 qt5/Makefile qt5/src/Makefile qt5/tests/Makefile qt5/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-qt5.pc poppler-qt5-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc" @@ -25666,7 +25678,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.37.0, which was +This file was extended by poppler $as_me 0.38.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25732,7 +25744,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.37.0 +poppler config.status 0.38.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -27865,7 +27877,7 @@ fi if test x$enable_libjpeg != xyes; then - echo " Warning: Using libjpeg is recommended" + echo " Warning: Using libjpeg is recommended. The internal DCT decoder is unmaintained." fi if test x$enable_zlib != xno; then @@ -27873,5 +27885,5 @@ fi if test x$enable_libopenjpeg != xyes; then - echo " Warning: Using libopenjpeg is recommended" + echo " Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained." fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/configure.ac new/poppler-0.38.0/configure.ac --- old/poppler-0.37.0/configure.ac 2015-10-09 18:21:07.000000000 +0200 +++ new/poppler-0.38.0/configure.ac 2015-11-16 21:42:58.000000000 +0100 @@ -1,5 +1,5 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[37]) +m4_define([poppler_version_minor],[38]) m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) @@ -1038,7 +1038,7 @@ fi if test x$enable_libjpeg != xyes; then - echo " Warning: Using libjpeg is recommended" + echo " Warning: Using libjpeg is recommended. The internal DCT decoder is unmaintained." fi if test x$enable_zlib != xno; then @@ -1046,5 +1046,5 @@ fi if test x$enable_libopenjpeg != xyes; then - echo " Warning: Using libopenjpeg is recommended" + echo " Warning: Using libopenjpeg is recommended. The internal JPX decoder is unmaintained." fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/cpp/Makefile.in new/poppler-0.38.0/cpp/Makefile.in --- old/poppler-0.37.0/cpp/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/cpp/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -485,6 +485,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/cpp/poppler-version.h new/poppler-0.38.0/cpp/poppler-version.h --- old/poppler-0.37.0/cpp/poppler-version.h 2015-10-09 18:25:53.000000000 +0200 +++ new/poppler-0.38.0/cpp/poppler-version.h 2015-11-16 21:45:33.000000000 +0100 @@ -21,9 +21,9 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.37.0" +#define POPPLER_VERSION "0.38.0" #define POPPLER_VERSION_MAJOR 0 -#define POPPLER_VERSION_MINOR 37 +#define POPPLER_VERSION_MINOR 38 #define POPPLER_VERSION_MICRO 0 namespace poppler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/cpp/tests/Makefile.in new/poppler-0.38.0/cpp/tests/Makefile.in --- old/poppler-0.37.0/cpp/tests/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/cpp/tests/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -385,6 +385,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/fofi/Makefile.in new/poppler-0.38.0/fofi/Makefile.in --- old/poppler-0.37.0/fofi/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/fofi/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -429,6 +429,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/Makefile.in new/poppler-0.38.0/glib/Makefile.in --- old/poppler-0.37.0/glib/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/glib/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -498,6 +498,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/demo/Makefile.in new/poppler-0.38.0/glib/demo/Makefile.in --- old/poppler-0.37.0/glib/demo/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/glib/demo/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -416,6 +416,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/Makefile.in new/poppler-0.38.0/glib/reference/Makefile.in --- old/poppler-0.37.0/glib/reference/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -333,6 +333,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -758,7 +759,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -769,6 +770,17 @@ sgml.stamp: sgml-build.stamp @true +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo "<!ENTITY package \"$(PACKAGE)\">"; \ + echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \ + echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \ + echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \ + echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \ + echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \ + echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \ + ) > $@ + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/html/PopplerAttachment.html new/poppler-0.38.0/glib/reference/html/PopplerAttachment.html --- old/poppler-0.37.0/glib/reference/html/PopplerAttachment.html 2015-10-09 22:08:49.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/html/PopplerAttachment.html 2015-11-16 21:55:44.000000000 +0100 @@ -100,7 +100,7 @@ <a name="PopplerAttachmentSaveFunc"></a><h3>PopplerAttachmentSaveFunc ()</h3> <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <span class="c_punctuation">(</span>*PopplerAttachmentSaveFunc<span class="c_punctuation">)</span> (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *buf</code></em>, - <em class="parameter"><code><span class="type">gsize</span> count</code></em>, + <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> count</code></em>, <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>, <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> <p>Specifies the type of the function passed to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/html/PopplerDocument.html new/poppler-0.38.0/glib/reference/html/PopplerDocument.html --- old/poppler-0.37.0/glib/reference/html/PopplerDocument.html 2015-10-09 22:08:49.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/html/PopplerDocument.html 2015-11-16 21:55:44.000000000 +0100 @@ -808,7 +808,7 @@ <a name="poppler-document-new-from-stream"></a><h3>poppler_document_new_from_stream ()</h3> <pre class="programlisting"><a class="link" href="PopplerDocument.html" title="PopplerDocument"><span class="returnvalue">PopplerDocument</span></a> * poppler_document_new_from_stream (<em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GInputStream.html"><span class="type">GInputStream</span></a> *stream</code></em>, - <em class="parameter"><code><span class="type">goffset</span> length</code></em>, + <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#goffset"><span class="type">goffset</span></a> length</code></em>, <em class="parameter"><code>const <span class="type">char</span> *password</code></em>, <em class="parameter"><code><a href="https://developer.gnome.org/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> *cancellable</code></em>, <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/html/PopplerMedia.html new/poppler-0.38.0/glib/reference/html/PopplerMedia.html --- old/poppler-0.37.0/glib/reference/html/PopplerMedia.html 2015-10-09 22:08:49.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/html/PopplerMedia.html 2015-11-16 21:55:44.000000000 +0100 @@ -122,7 +122,7 @@ <a name="PopplerMediaSaveFunc"></a><h3>PopplerMediaSaveFunc ()</h3> <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <span class="c_punctuation">(</span>*PopplerMediaSaveFunc<span class="c_punctuation">)</span> (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *buf</code></em>, - <em class="parameter"><code><span class="type">gsize</span> count</code></em>, + <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> count</code></em>, <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> data</code></em>, <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> <p>Specifies the type of the function passed to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/html/index.html new/poppler-0.38.0/glib/reference/html/index.html --- old/poppler-0.37.0/glib/reference/html/index.html 2015-10-09 22:08:49.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/html/index.html 2015-11-16 21:55:44.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.37.0 + for Poppler 0.38.0 </p></div> </div> Files old/poppler-0.37.0/glib/reference/html/left-insensitive.png and new/poppler-0.38.0/glib/reference/html/left-insensitive.png differ Files old/poppler-0.37.0/glib/reference/html/left.png and new/poppler-0.38.0/glib/reference/html/left.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/html/poppler-PopplerColor.html new/poppler-0.38.0/glib/reference/html/poppler-PopplerColor.html --- old/poppler-0.37.0/glib/reference/html/poppler-PopplerColor.html 2015-10-09 22:08:49.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/html/poppler-PopplerColor.html 2015-11-16 21:55:44.000000000 +0100 @@ -172,17 +172,17 @@ </colgroup> <tbody> <tr> -<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="PopplerColor.red"></a>red</code></em>;</p></td> +<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="PopplerColor.red"></a>red</code></em>;</p></td> <td class="struct_member_description"><p>the red componment of color</p></td> <td class="struct_member_annotations"> </td> </tr> <tr> -<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="PopplerColor.green"></a>green</code></em>;</p></td> +<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="PopplerColor.green"></a>green</code></em>;</p></td> <td class="struct_member_description"><p>the green component of color</p></td> <td class="struct_member_annotations"> </td> </tr> <tr> -<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="PopplerColor.blue"></a>blue</code></em>;</p></td> +<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="PopplerColor.blue"></a>blue</code></em>;</p></td> <td class="struct_member_description"><p>the blue component of color</p></td> <td class="struct_member_annotations"> </td> </tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.38.0/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.37.0/glib/reference/html/poppler-Version-and-Features-Information.html 2015-10-09 22:08:49.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/html/poppler-Version-and-Features-Information.html 2015-11-16 21:55:44.000000000 +0100 @@ -119,7 +119,7 @@ <hr> <div class="refsect2"> <a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3> -<pre class="programlisting">#define POPPLER_MINOR_VERSION (37) +<pre class="programlisting">#define POPPLER_MINOR_VERSION (38) </pre> <p>The major version number of the poppler header files (e.g. in poppler version 0.1.2 this is 1.)</p> Files old/poppler-0.37.0/glib/reference/html/right.png and new/poppler-0.38.0/glib/reference/html/right.png differ Files old/poppler-0.37.0/glib/reference/html/up-insensitive.png and new/poppler-0.38.0/glib/reference/html/up-insensitive.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/glib/reference/version.xml new/poppler-0.38.0/glib/reference/version.xml --- old/poppler-0.37.0/glib/reference/version.xml 2015-10-09 18:25:53.000000000 +0200 +++ new/poppler-0.38.0/glib/reference/version.xml 2015-11-16 21:45:32.000000000 +0100 @@ -1 +1 @@ -0.37.0 +0.38.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/goo/Makefile.in new/poppler-0.38.0/goo/Makefile.in --- old/poppler-0.37.0/goo/Makefile.in 2015-10-09 18:25:46.000000000 +0200 +++ new/poppler-0.38.0/goo/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -434,6 +434,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/gtk-doc.make new/poppler-0.38.0/gtk-doc.make --- old/poppler-0.37.0/gtk-doc.make 2015-10-09 18:24:13.000000000 +0200 +++ new/poppler-0.38.0/gtk-doc.make 2015-11-16 21:44:50.000000000 +0100 @@ -142,7 +142,7 @@ GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XML_0=@echo " DOC Building XML"; -sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -153,6 +153,17 @@ sgml.stamp: sgml-build.stamp @true +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo "<!ENTITY package \"$(PACKAGE)\">"; \ + echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \ + echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \ + echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \ + echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \ + echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \ + echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \ + ) > $@ + #### html #### GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/Annot.cc new/poppler-0.38.0/poppler/Annot.cc --- old/poppler-0.37.0/poppler/Annot.cc 2015-10-09 18:13:49.000000000 +0200 +++ new/poppler-0.38.0/poppler/Annot.cc 2015-10-28 23:11:49.000000000 +0100 @@ -29,7 +29,7 @@ // Copyright (C) 2012, 2015 Tobias Koenig <to...@kdab.com> // Copyright (C) 2013 Peter Breitenlohner <p...@mppmu.mpg.de> // Copyright (C) 2013 Adrian Johnson <ajohn...@redneon.com> -// Copyright (C) 2014 Marek Kasik <mka...@redhat.com> +// Copyright (C) 2014, 2015 Marek Kasik <mka...@redhat.com> // Copyright (C) 2014 Jiri Slaby <jirisl...@gmail.com> // Copyright (C) 2014 Anuj Khare <khareanu...@gmail.com> // Copyright (C) 2015 Petr Gajdos <pgaj...@suse.cz> @@ -4125,7 +4125,7 @@ // This assumes an identity CMap. outBuf->append((uChar >> 8) & 0xff); outBuf->append(uChar & 0xff); - } else if (ccToUnicode->mapToCharCode(&uChar, &c, 2)) { + } else if (ccToUnicode->mapToCharCode(&uChar, &c, 1)) { ccToUnicode->decRefCnt(); if (font->isCIDFont()) { // TODO: This assumes an identity CMap. It should be extended to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/CharCodeToUnicode.cc new/poppler-0.38.0/poppler/CharCodeToUnicode.cc --- old/poppler-0.37.0/poppler/CharCodeToUnicode.cc 2015-09-25 01:20:26.000000000 +0200 +++ new/poppler-0.38.0/poppler/CharCodeToUnicode.cc 2015-10-28 23:11:49.000000000 +0100 @@ -23,6 +23,7 @@ // Copyright (C) 2012 Thomas Freitag <thomas.frei...@alfa.de> // Copyright (C) 2012 Adrian Johnson <ajohn...@redneon.com> // Copyright (C) 2014 Jiri Slaby <jirisl...@gmail.com> +// Copyright (C) 2015 Marek Kasik <mka...@redhat.com> // // 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 @@ -656,7 +657,7 @@ //compare the string char by char for (j=0; j<sMap[i].len; j++) { if (sMap[i].u[j] != u[j]) { - continue; + break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/Gfx.cc new/poppler-0.38.0/poppler/Gfx.cc --- old/poppler-0.37.0/poppler/Gfx.cc 2015-02-09 22:30:14.000000000 +0100 +++ new/poppler-0.38.0/poppler/Gfx.cc 2015-11-15 22:05:22.000000000 +0100 @@ -28,7 +28,7 @@ // Copyright (C) 2008 Michael Vrable <mvra...@cs.ucsd.edu> // Copyright (C) 2008 Hib Eris <h...@hiberis.nl> // Copyright (C) 2009 M Joonas Pihlaja <jpihl...@cc.helsinki.fi> -// Copyright (C) 2009-2014 Thomas Freitag <thomas.frei...@alfa.de> +// Copyright (C) 2009-2015 Thomas Freitag <thomas.frei...@alfa.de> // Copyright (C) 2009 William Bader <williamba...@hotmail.com> // Copyright (C) 2009, 2010 David Benjamin <david...@mit.edu> // Copyright (C) 2010 Nils Höglund <nils.hogl...@gmail.com> @@ -2283,6 +2283,7 @@ xi0, yi0, xi1, yi1, xstep, ystep)) { goto restore; } else { + out->updatePatternOpacity(state); for (yi = yi0; yi < yi1; ++yi) { for (xi = xi0; xi < xi1; ++xi) { x = xi * xstep; @@ -2293,6 +2294,7 @@ m1, tPat->getBBox()); } } + out->clearPatternOpacity(state); } // restore graphics state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/Makefile.am new/poppler-0.38.0/poppler/Makefile.am --- old/poppler-0.37.0/poppler/Makefile.am 2015-10-09 18:22:37.000000000 +0200 +++ new/poppler-0.38.0/poppler/Makefile.am 2015-11-16 21:44:06.000000000 +0100 @@ -296,7 +296,7 @@ $(win32_libs) libpoppler_la_LDFLAGS = \ - -version-info 56:0:0 \ + -version-info 57:0:0 \ @create_shared_lib@ \ @auto_import_flags@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/Makefile.in new/poppler-0.38.0/poppler/Makefile.in --- old/poppler-0.37.0/poppler/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/poppler/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -539,6 +539,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -805,7 +806,7 @@ $(win32_libs) libpoppler_la_LDFLAGS = \ - -version-info 56:0:0 \ + -version-info 57:0:0 \ @create_shared_lib@ \ @auto_import_flags@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/OutputDev.h new/poppler-0.38.0/poppler/OutputDev.h --- old/poppler-0.37.0/poppler/OutputDev.h 2015-01-02 19:18:04.000000000 +0100 +++ new/poppler-0.38.0/poppler/OutputDev.h 2015-10-28 23:13:28.000000000 +0100 @@ -17,7 +17,7 @@ // Copyright (C) 2006 Thorkild Stray <thork...@ifi.uio.no> // Copyright (C) 2007 Jeff Muizelaar <j...@infidigm.net> // Copyright (C) 2007, 2011 Adrian Johnson <ajohn...@redneon.com> -// Copyright (C) 2009-2013 Thomas Freitag <thomas.frei...@alfa.de> +// Copyright (C) 2009-2013, 2015 Thomas Freitag <thomas.frei...@alfa.de> // Copyright (C) 2009, 2011 Carlos Garcia Campos <carlo...@gnome.org> // Copyright (C) 2009, 2012, 2013 Albert Astals Cid <aa...@kde.org> // Copyright (C) 2010 Christian Feuers�nger <cfeuersaen...@googlemail.com> @@ -185,6 +185,8 @@ virtual void updateBlendMode(GfxState * /*state*/) {} virtual void updateFillOpacity(GfxState * /*state*/) {} virtual void updateStrokeOpacity(GfxState * /*state*/) {} + virtual void updatePatternOpacity(GfxState * /*state*/) {} + virtual void clearPatternOpacity(GfxState * /*state*/) {} virtual void updateFillOverprint(GfxState * /*state*/) {} virtual void updateStrokeOverprint(GfxState * /*state*/) {} virtual void updateOverprintMode(GfxState * /*state*/) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/SplashOutputDev.cc new/poppler-0.38.0/poppler/SplashOutputDev.cc --- old/poppler-0.37.0/poppler/SplashOutputDev.cc 2015-10-09 18:13:50.000000000 +0200 +++ new/poppler-0.38.0/poppler/SplashOutputDev.cc 2015-11-15 22:05:22.000000000 +0100 @@ -1842,6 +1842,14 @@ } } +void SplashOutputDev::updatePatternOpacity(GfxState *state) { + splash->setPatternAlpha((SplashCoord)state->getStrokeOpacity(), (SplashCoord)state->getFillOpacity()); +} + +void SplashOutputDev::clearPatternOpacity(GfxState *state) { + splash->clearPatternAlpha(); +} + void SplashOutputDev::updateFillOverprint(GfxState *state) { splash->setFillOverprint(state->getFillOverprint()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/poppler/SplashOutputDev.h new/poppler-0.38.0/poppler/SplashOutputDev.h --- old/poppler-0.37.0/poppler/SplashOutputDev.h 2015-05-24 18:41:19.000000000 +0200 +++ new/poppler-0.38.0/poppler/SplashOutputDev.h 2015-10-28 23:12:47.000000000 +0100 @@ -231,6 +231,8 @@ virtual void updateBlendMode(GfxState *state); virtual void updateFillOpacity(GfxState *state); virtual void updateStrokeOpacity(GfxState *state); + virtual void updatePatternOpacity(GfxState *state); + virtual void clearPatternOpacity(GfxState *state); virtual void updateFillOverprint(GfxState *state); virtual void updateStrokeOverprint(GfxState *state); virtual void updateOverprintMode(GfxState *state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt4/Makefile.in new/poppler-0.38.0/qt4/Makefile.in --- old/poppler-0.37.0/qt4/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt4/Makefile.in 2015-11-16 21:45:24.000000000 +0100 @@ -386,6 +386,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt4/demos/Makefile.in new/poppler-0.38.0/qt4/demos/Makefile.in --- old/poppler-0.37.0/qt4/demos/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt4/demos/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -412,6 +412,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt4/src/Makefile.in new/poppler-0.38.0/qt4/src/Makefile.in --- old/poppler-0.37.0/qt4/src/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt4/src/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -450,6 +450,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt4/tests/Makefile.in new/poppler-0.38.0/qt4/tests/Makefile.in --- old/poppler-0.37.0/qt4/tests/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt4/tests/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -830,6 +830,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt5/Makefile.in new/poppler-0.38.0/qt5/Makefile.in --- old/poppler-0.37.0/qt5/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt5/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -386,6 +386,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt5/demos/Makefile.in new/poppler-0.38.0/qt5/demos/Makefile.in --- old/poppler-0.37.0/qt5/demos/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt5/demos/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -412,6 +412,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt5/src/Makefile.in new/poppler-0.38.0/qt5/src/Makefile.in --- old/poppler-0.37.0/qt5/src/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt5/src/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -450,6 +450,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/qt5/tests/Makefile.in new/poppler-0.38.0/qt5/tests/Makefile.in --- old/poppler-0.37.0/qt5/tests/Makefile.in 2015-10-09 18:25:47.000000000 +0200 +++ new/poppler-0.38.0/qt5/tests/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -830,6 +830,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/splash/Makefile.in new/poppler-0.38.0/splash/Makefile.in --- old/poppler-0.37.0/splash/Makefile.in 2015-10-09 18:25:48.000000000 +0200 +++ new/poppler-0.38.0/splash/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -426,6 +426,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/splash/Splash.cc new/poppler-0.38.0/splash/Splash.cc --- old/poppler-0.37.0/splash/Splash.cc 2015-10-09 15:50:25.000000000 +0200 +++ new/poppler-0.38.0/splash/Splash.cc 2015-10-28 23:12:47.000000000 +0100 @@ -1752,11 +1752,23 @@ } void Splash::setStrokeAlpha(SplashCoord alpha) { - state->strokeAlpha = alpha; + state->strokeAlpha = (state->multiplyPatternAlpha) ? alpha * state->patternStrokeAlpha : alpha; } void Splash::setFillAlpha(SplashCoord alpha) { - state->fillAlpha = alpha; + state->fillAlpha = (state->multiplyPatternAlpha) ? alpha * state->patternFillAlpha : alpha; +} + +void Splash::setPatternAlpha(SplashCoord strokeAlpha, SplashCoord fillAlpha) { + state->patternStrokeAlpha = strokeAlpha; + state->patternFillAlpha = fillAlpha; + state->multiplyPatternAlpha = gTrue; +} + +void Splash::clearPatternAlpha() { + state->patternStrokeAlpha = 1; + state->patternFillAlpha = 1; + state->multiplyPatternAlpha = gFalse; } void Splash::setFillOverprint(GBool fop) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/splash/Splash.h new/poppler-0.38.0/splash/Splash.h --- old/poppler-0.37.0/splash/Splash.h 2015-05-24 18:40:50.000000000 +0200 +++ new/poppler-0.38.0/splash/Splash.h 2015-11-15 22:05:22.000000000 +0100 @@ -129,6 +129,8 @@ void setBlendFunc(SplashBlendFunc func); void setStrokeAlpha(SplashCoord alpha); void setFillAlpha(SplashCoord alpha); + void setPatternAlpha(SplashCoord strokeAlpha, SplashCoord fillAlpha); + void clearPatternAlpha(); void setFillOverprint(GBool fop); void setStrokeOverprint(GBool sop); void setOverprintMode(int opm); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/splash/SplashState.cc new/poppler-0.38.0/splash/SplashState.cc --- old/poppler-0.37.0/splash/SplashState.cc 2014-02-09 16:10:34.000000000 +0100 +++ new/poppler-0.38.0/splash/SplashState.cc 2015-10-28 23:13:13.000000000 +0100 @@ -11,7 +11,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2009, 2011, 2012 Thomas Freitag <thomas.frei...@alfa.de> +// Copyright (C) 2009, 2011, 2012, 2015 Thomas Freitag <thomas.frei...@alfa.de> // // 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 @@ -59,6 +59,9 @@ blendFunc = NULL; strokeAlpha = 1; fillAlpha = 1; + multiplyPatternAlpha = gFalse; + patternStrokeAlpha = 1; + patternFillAlpha = 1; lineWidth = 0; lineCap = splashLineCapButt; lineJoin = splashLineJoinMiter; @@ -109,6 +112,9 @@ blendFunc = NULL; strokeAlpha = 1; fillAlpha = 1; + multiplyPatternAlpha = gFalse; + patternStrokeAlpha = 1; + patternFillAlpha = 1; lineWidth = 0; lineCap = splashLineCapButt; lineJoin = splashLineJoinMiter; @@ -152,6 +158,9 @@ blendFunc = state->blendFunc; strokeAlpha = state->strokeAlpha; fillAlpha = state->fillAlpha; + multiplyPatternAlpha = state->multiplyPatternAlpha; + patternStrokeAlpha = state->patternStrokeAlpha; + patternFillAlpha = state->patternFillAlpha; lineWidth = state->lineWidth; lineCap = state->lineCap; lineJoin = state->lineJoin; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/splash/SplashState.h new/poppler-0.38.0/splash/SplashState.h --- old/poppler-0.37.0/splash/SplashState.h 2014-12-01 20:52:31.000000000 +0100 +++ new/poppler-0.38.0/splash/SplashState.h 2015-11-15 22:05:22.000000000 +0100 @@ -11,7 +11,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2011, 2012 Thomas Freitag <thomas.frei...@alfa.de> +// Copyright (C) 2011, 2012, 2015 Thomas Freitag <thomas.frei...@alfa.de> // // 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 @@ -101,6 +101,9 @@ SplashBlendFunc blendFunc; SplashCoord strokeAlpha; SplashCoord fillAlpha; + GBool multiplyPatternAlpha; + SplashCoord patternStrokeAlpha; + SplashCoord patternFillAlpha; SplashCoord lineWidth; int lineCap; int lineJoin; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/test/Makefile.in new/poppler-0.38.0/test/Makefile.in --- old/poppler-0.37.0/test/Makefile.in 2015-10-09 18:25:48.000000000 +0200 +++ new/poppler-0.38.0/test/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -403,6 +403,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/utils/Makefile.in new/poppler-0.38.0/utils/Makefile.in --- old/poppler-0.37.0/utils/Makefile.in 2015-10-09 18:25:48.000000000 +0200 +++ new/poppler-0.38.0/utils/Makefile.in 2015-11-16 21:45:25.000000000 +0100 @@ -519,6 +519,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.37.0/utils/pdftocairo.cc new/poppler-0.38.0/utils/pdftocairo.cc --- old/poppler-0.37.0/utils/pdftocairo.cc 2014-11-03 20:05:05.000000000 +0100 +++ new/poppler-0.38.0/utils/pdftocairo.cc 2015-11-16 21:40:15.000000000 +0100 @@ -19,7 +19,7 @@ // Copyright (C) 2009 Shen Liang <shenzh...@gmail.com> // Copyright (C) 2009 Stefan Thomas <tho...@eload24.com> // Copyright (C) 2009, 2010 Albert Astals Cid <aa...@kde.org> -// Copyright (C) 2010, 2011-2014 Adrian Johnson <ajohn...@redneon.com> +// Copyright (C) 2010, 2011-2015 Adrian Johnson <ajohn...@redneon.com> // Copyright (C) 2010, 2014 Hib Eris <h...@hiberis.nl> // Copyright (C) 2010 Jonathan Liu <net...@gmail.com> // Copyright (C) 2010 William Bader <williamba...@hotmail.com> @@ -447,8 +447,13 @@ *width = page_w; *height = page_h; } else { - *width = paperWidth; - *height = paperHeight; + if (page_w > page_h) { + *width = paperHeight; + *height = paperWidth; + } else { + *width = paperWidth; + *height = paperHeight; + } } } else { getCropSize(page_w * (x_resolution / 72.0), @@ -470,27 +475,20 @@ else scale = y_scale; + if (scale > 1.0 && !expand) + scale = 1.0; + if (scale < 1.0 && noShrink) + scale = 1.0; + cairo_matrix_init_identity (m); - if (scale > 1.0) { - // page is smaller than paper - if (expand) { - // expand to fit - cairo_matrix_scale (m, scale, scale); - } else if (!noCenter) { - // centre page - cairo_matrix_translate (m, (paper_w - page_w)/2, (paper_h - page_h)/2); - } else { - if (!svg) { - // move to PostScript origin - cairo_matrix_translate (m, 0, (paper_h - page_h)); - } - } - } else if (scale < 1.0) - // page is larger than paper - if (!noShrink) { - // shrink to fit - cairo_matrix_scale (m, scale, scale); - } + if (!noCenter) { + // centre page + cairo_matrix_translate (m, (paper_w - page_w*scale)/2, (paper_h - page_h*scale)/2); + } else if (!svg) { + // move to PostScript origin + cairo_matrix_translate (m, 0, (paper_h - page_h*scale)); + } + cairo_matrix_scale (m, scale, scale); } static cairo_status_t writeStream(void *closure, const unsigned char *data, unsigned int length)