Hello community, here is the log from the commit of package poppler for openSUSE:13.1 checked in at 2013-10-31 10:25:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/poppler (Old) and /work/SRC/openSUSE:13.1/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:13.1/poppler/poppler-qt.changes 2013-09-29 19:27:50.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.poppler.new/poppler-qt.changes 2013-10-31 10:25:42.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Oct 29 13:07:57 UTC 2013 - [email protected] + +- Update to version 0.24.3: + + core: + - PSOutputDev: Fix PFB font embedding (fdo#69717). + - CairoOutputDev: Do not set an invalid matrix in drawImage() + (fdo#70085). + + qt4: + - Don't crash if getXRef()->copy() fails. + + qt5: + - Don't crash if getXRef()->copy() fails. + + utils: + - pdfseparate: Allow only one %d in the filename (fdo#69434). +- This version fixes bnc#847907; CVE-2013-4473 and CVE-2013-4474. + +------------------------------------------------------------------- poppler.changes: same change Old: ---- poppler-0.24.2.tar.xz New: ---- poppler-0.24.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.XGdH9r/_old 2013-10-31 10:25:42.000000000 +0100 +++ /var/tmp/diff_new_pack.XGdH9r/_new 2013-10-31 10:25:42.000000000 +0100 @@ -21,7 +21,7 @@ Name: poppler-qt %define _name poppler -Version: 0.24.2 +Version: 0.24.3 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.XGdH9r/_old 2013-10-31 10:25:42.000000000 +0100 +++ /var/tmp/diff_new_pack.XGdH9r/_new 2013-10-31 10:25:42.000000000 +0100 @@ -21,7 +21,7 @@ Name: poppler %define _name poppler -Version: 0.24.2 +Version: 0.24.3 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 ++++++ poppler-0.24.2.tar.xz -> poppler-0.24.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/CMakeLists.txt new/poppler-0.24.3/CMakeLists.txt --- old/poppler-0.24.2/CMakeLists.txt 2013-09-27 12:40:52.000000000 +0200 +++ new/poppler-0.24.3/CMakeLists.txt 2013-10-26 19:05:25.000000000 +0200 @@ -18,7 +18,7 @@ set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "24") -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/ChangeLog new/poppler-0.24.3/ChangeLog --- old/poppler-0.24.2/ChangeLog 2013-09-27 12:51:04.000000000 +0200 +++ new/poppler-0.24.3/ChangeLog 2013-10-26 19:16:51.000000000 +0200 @@ -1,3 +1,78 @@ +commit f4a72fd3c61091d6b455af9a881c2390da19b506 +Author: Albert Astals Cid <[email protected]> +Date: Sat Oct 26 19:06:34 2013 +0200 + + 0.24.3 + + CMakeLists.txt | 2 +- + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 19 insertions(+), 5 deletions(-) + +commit 33a5af32cd5769cf1b6c6344077ac4a3f407ba21 +Author: Albert Astals Cid <[email protected]> +Date: Sat Oct 26 18:48:50 2013 +0200 + + Update copyrights + + qt4/src/poppler-document.cc | 2 +- + utils/pdfseparate.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 61f79b8447c3ac8ab5a26e79e0c28053ffdccf75 +Author: Albert Astals Cid <[email protected]> +Date: Thu Oct 24 00:54:56 2013 +0200 + + Allow only one %d in the filename + + Fixes crashes if you had %s and similar in the filename + + Inspired from patch by Pedro Ribeiro <[email protected]> + + Bug #69434 + + utils/pdfseparate.cc | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +commit daa0990a7baf17d00d12574a4de815e070727a86 +Author: Albert Astals Cid <[email protected]> +Date: Thu Oct 10 02:16:25 2013 +0200 + + Return empty if getXRef()->copy() fails + + Seems this can happen by looking at the backtrace in + https://bugs.kde.org/show_bug.cgi?id=325810 + + qt4/src/poppler-document.cc | 6 ++++++ + qt5/src/poppler-document.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +commit f4bfa940aa40a82a1080cdaf765da1d1615ccfb1 +Author: Carlos Garcia Campos <[email protected]> +Date: Sat Oct 5 11:20:04 2013 +0200 + + cairo: Do not set an invalid matrix in drawImage() + + https://bugs.freedesktop.org/show_bug.cgi?id=70085 + + poppler/CairoOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e2fe85137ecb59eb0d177682c552febc64cda643 +Author: Adrian Johnson <[email protected]> +Date: Tue Oct 1 19:15:08 2013 +0200 + + Fix PFB font embedding + + Bug #69717 + + poppler/PSOutputDev.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 46 insertions(+), 6 deletions(-) + commit 06dabe1eed912e5f5c96fe9f371ab459516e5a99 Author: Albert Astals Cid <[email protected]> Date: Fri Sep 27 12:41:23 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/NEWS new/poppler-0.24.3/NEWS --- old/poppler-0.24.2/NEWS 2013-09-27 12:40:17.000000000 +0200 +++ new/poppler-0.24.3/NEWS 2013-10-26 18:50:31.000000000 +0200 @@ -1,3 +1,17 @@ +Release 0.24.3 + core: + * PSOutputDev: Fix PFB font embedding. Bug #69717 + * CairoOutputDev: Do not set an invalid matrix in drawImage(). Bug #70085 + + qt4: + * Don't crash if getXRef()->copy() fails + + qt5: + * Don't crash if getXRef()->copy() fails + + utils: + * pdfseparate: Allow only one %d in the filename. Bug #69434 + Release 0.24.2 core: * Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION. Bug #69597 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/aclocal.m4 new/poppler-0.24.3/aclocal.m4 --- old/poppler-0.24.2/aclocal.m4 2013-09-27 12:42:17.000000000 +0200 +++ new/poppler-0.24.3/aclocal.m4 2013-10-26 19:07:31.000000000 +0200 @@ -20,8 +20,8 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# lib-link.m4 serial 21 (gettext-0.18) -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. +# lib-link.m4 serial 26 (gettext-0.18.2) +dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -40,9 +40,9 @@ [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[m4_translit([$1],[./+-], [____])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" @@ -80,9 +80,9 @@ [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - pushdef([Name],[translit([$1],[./-], [___])]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[m4_translit([$1],[./+-], [____])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -107,7 +107,8 @@ *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; *) LIBS="$LIB[]NAME $LIBS" ;; esac - AC_TRY_LINK([$3], [$4], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[$3]], [[$4]])], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" @@ -137,6 +138,8 @@ dnl Determine the platform dependent parameters needed to use rpath: dnl acl_libext, dnl acl_shlibext, +dnl acl_libname_spec, +dnl acl_library_names_spec, dnl acl_hardcode_libdir_flag_spec, dnl acl_hardcode_libdir_separator, dnl acl_hardcode_direct, @@ -179,15 +182,15 @@ dnl macro call that searches for libname. AC_DEFUN([AC_LIB_FROMPACKAGE], [ - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) define([acl_frompackage_]NAME, [$2]) popdef([NAME]) pushdef([PACK],[$2]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) define([acl_libsinpackage_]PACKUP, - m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) popdef([PACKUP]) popdef([PACK]) ]) @@ -200,14 +203,14 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) - pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) dnl Autoconf >= 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ @@ -264,7 +267,7 @@ names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -796,7 +799,7 @@ ]) # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/configure new/poppler-0.24.3/configure --- old/poppler-0.24.2/configure 2013-09-27 12:42:18.000000000 +0200 +++ new/poppler-0.24.3/configure 2013-10-26 19:07:32.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.24.2. +# Generated by GNU Autoconf 2.69 for poppler 0.24.3. # # 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.24.2' -PACKAGE_STRING='poppler 0.24.2' +PACKAGE_VERSION='0.24.3' +PACKAGE_STRING='poppler 0.24.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -1526,7 +1526,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.24.2 to adapt to many kinds of systems. +\`configure' configures poppler 0.24.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1600,7 +1600,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.24.2:";; + short | recursive ) echo "Configuration of poppler 0.24.3:";; esac cat <<\_ACEOF @@ -1813,7 +1813,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.24.2 +poppler configure 0.24.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2507,7 +2507,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.24.2, which was +It was created by poppler $as_me 0.24.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3371,7 +3371,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.24.2' + VERSION='0.24.3' cat >>confdefs.h <<_ACEOF @@ -17684,7 +17684,7 @@ cat >>confdefs.h <<_ACEOF -#define POPPLER_VERSION "0.24.2" +#define POPPLER_VERSION "0.24.3" _ACEOF @@ -23489,7 +23489,7 @@ done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -24773,9 +24773,9 @@ POPPLER_MINOR_VERSION=24 -POPPLER_MICRO_VERSION=2 +POPPLER_MICRO_VERSION=3 -POPPLER_VERSION=0.24.2 +POPPLER_VERSION=0.24.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 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" @@ -25423,7 +25423,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.24.2, which was +This file was extended by poppler $as_me 0.24.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25489,7 +25489,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.24.2 +poppler config.status 0.24.3 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.24.2/configure.ac new/poppler-0.24.3/configure.ac --- old/poppler-0.24.2/configure.ac 2013-09-27 12:40:27.000000000 +0200 +++ new/poppler-0.24.3/configure.ac 2013-10-26 19:04:29.000000000 +0200 @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[24]) -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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/cpp/poppler-version.h new/poppler-0.24.3/cpp/poppler-version.h --- old/poppler-0.24.2/cpp/poppler-version.h 2013-09-27 12:42:28.000000000 +0200 +++ new/poppler-0.24.3/cpp/poppler-version.h 2013-10-26 19:07:42.000000000 +0200 @@ -21,10 +21,10 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.24.2" +#define POPPLER_VERSION "0.24.3" #define POPPLER_VERSION_MAJOR 0 #define POPPLER_VERSION_MINOR 24 -#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.24.2/glib/Poppler-0.18.gir new/poppler-0.24.3/glib/Poppler-0.18.gir --- old/poppler-0.24.2/glib/Poppler-0.18.gir 2013-09-27 12:43:18.000000000 +0200 +++ new/poppler-0.24.3/glib/Poppler-0.18.gir 2013-10-26 19:08:31.000000000 +0200 @@ -3815,7 +3815,7 @@ <type name="gint" c:type="gint"/> </constant> <constant name="MICRO_VERSION" - value="2" + value="3" c:type="POPPLER_MICRO_VERSION" version="0.12"> <doc xml:space="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.24.2/glib/reference/html/annotation-glossary.html new/poppler-0.24.3/glib/reference/html/annotation-glossary.html --- old/poppler-0.24.2/glib/reference/html/annotation-glossary.html 2013-09-27 12:51:07.000000000 +0200 +++ new/poppler-0.24.3/glib/reference/html/annotation-glossary.html 2013-10-26 19:16:53.000000000 +0200 @@ -20,52 +20,55 @@ <td> </td> </tr> <tr><td colspan="5" class="shortcuts"> -<a class="shortcut" href="#glsO">O</a> +<a class="shortcut" href="#glsT">T</a> | - <a class="shortcut" href="#glsA">A</a> + <a class="shortcut" href="#glsS">S</a> | - <a class="shortcut" href="#glsC">C</a> + <a class="shortcut" href="#glsE">E</a> | <a class="shortcut" href="#glsT">T</a> | <a class="shortcut" href="#glsA">A</a> | - <a class="shortcut" href="#glsE">E</a> + <a class="shortcut" href="#glsC">C</a> | - <a class="shortcut" href="#glsT">T</a> + <a class="shortcut" href="#glsA">A</a> | - <a class="shortcut" href="#glsS">S</a> + <a class="shortcut" href="#glsO">O</a> + | + <a class="shortcut" href="#glsT">T</a> </td></tr> </table> <div class="glossary"> <div class="titlepage"><div><div><h1 class="title"> <a name="annotation-glossary"></a>Annotation Glossary</h1></div></div></div> -<a name="glsO"></a><h3 class="title">O</h3> -<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt> -<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd> -<a name="glsA"></a><h3 class="title">A</h3> -<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt> -<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd> -<a name="glsC"></a><h3 class="title">C</h3> -<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt> -<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd> <a name="glsT"></a><h3 class="title">T</h3> <dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt> <dd class="glossdef"><p>Don't free data after the code is done.</p></dd> -<a name="glsA"></a><h3 class="title">A</h3> -<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt> -<dd class="glossdef"><p>Parameter points to an array of items.</p></dd> +<a name="glsS"></a><h3 class="title">S</h3> +<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt> +<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd> <a name="glsE"></a><h3 class="title">E</h3> <dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt> <dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd> <a name="glsT"></a><h3 class="title">T</h3> -<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt> -<dd class="glossdef"><p>Free data container after the code is done.</p></dd> <dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt> <dd class="glossdef"><p>Free data after the code is done.</p></dd> -<a name="glsS"></a><h3 class="title">S</h3> -<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt> -<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd> +<a name="glsA"></a><h3 class="title">A</h3> +<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt> +<dd class="glossdef"><p>Parameter points to an array of items.</p></dd> +<a name="glsC"></a><h3 class="title">C</h3> +<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt> +<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd> +<a name="glsA"></a><h3 class="title">A</h3> +<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt> +<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd> +<a name="glsO"></a><h3 class="title">O</h3> +<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt> +<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd> +<a name="glsT"></a><h3 class="title">T</h3> +<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt> +<dd class="glossdef"><p>Free data container after the code is done.</p></dd> </div> <div class="footer"> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/glib/reference/html/index.html new/poppler-0.24.3/glib/reference/html/index.html --- old/poppler-0.24.2/glib/reference/html/index.html 2013-09-27 12:51:07.000000000 +0200 +++ new/poppler-0.24.3/glib/reference/html/index.html 2013-10-26 19:16:53.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.24.2 + for Poppler 0.24.3 </p></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/glib/reference/html/index.sgml new/poppler-0.24.3/glib/reference/html/index.sgml --- old/poppler-0.24.2/glib/reference/html/index.sgml 2013-09-27 12:51:07.000000000 +0200 +++ new/poppler-0.24.3/glib/reference/html/index.sgml 2013-10-26 19:16:53.000000000 +0200 @@ -546,12 +546,12 @@ <ANCHOR id="POPPLER-MINOR-VERSION:CAPS" href="poppler/poppler-Version-and-Features-Information.html#POPPLER-MINOR-VERSION:CAPS"> <ANCHOR id="POPPLER-MICRO-VERSION:CAPS" href="poppler/poppler-Version-and-Features-Information.html#POPPLER-MICRO-VERSION:CAPS"> <ANCHOR id="POPPLER-CHECK-VERSION:CAPS" href="poppler/poppler-Version-and-Features-Information.html#POPPLER-CHECK-VERSION:CAPS"> -<ANCHOR id="annotation-glossterm-out" href="poppler/annotation-glossary.html#annotation-glossterm-out"> -<ANCHOR id="annotation-glossterm-allow-none" href="poppler/annotation-glossary.html#annotation-glossterm-allow-none"> -<ANCHOR id="annotation-glossterm-closure" href="poppler/annotation-glossary.html#annotation-glossterm-closure"> <ANCHOR id="annotation-glossterm-transfer none" href="poppler/annotation-glossary.html#annotation-glossterm-transfer none"> -<ANCHOR id="annotation-glossterm-array" href="poppler/annotation-glossary.html#annotation-glossterm-array"> +<ANCHOR id="annotation-glossterm-scope call" href="poppler/annotation-glossary.html#annotation-glossterm-scope call"> <ANCHOR id="annotation-glossterm-element-type" href="poppler/annotation-glossary.html#annotation-glossterm-element-type"> -<ANCHOR id="annotation-glossterm-transfer container" href="poppler/annotation-glossary.html#annotation-glossterm-transfer container"> <ANCHOR id="annotation-glossterm-transfer full" href="poppler/annotation-glossary.html#annotation-glossterm-transfer full"> -<ANCHOR id="annotation-glossterm-scope call" href="poppler/annotation-glossary.html#annotation-glossterm-scope call"> +<ANCHOR id="annotation-glossterm-array" href="poppler/annotation-glossary.html#annotation-glossterm-array"> +<ANCHOR id="annotation-glossterm-closure" href="poppler/annotation-glossary.html#annotation-glossterm-closure"> +<ANCHOR id="annotation-glossterm-allow-none" href="poppler/annotation-glossary.html#annotation-glossterm-allow-none"> +<ANCHOR id="annotation-glossterm-out" href="poppler/annotation-glossary.html#annotation-glossterm-out"> +<ANCHOR id="annotation-glossterm-transfer container" href="poppler/annotation-glossary.html#annotation-glossterm-transfer container"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.24.3/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.24.2/glib/reference/html/poppler-Version-and-Features-Information.html 2013-09-27 12:51:07.000000000 +0200 +++ new/poppler-0.24.3/glib/reference/html/poppler-Version-and-Features-Information.html 2013-10-26 19:16:53.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.24.2/glib/reference/version.xml new/poppler-0.24.3/glib/reference/version.xml --- old/poppler-0.24.2/glib/reference/version.xml 2013-09-27 12:42:27.000000000 +0200 +++ new/poppler-0.24.3/glib/reference/version.xml 2013-10-26 19:07:41.000000000 +0200 @@ -1 +1 @@ -0.24.2 +0.24.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/poppler/CairoOutputDev.cc new/poppler-0.24.3/poppler/CairoOutputDev.cc --- old/poppler-0.24.2/poppler/CairoOutputDev.cc 2013-08-17 01:20:41.000000000 +0200 +++ new/poppler-0.24.3/poppler/CairoOutputDev.cc 2013-10-10 02:18:28.000000000 +0200 @@ -2938,7 +2938,8 @@ if (maskPattern) { if (!printing) cairo_clip (cairo); - cairo_set_matrix (cairo, &mask_matrix); + if (mask) + cairo_set_matrix (cairo, &mask_matrix); cairo_mask (cairo, maskPattern); } else { if (printing) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/poppler/PSOutputDev.cc new/poppler-0.24.3/poppler/PSOutputDev.cc --- old/poppler-0.24.2/poppler/PSOutputDev.cc 2013-08-17 01:20:41.000000000 +0200 +++ new/poppler-0.24.3/poppler/PSOutputDev.cc 2013-10-01 19:15:56.000000000 +0200 @@ -25,7 +25,7 @@ // Copyright (C) 2009 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009, 2011, 2012 William Bader <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> -// Copyright (C) 2009-2011 Adrian Johnson <[email protected]> +// Copyright (C) 2009-2011, 2013 Adrian Johnson <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2012 Lu Wang <[email protected]> // @@ -1842,9 +1842,9 @@ //~ add cases for external 16-bit fonts switch (fontLoc->fontType) { case fontType1: - if (font->getName()) { + if (font->getEmbeddedFontName()) { // this assumes that the PS font name matches the PDF font name - psName = font->getName()->copy(); + psName = font->getEmbeddedFontName()->copy(); } else { //~ this won't work -- the PS font name won't match psName = makePSFontName(font, font->getID()); @@ -2140,9 +2140,8 @@ strObj.free(); } -//~ This doesn't handle .pfb files or binary eexec data (which only -//~ happens in pfb files?). void PSOutputDev::setupExternalType1Font(GooString *fileName, GooString *psName) { + static const char hexChar[17] = "0123456789abcdef"; FILE *fontFile; int c; @@ -2162,8 +2161,49 @@ error(errIO, -1, "Couldn't open external font file"); return; } - while ((c = fgetc(fontFile)) != EOF) { + + c = fgetc(fontFile); + if (c == 0x80) { + // PFB file + ungetc(c, fontFile); + while (!feof(fontFile)) { + fgetc(fontFile); // skip start of segment byte (0x80) + int segType = fgetc(fontFile); + long segLen = fgetc(fontFile) | + (fgetc(fontFile) << 8) | + (fgetc(fontFile) << 16) | + (fgetc(fontFile) << 24); + if (feof(fontFile)) + break; + + if (segType == 1) { + // ASCII segment + for (long i = 0; i < segLen; i++) { + c = fgetc(fontFile); + if (c == EOF) + break; + writePSChar(c); + } + } else if (segType == 2) { + // binary segment + for (long i = 0; i < segLen; i++) { + c = fgetc(fontFile); + if (c == EOF) + break; + writePSChar(hexChar[(c >> 4) & 0x0f]); + writePSChar(hexChar[c & 0x0f]); + if (i % 36 == 35) + writePSChar('\n'); + } + } else { + // end of file + break; + } + } + } else if (c != EOF) { writePSChar(c); + while ((c = fgetc(fontFile)) != EOF) + writePSChar(c); } fclose(fontFile); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/qt4/src/poppler-document.cc new/poppler-0.24.3/qt4/src/poppler-document.cc --- old/poppler-0.24.2/qt4/src/poppler-document.cc 2013-08-17 01:20:41.000000000 +0200 +++ new/poppler-0.24.3/qt4/src/poppler-document.cc 2013-10-26 18:48:23.000000000 +0200 @@ -1,7 +1,7 @@ /* poppler-document.cc: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. * Copyright (C) 2005, 2008, Brad Hards <[email protected]> - * Copyright (C) 2005-2010, 2012, Albert Astals Cid <[email protected]> + * Copyright (C) 2005-2010, 2012, 2013, Albert Astals Cid <[email protected]> * Copyright (C) 2006-2010, Pino Toscano <[email protected]> * Copyright (C) 2010, 2011 Hib Eris <[email protected]> * Copyright (C) 2012 Koji Otani <[email protected]> @@ -269,6 +269,8 @@ return QString(); QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy()); + if (!xref) + return QString(); xref->getDocInfo(&info); if ( !info.isDict() ) return QString(); @@ -300,6 +302,8 @@ return QStringList(); QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy()); + if (!xref) + return QStringList(); xref->getDocInfo(&info); if ( !info.isDict() ) return QStringList(); @@ -323,6 +327,8 @@ Object info; QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy()); + if (!xref) + return QDateTime(); xref->getDocInfo(&info); if ( !info.isDict() ) { info.free(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/qt5/src/poppler-document.cc new/poppler-0.24.3/qt5/src/poppler-document.cc --- old/poppler-0.24.2/qt5/src/poppler-document.cc 2013-08-17 01:20:41.000000000 +0200 +++ new/poppler-0.24.3/qt5/src/poppler-document.cc 2013-10-10 02:18:28.000000000 +0200 @@ -255,6 +255,8 @@ return QString(); QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy()); + if (!xref) + return QString(); xref->getDocInfo(&info); if ( !info.isDict() ) return QString(); @@ -286,6 +288,8 @@ return QStringList(); QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy()); + if (!xref) + return QStringList(); xref->getDocInfo(&info); if ( !info.isDict() ) return QStringList(); @@ -309,6 +313,8 @@ Object info; QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy()); + if (!xref) + return QDateTime(); xref->getDocInfo(&info); if ( !info.isDict() ) { info.free(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.24.2/utils/pdfseparate.cc new/poppler-0.24.3/utils/pdfseparate.cc --- old/poppler-0.24.2/utils/pdfseparate.cc 2013-09-27 12:38:43.000000000 +0200 +++ new/poppler-0.24.3/utils/pdfseparate.cc 2013-10-26 18:48:47.000000000 +0200 @@ -5,7 +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]> +// Copyright (C) 2012, 2013 Albert Astals Cid <[email protected]> // Copyright (C) 2013 Pino Toscano <[email protected]> // //======================================================================== @@ -20,6 +20,7 @@ #include "PDFDoc.h" #include "ErrorCodes.h" #include "GlobalParams.h" +#include <ctype.h> static int firstPage = 0; static int lastPage = 0; @@ -63,9 +64,37 @@ if (firstPage == 0) firstPage = 1; if (firstPage != lastPage && strstr(destFileName, "%d") == NULL) { - error(errSyntaxError, -1, "'{0:s}' must contain '%%d' if more than one page should be extracted", destFileName); + error(errSyntaxError, -1, "'{0:s}' must contain '%d' if more than one page should be extracted", destFileName); return false; } + + // destFileName can have multiple %% and one %d + // We use auxDestFileName to replace all the valid % appearances + // by 'A' (random char that is not %), if at the end of replacing + // any of the valid appearances there is still any % around, the + // pattern is wrong + char *auxDestFileName = strdup(destFileName); + // %% can appear as many times as you want + char *p = strstr(auxDestFileName, "%%"); + while (p != NULL) { + *p = 'A'; + *(p + 1) = 'A'; + p = strstr(p, "%%"); + } + // %d can appear only one time + p = strstr(auxDestFileName, "%d"); + if (p != NULL) { + *p = 'A'; + } + // at this point any other % is wrong + p = strstr(auxDestFileName, "%"); + if (p != NULL) { + error(errSyntaxError, -1, "'{0:s}' can only contain one '%d' pattern", destFileName); + free(auxDestFileName); + return false; + } + free(auxDestFileName); + for (int pageNo = firstPage; pageNo <= lastPage; pageNo++) { snprintf (pathName, sizeof (pathName) - 1, destFileName, pageNo); GooString *gpageName = new GooString (pathName); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
