Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2013-06-05 13:07:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-04-17 09:24:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2013-06-05 13:07:52.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Jun 1 18:23:17 UTC 2013 - [email protected] + +- Update to version 0.22.4: + + core: + - Always consider a softmask transfer function (fdo#63587). + - Fix crash on malformed files (fdo#63190). + - Splash: Fix compilation with fixed point mode enabled. + + utils: Fix crash on some files (fdo#63909). + + qt4: Fix name decoding of some attachments (kde#307786). + + build system: Fix compilation with mingw-w64 compiler. +- Bump soname following upstream changes. + +------------------------------------------------------------------- poppler.changes: same change Old: ---- poppler-0.22.3.tar.gz New: ---- poppler-0.22.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.aVaRLF/_old 2013-06-05 13:07:53.000000000 +0200 +++ /var/tmp/diff_new_pack.aVaRLF/_new 2013-06-05 13:07:53.000000000 +0200 @@ -20,11 +20,11 @@ Name: poppler-qt %define _name poppler -Version: 0.22.3 +Version: 0.22.4 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 36 +%define poppler_soname 37 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.aVaRLF/_old 2013-06-05 13:07:53.000000000 +0200 +++ /var/tmp/diff_new_pack.aVaRLF/_new 2013-06-05 13:07:53.000000000 +0200 @@ -20,11 +20,11 @@ Name: poppler %define _name poppler -Version: 0.22.3 +Version: 0.22.4 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 -%define poppler_soname 36 +%define poppler_soname 37 %define poppler_cpp_soname 0 %define poppler_glib_soname 8 %define poppler_qt4_soname 4 ++++++ poppler-0.22.3.tar.gz -> poppler-0.22.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/CMakeLists.txt new/poppler-0.22.4/CMakeLists.txt --- old/poppler-0.22.3/CMakeLists.txt 2013-04-11 23:28:43.000000000 +0200 +++ new/poppler-0.22.4/CMakeLists.txt 2013-05-13 19:56:44.000000000 +0200 @@ -16,7 +16,7 @@ set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "22") -set(POPPLER_MICRO_VERSION "3") +set(POPPLER_MICRO_VERSION "4") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -396,7 +396,7 @@ else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 36.0.0 SOVERSION 36) +set_target_properties(poppler PROPERTIES VERSION 37.0.0 SOVERSION 37) target_link_libraries(poppler ${poppler_LIBS}) target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "") install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/ChangeLog new/poppler-0.22.4/ChangeLog --- old/poppler-0.22.3/ChangeLog 2013-04-11 23:32:14.000000000 +0200 +++ new/poppler-0.22.4/ChangeLog 2013-05-13 20:02:12.000000000 +0200 @@ -1,3 +1,143 @@ +commit 0c0aef20d9cecaee1de0badc6cd56dd6e5b5bf12 +Author: Albert Astals Cid <[email protected]> +Date: Mon May 13 19:57:02 2013 +0200 + + 0.22.4 version + + Also increase soversion since Gfx.h got a new member + + CMakeLists.txt | 4 ++-- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +commit 4d6662d05f6b652af97ac6e0eb1f1c1dca8e9550 +Author: Albert Astals Cid <[email protected]> +Date: Mon May 13 19:55:21 2013 +0200 + + 0.22.4 NEWS + + NEWS | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 93e08d96867d636a70ab04ee4ad22c2214ae4b6a +Author: Albert Astals Cid <[email protected]> +Date: Mon May 13 19:51:52 2013 +0200 + + Update copyright years + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 73d09cd55f3bd307450c2dd095e039ea39c69cea +Author: Albert Astals Cid <[email protected]> +Date: Mon May 13 19:28:40 2013 +0200 + + Fix compilation with fixed point mode enabled + + Thanks to Andreas Müller for the tip + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b3e44fc59a9258ad701bc67132dea0646fd8b61a +Author: Albert Astals Cid <[email protected]> +Date: Tue May 7 21:53:31 2013 +0200 + + We need UnicodeParsedString here too + + Fixes KDE bug #307786 + + qt4/src/poppler-embeddedfile.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a107428e7db0c420b60418a33b9f815909ac9a33 +Author: Albert Astals Cid <[email protected]> +Date: Thu Apr 25 20:44:36 2013 +0200 + + Update my C of the last two previous commits + + poppler/Gfx.cc | 2 +- + poppler/Gfx.h | 2 +- + utils/HtmlOutputDev.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit ec298b3b780f885464aa00880150eaa2b9b50b08 +Author: Albert Astals Cid <[email protected]> +Date: Thu Apr 25 20:29:24 2013 +0200 + + Do not start drawing a form we are already drawing + + Bug #63190 + + poppler/Gfx.cc | 23 +++++++++++++++++++---- + poppler/Gfx.h | 2 ++ + 2 files changed, 21 insertions(+), 4 deletions(-) + +commit 11ab42e7e90099d0cebf8f02197413fd5dee044b +Author: Albert Astals Cid <[email protected]> +Date: Thu Apr 25 20:27:43 2013 +0200 + + Make sure getKids returns != 0 before using it + + Fixes crash in bug #63909 + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4ee78e77f7d6cadc8e150ceff96b546ddca329d4 +Author: Carlos Garcia Campos <[email protected]> +Date: Sat Apr 20 16:41:56 2013 +0200 + + cairo: Always use the trasnfer function if present in setSoftMask + + "If the subtype is Alpha, the transparency group XObject G shall be + evaluated to compute a group alpha only. The colours of the + constituent + objects shall be ignored and the colour compositing computations shall + not be performed. The transfer function TR shall then be applied + to the + computed group alpha to produce the mask values." + + We were using the transfer function only for luminosity soft masks. + + https://bugs.freedesktop.org/show_bug.cgi?id=63587 + + poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +commit 53b9cec6c1334020f90b885cff6fc30293437e5f +Author: Thomas Freitag <[email protected]> +Date: Sun Apr 21 23:28:40 2013 +0200 + + Splash: Always consider a softmask transfer function + + Fixes bug 63587 in splash + + poppler/SplashOutputDev.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 62a5b4d5c6d5c368d190b86eab63ccb07d642c01 +Author: Hib Eris <[email protected]> +Date: Sun Apr 14 16:37:14 2013 +0200 + + Check for strcpy_s() and strcat_s() at configure time + + It is better to test for functions than to hardcode exceptions for + specific compilers. + + This fixes compiling poppler with the latest mingw-w64 compiler which + has strcpy_s() and strcat_s() build in. + + Bug #63459 + + ConfigureChecks.cmake | 2 ++ + configure.ac | 1 + + test/perf-test.cc | 6 ++++-- + 3 files changed, 7 insertions(+), 2 deletions(-) + commit 5bc00809ebe560a180d5df93eb50bdf0ff0e97e6 Author: Albert Astals Cid <[email protected]> Date: Thu Apr 11 23:29:00 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/ConfigureChecks.cmake new/poppler-0.22.4/ConfigureChecks.cmake --- old/poppler-0.22.3/ConfigureChecks.cmake 2013-03-25 22:48:34.000000000 +0100 +++ new/poppler-0.22.4/ConfigureChecks.cmake 2013-04-14 16:36:45.000000000 +0200 @@ -34,6 +34,8 @@ check_function_exists(mkstemp HAVE_MKSTEMP) check_function_exists(mkstemps HAVE_MKSTEMPS) check_function_exists(rand_r HAVE_RAND_R) +check_function_exists(strcpy_s HAVE_STRCPY_S) +check_function_exists(strcat_s HAVE_STRCAT_S) macro(CHECK_FOR_DIR include var) check_c_source_compiles( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/NEWS new/poppler-0.22.4/NEWS --- old/poppler-0.22.3/NEWS 2013-04-11 23:26:36.000000000 +0200 +++ new/poppler-0.22.4/NEWS 2013-05-13 19:55:17.000000000 +0200 @@ -1,3 +1,18 @@ +Release 0.22.4 + core: + * Always consider a softmask transfer function (Bug #63587) + * Fix crash on malformed files (Bug #63190) + * Splash: Fix compilation with fixed point mode enabled + + utils: + * Fix crash on some files (Bug #63909) + + qt4: + * Fix name decoding of some attachments (KDE Bug #307786) + + build system: + * Fix compilation with mingw-w64 compiler + Release 0.22.3 core: * Check order bounding box values in tiling pattern (Bug #62369) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/config.h.in new/poppler-0.22.4/config.h.in --- old/poppler-0.22.3/config.h.in 2013-04-11 23:30:21.000000000 +0200 +++ new/poppler-0.22.4/config.h.in 2013-05-13 19:59:03.000000000 +0200 @@ -103,6 +103,12 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strcat_s' function. */ +#undef HAVE_STRCAT_S + +/* Define to 1 if you have the `strcpy_s' function. */ +#undef HAVE_STRCPY_S + /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/configure new/poppler-0.22.4/configure --- old/poppler-0.22.3/configure 2013-04-11 23:30:11.000000000 +0200 +++ new/poppler-0.22.4/configure 2013-05-13 19:58:51.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for poppler 0.22.3. +# Generated by GNU Autoconf 2.69 for poppler 0.22.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='poppler' PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.22.3' -PACKAGE_STRING='poppler 0.22.3' +PACKAGE_VERSION='0.22.4' +PACKAGE_STRING='poppler 0.22.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -1510,7 +1510,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures poppler 0.22.3 to adapt to many kinds of systems. +\`configure' configures poppler 0.22.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1584,7 +1584,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.22.3:";; + short | recursive ) echo "Configuration of poppler 0.22.4:";; esac cat <<\_ACEOF @@ -1786,7 +1786,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.22.3 +poppler configure 0.22.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2480,7 +2480,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by poppler $as_me 0.22.3, which was +It was created by poppler $as_me 0.22.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3296,7 +3296,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.22.3' + VERSION='0.22.4' cat >>confdefs.h <<_ACEOF @@ -17619,7 +17619,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.22.3" +#define POPPLER_VERSION "0.22.4" _ACEOF @@ -19713,6 +19713,18 @@ fi done +for ac_func in strcpy_s strcat_s +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -23967,9 +23979,9 @@ POPPLER_MINOR_VERSION=22 -POPPLER_MICRO_VERSION=3 +POPPLER_MICRO_VERSION=4 -POPPLER_VERSION=0.22.3 +POPPLER_VERSION=0.22.4 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" @@ -24605,7 +24617,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poppler $as_me 0.22.3, which was +This file was extended by poppler $as_me 0.22.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24671,7 +24683,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -poppler config.status 0.22.3 +poppler config.status 0.22.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/configure.ac new/poppler-0.22.4/configure.ac --- old/poppler-0.22.3/configure.ac 2013-04-11 23:27:00.000000000 +0200 +++ new/poppler-0.22.4/configure.ac 2013-05-13 19:55:39.000000000 +0200 @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[22]) -m4_define([poppler_version_micro],[3]) +m4_define([poppler_version_micro],[4]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) @@ -251,6 +251,7 @@ dnl ##### Checks for library functions. AC_CHECK_FUNCS(popen mkstemp mkstemps) +AC_CHECK_FUNCS(strcpy_s strcat_s) dnl ##### Back to C for the library tests. AC_LANG_C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/cpp/poppler-version.h new/poppler-0.22.4/cpp/poppler-version.h --- old/poppler-0.22.3/cpp/poppler-version.h 2013-04-11 23:30:20.000000000 +0200 +++ new/poppler-0.22.4/cpp/poppler-version.h 2013-05-13 19:59:01.000000000 +0200 @@ -21,10 +21,10 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.22.3" +#define POPPLER_VERSION "0.22.4" #define POPPLER_VERSION_MAJOR 0 #define POPPLER_VERSION_MINOR 22 -#define POPPLER_VERSION_MICRO 3 +#define POPPLER_VERSION_MICRO 4 namespace poppler { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/glib/Poppler-0.18.gir new/poppler-0.22.4/glib/Poppler-0.18.gir --- old/poppler-0.22.3/glib/Poppler-0.18.gir 2013-04-11 23:31:05.000000000 +0200 +++ new/poppler-0.22.4/glib/Poppler-0.18.gir 2013-05-13 19:59:43.000000000 +0200 @@ -3815,7 +3815,7 @@ <type name="gint" c:type="gint"/> </constant> <constant name="MICRO_VERSION" - value="3" + value="4" c:type="POPPLER_MICRO_VERSION" version="0.12"> <doc xml:whitespace="preserve">The micro version number of the poppler header files (e.g. in poppler version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/glib/reference/html/ch01.html new/poppler-0.22.4/glib/reference/html/ch01.html --- old/poppler-0.22.3/glib/reference/html/ch01.html 2013-04-11 23:32:16.000000000 +0200 +++ new/poppler-0.22.4/glib/reference/html/ch01.html 2013-05-13 20:02:15.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp3742704"></a>Poppler</h2></div></div></div> +<a name="idp3304688"></a>Poppler</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="poppler-poppler.html">poppler</a></span><span class="refpurpose"></span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/glib/reference/html/index.html new/poppler-0.22.4/glib/reference/html/index.html --- old/poppler-0.22.3/glib/reference/html/index.html 2013-04-11 23:32:16.000000000 +0200 +++ new/poppler-0.22.4/glib/reference/html/index.html 2013-05-13 20:02:15.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.22.3 + for Poppler 0.22.4 </p></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.22.4/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.22.3/glib/reference/html/poppler-Version-and-Features-Information.html 2013-04-11 23:32:16.000000000 +0200 +++ new/poppler-0.22.4/glib/reference/html/poppler-Version-and-Features-Information.html 2013-05-13 20:02:15.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 (3) +<pre class="programlisting">#define POPPLER_MICRO_VERSION (4) </pre> <p> The micro version number of the poppler header files (e.g. in poppler version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/glib/reference/version.xml new/poppler-0.22.4/glib/reference/version.xml --- old/poppler-0.22.3/glib/reference/version.xml 2013-04-11 23:30:20.000000000 +0200 +++ new/poppler-0.22.4/glib/reference/version.xml 2013-05-13 19:59:01.000000000 +0200 @@ -1 +1 @@ -0.22.3 +0.22.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/poppler/CairoOutputDev.cc new/poppler-0.22.4/poppler/CairoOutputDev.cc --- old/poppler-0.22.3/poppler/CairoOutputDev.cc 2013-04-11 23:20:32.000000000 +0200 +++ new/poppler-0.22.4/poppler/CairoOutputDev.cc 2013-05-13 19:51:33.000000000 +0200 @@ -18,7 +18,7 @@ // Copyright (C) 2005, 2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2005, 2009, 2012 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Nickolay V. Shmyrev <[email protected]> -// Copyright (C) 2006-2011 Carlos Garcia Campos <[email protected]> +// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2008 Carl Worth <[email protected]> // Copyright (C) 2008-2013 Adrian Johnson <[email protected]> // Copyright (C) 2008 Michael Vrable <[email protected]> @@ -1552,7 +1552,7 @@ LOG(printf ("set softMask\n")); - if (alpha == false) { + if (!alpha || transferFunc) { /* We need to mask according to the luminocity of the group. * So we paint the group to an image surface convert it to a luminocity map * and then use that as the mask. */ @@ -1595,13 +1595,15 @@ cairo_t *maskCtx = cairo_create(source); //XXX: hopefully this uses the correct color space */ - GfxRGB backdropColorRGB; - groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB); - /* paint the backdrop */ - cairo_set_source_rgb(maskCtx, - colToDbl(backdropColorRGB.r), - colToDbl(backdropColorRGB.g), - colToDbl(backdropColorRGB.b)); + if (!alpha) { + GfxRGB backdropColorRGB; + groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB); + /* paint the backdrop */ + cairo_set_source_rgb(maskCtx, + colToDbl(backdropColorRGB.r), + colToDbl(backdropColorRGB.g), + colToDbl(backdropColorRGB.b)); + } cairo_paint(maskCtx); /* Copy source ctm to mask ctm and translate origin so that the @@ -1628,15 +1630,14 @@ int stride = cairo_image_surface_get_stride(source)/4; for (int y=0; y<height; y++) { for (int x=0; x<width; x++) { - int lum; - lum = luminocity(source_data[y*stride + x]); - if (transferFunc) { - double lum_in, lum_out; - lum_in = lum/256.0; - transferFunc->transform(&lum_in, &lum_out); - lum = (int)(lum_out * 255.0 + 0.5); - } - source_data[y*stride + x] = lum << 24; + int lum = alpha ? fill_opacity : luminocity(source_data[y*stride + x]); + if (transferFunc) { + double lum_in, lum_out; + lum_in = lum/256.0; + transferFunc->transform(&lum_in, &lum_out); + lum = (int)(lum_out * 255.0 + 0.5); + } + source_data[y*stride + x] = lum << 24; } } cairo_surface_mark_dirty (source); @@ -1656,7 +1657,7 @@ } cairo_surface_destroy(source); - } else { + } else if (alpha) { mask = cairo_pattern_reference(group); cairo_get_matrix(cairo, &mask_matrix); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/poppler/Gfx.cc new/poppler-0.22.4/poppler/Gfx.cc --- old/poppler-0.22.3/poppler/Gfx.cc 2013-03-25 22:48:34.000000000 +0100 +++ new/poppler-0.22.4/poppler/Gfx.cc 2013-04-25 20:44:29.000000000 +0200 @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Jonathan Blandford <[email protected]> -// Copyright (C) 2005-2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2013 Albert Astals Cid <[email protected]> // Copyright (C) 2006 Thorkild Stray <[email protected]> // Copyright (C) 2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2006-2011 Carlos Garcia Campos <[email protected]> @@ -4133,10 +4133,25 @@ } } else if (obj2.isName("Form")) { res->lookupXObjectNF(name, &refObj); - if (out->useDrawForm() && refObj.isRef()) { - out->drawForm(refObj.getRef()); - } else { - doForm(&obj1); + GBool shouldDoForm = gTrue; + std::set<int>::iterator drawingFormIt; + if (refObj.isRef()) { + const int num = refObj.getRef().num; + if (formsDrawing.find(num) == formsDrawing.end()) { + drawingFormIt = formsDrawing.insert(num).first; + } else { + shouldDoForm = gFalse; + } + } + if (shouldDoForm) { + if (out->useDrawForm() && refObj.isRef()) { + out->drawForm(refObj.getRef()); + } else { + doForm(&obj1); + } + } + if (refObj.isRef() && shouldDoForm) { + formsDrawing.erase(drawingFormIt); } refObj.free(); } else if (obj2.isName("PS")) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/poppler/Gfx.h new/poppler-0.22.4/poppler/Gfx.h --- old/poppler-0.22.3/poppler/Gfx.h 2013-03-25 22:48:34.000000000 +0100 +++ new/poppler-0.22.4/poppler/Gfx.h 2013-04-25 20:44:32.000000000 +0200 @@ -17,7 +17,7 @@ // Copyright (C) 2007 Iñigo Martínez <[email protected]> // Copyright (C) 2008 Brad Hards <[email protected]> // Copyright (C) 2008, 2010 Carlos Garcia Campos <[email protected]> -// Copyright (C) 2009-2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2009-2013 Albert Astals Cid <[email protected]> // Copyright (C) 2009, 2010, 2012 Thomas Freitag <[email protected]> // Copyright (C) 2010 David Benjamin <[email protected]> // Copyright (C) 2010 Christian Feuersänger <[email protected]> @@ -225,6 +225,8 @@ MarkedContentStack *mcStack; // current BMC/EMC stack Parser *parser; // parser for page content stream(s) + + std::set<int> formsDrawing; // the forms that are being drawn #ifdef USE_CMS PopplerCache iccColorSpaceCache; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/poppler/Makefile.am new/poppler-0.22.4/poppler/Makefile.am --- old/poppler-0.22.3/poppler/Makefile.am 2013-04-11 23:28:56.000000000 +0200 +++ new/poppler-0.22.4/poppler/Makefile.am 2013-05-13 19:56:55.000000000 +0200 @@ -177,7 +177,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 36:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 37:0:0 @create_shared_lib@ @auto_import_flags@ if ENABLE_XPDF_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/poppler/Makefile.in new/poppler-0.22.4/poppler/Makefile.in --- old/poppler-0.22.3/poppler/Makefile.in 2013-04-11 23:30:11.000000000 +0200 +++ new/poppler-0.22.4/poppler/Makefile.in 2013-05-13 19:58:51.000000000 +0200 @@ -592,7 +592,7 @@ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 36:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 37:0:0 @create_shared_lib@ @auto_import_flags@ @ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler @ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \ @ENABLE_XPDF_HEADERS_TRUE@ $(splash_headers) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/poppler/SplashOutputDev.cc new/poppler-0.22.4/poppler/SplashOutputDev.cc --- old/poppler-0.22.3/poppler/SplashOutputDev.cc 2013-03-25 22:48:34.000000000 +0100 +++ new/poppler-0.22.4/poppler/SplashOutputDev.cc 2013-04-21 23:27:21.000000000 +0200 @@ -3975,7 +3975,12 @@ for (y = 0; y < yMax; ++y) { for (x = 0; x < xMax; ++x) { if (alpha) { - p[x] = tBitmap->getAlpha(x, y); + if (transferFunc) { + lum = tBitmap->getAlpha(x, y) / 255.0; + transferFunc->transform(&lum, &lum2); + p[x] = (int)(lum2 * 255.0 + 0.5); + } else + p[x] = tBitmap->getAlpha(x, y); } else { tBitmap->getPixel(x, y, color); // convert to luminosity diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/qt4/src/poppler-embeddedfile.cc new/poppler-0.22.4/qt4/src/poppler-embeddedfile.cc --- old/poppler-0.22.3/qt4/src/poppler-embeddedfile.cc 2012-12-30 23:43:26.000000000 +0100 +++ new/poppler-0.22.4/qt4/src/poppler-embeddedfile.cc 2013-05-07 21:54:51.000000000 +0200 @@ -1,5 +1,5 @@ /* poppler-document.cc: qt interface to poppler - * Copyright (C) 2005, 2008, 2009, 2012, Albert Astals Cid <[email protected]> + * Copyright (C) 2005, 2008, 2009, 2012, 2013, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Brad Hards <[email protected]> * Copyright (C) 2008, 2011, Pino Toscano <[email protected]> * @@ -69,7 +69,7 @@ QString EmbeddedFile::name() const { GooString *goo = m_embeddedFile->filespec->getFileName(); - return goo ? QString(goo->getCString()) : QString(); + return goo ? UnicodeParsedString(goo) : QString(); } QString EmbeddedFile::description() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/splash/Splash.cc new/poppler-0.22.4/splash/Splash.cc --- old/poppler-0.22.3/splash/Splash.cc 2013-03-25 22:48:35.000000000 +0100 +++ new/poppler-0.22.4/splash/Splash.cc 2013-05-13 19:21:03.000000000 +0200 @@ -1494,7 +1494,7 @@ #endif if (t != 0) { - pipe->shape = aaGamma[t]; + pipe->shape = (double)aaGamma[t]; (this->*pipe->run)(pipe); updateModX(x); updateModY(y); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/test/perf-test.cc new/poppler-0.22.4/test/perf-test.cc --- old/poppler-0.22.3/test/perf-test.cc 2013-03-25 22:48:35.000000000 +0100 +++ new/poppler-0.22.4/test/perf-test.cc 2013-04-14 16:36:45.000000000 +0200 @@ -1,5 +1,5 @@ /* Copyright Krzysztof Kowalczyk 2006-2007 - Copyright Hib Eris <[email protected]> 2008 + Copyright Hib Eris <[email protected]> 2008, 2013 License: GPLv2 */ /* A tool to stress-test poppler rendering and measure rendering times for @@ -325,7 +325,7 @@ #endif } -#ifndef _MSC_VER +#ifndef HAVE_STRCPY_S void strcpy_s(char* dst, size_t dst_size, const char* src) { size_t src_size = strlen(src) + 1; @@ -338,7 +338,9 @@ } } } +#endif +#ifndef HAVE_STRCAT_S void strcat_s(char *dst, size_t dst_size, const char* src) { size_t dst_len = strlen(dst); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.22.3/utils/HtmlOutputDev.cc new/poppler-0.22.4/utils/HtmlOutputDev.cc --- old/poppler-0.22.3/utils/HtmlOutputDev.cc 2013-03-25 22:48:35.000000000 +0100 +++ new/poppler-0.22.4/utils/HtmlOutputDev.cc 2013-04-25 20:44:12.000000000 +0200 @@ -17,7 +17,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2005-2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2013 Albert Astals Cid <[email protected]> // Copyright (C) 2008 Kjartan Maraas <[email protected]> // Copyright (C) 2008 Boris Toloknov <[email protected]> // Copyright (C) 2008 Haruyuki Kawabe <[email protected]> @@ -1795,7 +1795,7 @@ atLeastOne = gTrue; item->open(); - if (item->hasKids()) + if (item->hasKids() && item->getKids()) { fputs("\n",output); newHtmlOutlineLevel(output, item->getKids(), catalog, level+1); @@ -1832,7 +1832,7 @@ delete titleStr; item->open(); - if (item->hasKids()) + if (item->hasKids() && item->getKids()) { newXmlOutlineLevel(output, item->getKids(), catalog); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
