Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2012-01-19 09:44:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2012-01-11 15:38:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2012-01-19 09:44:04.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Jan 16 13:20:26 UTC 2012 - [email protected] + +- Update to version 0.18.3: + + core: + - Do not fail if we are trying to save a file with Encrypt that + has not been modified (kde#288045) + - Include .otf fonts when finding substitute fonts (fdo#44412) + - Fix stack overflow in PDFDoc::markObject() (fdo#44660) + - Include strings.h as we use memcpy (fdo#43558) + + utils: + - pdfunite: Properly initialize globalParams (fdo#44659) + - pdfseparate: Properly initialize globalParams + - Fix iniliazialization of GooString arguments + + build system: + - autoconf: Check for cairo-ft and other cairo backends + (fdo#43969) +- Add explicit pkgconfig() BuildRequires, following upstream + changes, for: cairo-ft, cairo-pdf, cairo-ps, cairo-svg. + +------------------------------------------------------------------- poppler.changes: same change Old: ---- poppler-0.18.2.tar.gz New: ---- poppler-0.18.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.vTm1Ak/_old 2012-01-19 09:44:06.000000000 +0100 +++ /var/tmp/diff_new_pack.vTm1Ak/_new 2012-01-19 09:44:06.000000000 +0100 @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_qt 1 Name: poppler-qt %define _name poppler -Version: 0.18.2 +Version: 0.18.3 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 @@ -44,6 +45,10 @@ BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(cairo) >= 1.10.0 +BuildRequires: pkgconfig(cairo-ft) >= 1.10.0 +BuildRequires: pkgconfig(cairo-pdf) +BuildRequires: pkgconfig(cairo-ps) +BuildRequires: pkgconfig(cairo-svg) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) >= 2.18 ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.vTm1Ak/_old 2012-01-19 09:44:06.000000000 +0100 +++ /var/tmp/diff_new_pack.vTm1Ak/_new 2012-01-19 09:44:06.000000000 +0100 @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define build_qt 0 Name: poppler %define _name poppler -Version: 0.18.2 +Version: 0.18.3 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.2.1 @@ -44,6 +45,10 @@ BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: pkgconfig(cairo) >= 1.10.0 +BuildRequires: pkgconfig(cairo-ft) >= 1.10.0 +BuildRequires: pkgconfig(cairo-pdf) +BuildRequires: pkgconfig(cairo-ps) +BuildRequires: pkgconfig(cairo-svg) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) >= 2.18 ++++++ poppler-0.18.2.tar.gz -> poppler-0.18.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/CMakeLists.txt new/poppler-0.18.3/CMakeLists.txt --- old/poppler-0.18.2/CMakeLists.txt 2011-12-04 15:43:57.000000000 +0100 +++ new/poppler-0.18.3/CMakeLists.txt 2012-01-15 15:20:02.000000000 +0100 @@ -16,7 +16,7 @@ set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "18") -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.18.2/ChangeLog new/poppler-0.18.3/ChangeLog --- old/poppler-0.18.2/ChangeLog 2011-12-04 15:48:02.000000000 +0100 +++ new/poppler-0.18.3/ChangeLog 2012-01-15 15:23:22.000000000 +0100 @@ -1,3 +1,149 @@ +commit be59afb19e83c5040ea0d993cfb238aefc06abb1 +Author: Albert Astals Cid <[email protected]> +Date: Sun Jan 15 15:21:06 2012 +0100 + + 0.18.3 + + CMakeLists.txt | 2 +- + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 19 insertions(+), 4 deletions(-) + +commit d4bff411d0d42064a617812d4e1bf2353fd79e1c +Author: Albert Astals Cid <[email protected]> +Date: Sun Jan 15 15:13:59 2012 +0100 + + Add copyrights since last release + + poppler/GfxFont.cc | 1 + + poppler/GlobalParams.cc | 1 + + utils/parseargs.cc | 2 +- + 3 files changed, 3 insertions(+), 1 deletions(-) + +commit 7d171e19257023cda55d0040257e8f0a2008271f +Author: Thomas Freitag <[email protected]> +Date: Sun Jan 15 15:07:18 2012 +0100 + + Fix stack overflow in PDFDoc::markObject() + + Bug 44660 + + poppler/PDFDoc.cc | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +commit 81c989d905b6ba053c87d2a661d71853ddf96b99 +Author: Thomas Freitag <[email protected]> +Date: Sun Jan 15 15:04:51 2012 +0100 + + Correctly initialize globalParams + + utils/pdfseparate.cc | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit bd1ed2ea35a653e20f45eebe3dff9ecf98ba4674 +Author: Adrian Johnson <[email protected]> +Date: Sun Jan 15 22:18:30 2012 +1030 + + parseargs: don't use arg->size with GooString argument + + 40b56994 added GooString arguments but incorrectly used arg->size as + the string length. arg->size is always 0 for GooString arguments. This + worked because the arg->size - 1 string length passed to + GooString::Set() just happened to be the the same value as the + CALC_STRING_LEN default argument indicating the string length is to be + calculated with strlen. + (cherry picked from commit 4e205a6625431dcf95375de009b4354746a4f0b7) + + utils/parseargs.cc | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +commit 310a10b6c6be2fc96b6f549645f38fe8ffae35a3 +Author: Arseny Solokha <[email protected]> +Date: Fri Jan 13 18:52:17 2012 +0100 + + Properly initialize globalParams + + Bug 44659 + + utils/pdfunite.cc | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit fb1ffd2bf8a74e2cd08ee77f7813dfcf594a59ad +Author: Thomas Freitag <[email protected]> +Date: Sat Jan 7 11:47:19 2012 +0100 + + regtest: read stderr output before calling wait to fix a possible + deadlock + + In the way the scripts starts it subprocesses, stderr becomes buffered + for the subprocesses. And unforunately, when the buffer limit is + reached, the subprocess suspends it work until it can print again on + stderr. That's why the python script runs into a deadlock when the + subprocess produces a lot of error messages. A small rearrange of the + commands, first read the stderr output and then wait that the + subprocess + ends, will remove this deadlock. + + regtest/backends/__init__.py | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 12e91b1e25fd6c913c63c4e683dde33b583d6fc5 +Author: Yi Yang <[email protected]> +Date: Sat Jan 7 09:44:42 2012 +1030 + + Include .otf fonts when finding substitute fonts + + Bug 44412 + (cherry picked from commit 9979b1b3e36dc8085d8c684692fece463fa474b1) + + poppler/GfxFont.cc | 2 +- + poppler/GlobalParams.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e91e70f5a2084c16d664d49c6d30cfc244710db5 +Author: Adrian Johnson <[email protected]> +Date: Fri Dec 23 09:55:20 2011 +1030 + + autoconf: Check for cairo-ft and other cairo backends + + so that CAIRO_LIBS includes the freetype dependency and pdftocairo + includes the dependencies for optional cairo backends. + + Bug 43969 + (cherry picked from commit ebfab832ab4f2642b9ab2ededd25de670a3c7147) + + configure.ac | 14 ++++++++++++-- + utils/Makefile.am | 4 ++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +commit 03544e2f602319f0b381f5f357e14cc2cc77d2c1 +Author: Albert Astals Cid <[email protected]> +Date: Tue Dec 6 23:21:15 2011 +0100 + + include strings.h as we use memcpy + + Fixes bug 43558 + (cherry picked from commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b) + + goo/PNGWriter.cc | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 74f4299e8f9e2d204979479f6579dd784db678a4 +Author: Albert Astals Cid <[email protected]> +Date: Sun Dec 4 17:29:45 2011 +0100 + + Do not fail if we are trying to save a file with Encrypt but that + we have not modified at all + + Fixes KDE bug #288045 + (cherry picked from commit 63c942a45227ef28fb94ef4765171d9812fffafa) + + poppler/PDFDoc.cc | 49 + +++++++++++++++++++++++++++++-------------------- + 1 files changed, 29 insertions(+), 20 deletions(-) + commit 447a958ce43b697ab99084ba1371b989331c6ccc Author: Albert Astals Cid <[email protected]> Date: Sun Dec 4 15:44:52 2011 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/Makefile.in new/poppler-0.18.3/Makefile.in --- old/poppler-0.18.2/Makefile.in 2011-12-04 15:46:38.000000000 +0100 +++ new/poppler-0.18.3/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -258,6 +258,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/NEWS new/poppler-0.18.3/NEWS --- old/poppler-0.18.2/NEWS 2011-12-04 15:43:34.000000000 +0100 +++ new/poppler-0.18.3/NEWS 2012-01-15 15:18:08.000000000 +0100 @@ -1,3 +1,18 @@ +Release 0.18.3 + core: + * Do not fail if we are trying to save a file with Encrypt that has not been modified. KDE Bug #288045 + * Include .otf fonts when finding substitute fonts. Bug #44412 + * Fix stack overflow in PDFDoc::markObject(). Bug #44660 + * Include strings.h as we use memcpy. Bug #43558 + + utils: + * pdfunite: Properly initialize globalParams. Bug #44659 + * pdfseparate: Properly initialize globalParams + * Fix iniliazialization of GooString arguments + + build system: + * autoconf: Check for cairo-ft and other cairo backends. Bug #43969 + Release 0.18.2 core: * Fix leak in GooString when resizing to a smaller string diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/configure new/poppler-0.18.3/configure --- old/poppler-0.18.2/configure 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/configure 2012-01-15 15:22:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for poppler 0.18.2. +# Generated by GNU Autoconf 2.68 for poppler 0.18.3. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='poppler' PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.18.2' -PACKAGE_STRING='poppler 0.18.2' +PACKAGE_VERSION='0.18.3' +PACKAGE_STRING='poppler 0.18.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' PACKAGE_URL='' @@ -681,6 +681,8 @@ GLIB_REQUIRED CAIRO_REQ CAIRO_FEATURE +PDFTOCAIRO_LIBS +PDFTOCAIRO_CFLAGS BUILD_CAIRO_OUTPUT_FALSE BUILD_CAIRO_OUTPUT_TRUE CAIRO_LIBS @@ -918,6 +920,8 @@ FONTCONFIG_LIBS CAIRO_CFLAGS CAIRO_LIBS +PDFTOCAIRO_CFLAGS +PDFTOCAIRO_LIBS POPPLER_GLIB_CFLAGS POPPLER_GLIB_LIBS GTKDOC_DEPS_CFLAGS @@ -1472,7 +1476,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.18.2 to adapt to many kinds of systems. +\`configure' configures poppler 0.18.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1546,7 +1550,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.18.2:";; + short | recursive ) echo "Configuration of poppler 0.18.3:";; esac cat <<\_ACEOF @@ -1642,6 +1646,10 @@ CAIRO_CFLAGS C compiler flags for CAIRO, overriding pkg-config CAIRO_LIBS linker flags for CAIRO, overriding pkg-config + PDFTOCAIRO_CFLAGS + C compiler flags for PDFTOCAIRO, overriding pkg-config + PDFTOCAIRO_LIBS + linker flags for PDFTOCAIRO, overriding pkg-config POPPLER_GLIB_CFLAGS C compiler flags for POPPLER_GLIB, overriding pkg-config POPPLER_GLIB_LIBS @@ -1731,7 +1739,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.18.2 +poppler configure 0.18.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2425,7 +2433,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.18.2, which was +It was created by poppler $as_me 0.18.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3241,7 +3249,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.18.2' + VERSION='0.18.3' cat >>confdefs.h <<_ACEOF @@ -20449,12 +20457,12 @@ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION" 2>/dev/null` + pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20466,12 +20474,12 @@ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION" 2>/dev/null` + pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20492,14 +20500,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1` else - CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CAIRO_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (cairo >= $CAIRO_VERSION) were not met: + as_fn_error $? "Package requirements (cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION) were not met: $CAIRO_PKG_ERRORS @@ -20541,12 +20549,12 @@ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION" 2>/dev/null` + pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20558,12 +20566,12 @@ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_VERSION cairo-ft >= \$CAIRO_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION" 2>/dev/null` + pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20584,9 +20592,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1` else - CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION" 2>&1` + CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CAIRO_PKG_ERRORS" >&5 @@ -20618,6 +20626,126 @@ if test x$enable_cairo_output = xyes; then + PDFTOCAIRO_DEPS="cairo cairo-ft" + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-pdf\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo-pdf") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-pdf" +fi + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ps\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo-ps") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-ps" +fi + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-svg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "cairo-svg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-svg" +fi + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDFTOCAIRO" >&5 +$as_echo_n "checking for PDFTOCAIRO... " >&6; } + +if test -n "$PDFTOCAIRO_CFLAGS"; then + pkg_cv_PDFTOCAIRO_CFLAGS="$PDFTOCAIRO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$PDFTOCAIRO_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$PDFTOCAIRO_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PDFTOCAIRO_CFLAGS=`$PKG_CONFIG --cflags "$PDFTOCAIRO_DEPS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PDFTOCAIRO_LIBS"; then + pkg_cv_PDFTOCAIRO_LIBS="$PDFTOCAIRO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$PDFTOCAIRO_DEPS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$PDFTOCAIRO_DEPS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PDFTOCAIRO_LIBS=`$PKG_CONFIG --libs "$PDFTOCAIRO_DEPS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PDFTOCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$PDFTOCAIRO_DEPS" 2>&1` + else + PDFTOCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$PDFTOCAIRO_DEPS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PDFTOCAIRO_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($PDFTOCAIRO_DEPS) were not met: + +$PDFTOCAIRO_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables PDFTOCAIRO_CFLAGS +and PDFTOCAIRO_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PDFTOCAIRO_CFLAGS +and PDFTOCAIRO_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + PDFTOCAIRO_CFLAGS=$pkg_cv_PDFTOCAIRO_CFLAGS + PDFTOCAIRO_LIBS=$pkg_cv_PDFTOCAIRO_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + + $as_echo "#define HAVE_CAIRO 1" >>confdefs.h CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1" @@ -22925,9 +23053,9 @@ POPPLER_MINOR_VERSION=18 -POPPLER_MICRO_VERSION=2 +POPPLER_MICRO_VERSION=3 -POPPLER_VERSION=0.18.2 +POPPLER_VERSION=0.18.3 ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc" @@ -23571,7 +23699,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.18.2, which was +This file was extended by poppler $as_me 0.18.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23637,7 +23765,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.18.2 +poppler config.status 0.18.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/configure.ac new/poppler-0.18.3/configure.ac --- old/poppler-0.18.2/configure.ac 2011-12-04 15:43:49.000000000 +0100 +++ new/poppler-0.18.3/configure.ac 2012-01-15 15:19:54.000000000 +0100 @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[18]) -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) @@ -379,9 +379,9 @@ enable_cairo_output=$enableval, enable_cairo_output="try") if test x$enable_cairo_output = xyes; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION) elif test x$enable_cairo_output = xtry; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION, + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION, [enable_cairo_output="yes"], [enable_cairo_output="no"]) fi @@ -392,6 +392,16 @@ AM_CONDITIONAL(BUILD_CAIRO_OUTPUT, test x$enable_cairo_output = xyes) AH_TEMPLATE([HAVE_CAIRO], [Use cairo for rendering.]) if test x$enable_cairo_output = xyes; then + PDFTOCAIRO_DEPS="cairo cairo-ft" + dnl Check for optional cairo backends used by pdftocairo + PKG_CHECK_EXISTS(cairo-pdf, [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-pdf"], []) + PKG_CHECK_EXISTS(cairo-ps, [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-ps"], []) + PKG_CHECK_EXISTS(cairo-svg, [PDFTOCAIRO_DEPS="$PDFTOCAIRO_DEPS cairo-svg"], []) + + PKG_CHECK_MODULES(PDFTOCAIRO, $PDFTOCAIRO_DEPS) + AC_SUBST(PDFTOCAIRO_CFLAGS) + AC_SUBST(PDFTOCAIRO_LIBS) + AC_DEFINE(HAVE_CAIRO) CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1" CAIRO_REQ="cairo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/cpp/Makefile.in new/poppler-0.18.3/cpp/Makefile.in --- old/poppler-0.18.2/cpp/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/cpp/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -291,6 +291,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/cpp/poppler-version.h new/poppler-0.18.3/cpp/poppler-version.h --- old/poppler-0.18.2/cpp/poppler-version.h 2011-12-04 15:46:47.000000000 +0100 +++ new/poppler-0.18.3/cpp/poppler-version.h 2012-01-15 15:22:13.000000000 +0100 @@ -21,10 +21,10 @@ #include "poppler-global.h" -#define POPPLER_VERSION "0.18.2" +#define POPPLER_VERSION "0.18.3" #define POPPLER_VERSION_MAJOR 0 #define POPPLER_VERSION_MINOR 18 -#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.18.2/cpp/tests/Makefile.in new/poppler-0.18.3/cpp/tests/Makefile.in --- old/poppler-0.18.2/cpp/tests/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/cpp/tests/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -198,6 +198,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/fofi/Makefile.in new/poppler-0.18.3/fofi/Makefile.in --- old/poppler-0.18.2/fofi/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/fofi/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -237,6 +237,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/glib/Makefile.in new/poppler-0.18.3/glib/Makefile.in --- old/poppler-0.18.2/glib/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/glib/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -294,6 +294,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/glib/demo/Makefile.in new/poppler-0.18.3/glib/demo/Makefile.in --- old/poppler-0.18.2/glib/demo/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/glib/demo/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -221,6 +221,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/glib/reference/Makefile.in new/poppler-0.18.3/glib/reference/Makefile.in --- old/poppler-0.18.2/glib/reference/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/glib/reference/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -170,6 +170,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/glib/reference/html/index.html new/poppler-0.18.3/glib/reference/html/index.html --- old/poppler-0.18.2/glib/reference/html/index.html 2011-12-04 15:48:04.000000000 +0100 +++ new/poppler-0.18.3/glib/reference/html/index.html 2012-01-15 15:23:24.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.18.2 + for Poppler 0.18.3 </p></div> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.18.3/glib/reference/html/poppler-Version-and-Features-Information.html --- old/poppler-0.18.2/glib/reference/html/poppler-Version-and-Features-Information.html 2011-12-04 15:48:04.000000000 +0100 +++ new/poppler-0.18.3/glib/reference/html/poppler-Version-and-Features-Information.html 2012-01-15 15:23:24.000000000 +0100 @@ -93,7 +93,7 @@ <hr> <div class="refsect2"> <a name="POPPLER-MICRO-VERSION:CAPS"></a><h3>POPPLER_MICRO_VERSION</h3> -<pre class="programlisting">#define POPPLER_MICRO_VERSION (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.18.2/glib/reference/version.xml new/poppler-0.18.3/glib/reference/version.xml --- old/poppler-0.18.2/glib/reference/version.xml 2011-12-04 15:46:46.000000000 +0100 +++ new/poppler-0.18.3/glib/reference/version.xml 2012-01-15 15:22:12.000000000 +0100 @@ -1 +1 @@ -0.18.2 +0.18.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/goo/Makefile.in new/poppler-0.18.3/goo/Makefile.in --- old/poppler-0.18.2/goo/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/goo/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -240,6 +240,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/goo/PNGWriter.cc new/poppler-0.18.3/goo/PNGWriter.cc --- old/poppler-0.18.2/goo/PNGWriter.cc 2011-11-22 22:33:06.000000000 +0100 +++ new/poppler-0.18.3/goo/PNGWriter.cc 2011-12-06 23:22:47.000000000 +0100 @@ -6,7 +6,7 @@ // // Copyright (C) 2009 Warren Toomey <[email protected]> // Copyright (C) 2009 Shen Liang <[email protected]> -// Copyright (C) 2009 Albert Astals Cid <[email protected]> +// Copyright (C) 2009, 2011 Albert Astals Cid <[email protected]> // Copyright (C) 2009 Stefan Thomas <[email protected]> // Copyright (C) 2010, 2011 Adrian Johnson <[email protected]> // Copyright (C) 2011 Thomas Klausner <[email protected]> @@ -19,6 +19,7 @@ #include <zlib.h> #include <stdlib.h> +#include <string.h> #include "poppler/Error.h" #include "goo/gmem.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/poppler/GfxFont.cc new/poppler-0.18.3/poppler/GfxFont.cc --- old/poppler-0.18.2/poppler/GfxFont.cc 2011-11-22 22:33:12.000000000 +0100 +++ new/poppler-0.18.3/poppler/GfxFont.cc 2012-01-15 15:13:00.000000000 +0100 @@ -27,6 +27,7 @@ // Copyright (C) 2009, 2010 David Benjamin <[email protected]> // Copyright (C) 2011 Axel Strübing <[email protected]> // Copyright (C) 2011 Adrian Johnson <[email protected]> +// Copyright (C) 2012 Yi Yang <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -449,7 +450,7 @@ void GfxFont::findExtFontFile() { static char *type1Exts[] = { ".pfa", ".pfb", ".ps", "", NULL }; - static char *ttExts[] = { ".ttf", ".ttc", NULL }; + static char *ttExts[] = { ".ttf", ".ttc", ".otf", NULL }; if (name) { if (type == fontType1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/poppler/GlobalParams.cc new/poppler-0.18.3/poppler/GlobalParams.cc --- old/poppler-0.18.2/poppler/GlobalParams.cc 2011-11-22 22:33:13.000000000 +0100 +++ new/poppler-0.18.3/poppler/GlobalParams.cc 2012-01-15 15:12:57.000000000 +0100 @@ -30,6 +30,7 @@ // Copyright (C) 2010 Jakub Wilk <[email protected]> // Copyright (C) 2011 Pino Toscano <[email protected]> // Copyright (C) 2011 Koji Otani <[email protected]> +// Copyright (C) 2012 Yi Yang <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -1247,7 +1248,7 @@ ext = strrchr((char*)s,'.'); if (!ext) continue; - if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4)) + if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4) || !strncasecmp(ext, ".otf", 4)) { dfp = new DisplayFontParam(fontName->copy(), displayFontTT); dfp->tt.fileName = new GooString((char*)s); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/poppler/Makefile.in new/poppler-0.18.3/poppler/Makefile.in --- old/poppler-0.18.2/poppler/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/poppler/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -335,6 +335,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/poppler/PDFDoc.cc new/poppler-0.18.3/poppler/PDFDoc.cc --- old/poppler-0.18.2/poppler/PDFDoc.cc 2011-11-22 22:33:14.000000000 +0100 +++ new/poppler-0.18.3/poppler/PDFDoc.cc 2012-01-15 15:07:06.000000000 +0100 @@ -26,7 +26,7 @@ // Copyright (C) 2010 Ilya Gorenbein <[email protected]> // Copyright (C) 2010 Srinivas Adicherla <[email protected]> // Copyright (C) 2010 Philip Lorenz <[email protected]> -// Copyright (C) 2011 Thomas Freitag <[email protected]> +// Copyright (C) 2011, 2012 Thomas Freitag <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git @@ -707,35 +707,44 @@ int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) { - // we don't support files with Encrypt at the moment + // find if we have updated objects + GBool updated = gFalse; + for(int i=0; i<xref->getNumObjects(); i++) { + if (xref->getEntry(i)->updated) { + updated = gTrue; + break; + } + } + + // we don't support rewriting files with Encrypt at the moment Object obj; xref->getTrailerDict()->getDict()->lookupNF("Encrypt", &obj); if (!obj.isNull()) { obj.free(); - return errEncrypted; + if (!updated && mode == writeStandard) { + // simply copy the original file + saveWithoutChangesAs (outStr); + } else { + return errEncrypted; + } } - obj.free(); + else + { + obj.free(); - if (mode == writeForceRewrite) { - saveCompleteRewrite(outStr); - } else if (mode == writeForceIncremental) { - saveIncrementalUpdate(outStr); - } else { // let poppler decide - // find if we have updated objects - GBool updated = gFalse; - for(int i=0; i<xref->getNumObjects(); i++) { - if (xref->getEntry(i)->updated) { - updated = gTrue; - break; + if (mode == writeForceRewrite) { + saveCompleteRewrite(outStr); + } else if (mode == writeForceIncremental) { + saveIncrementalUpdate(outStr); + } else { // let poppler decide + if(updated) { + saveIncrementalUpdate(outStr); + } else { + // simply copy the original file + saveWithoutChangesAs (outStr); } } - if(updated) { - saveIncrementalUpdate(outStr); - } else { - // simply copy the original file - saveWithoutChangesAs (outStr); - } } return errNone; @@ -1225,6 +1234,8 @@ } else { XRefEntry *entry = countRef->getEntry(obj->getRef().num + numOffset); entry->gen++; + if (entry->gen > 9) + break; } Object obj1; getXRef()->fetch(obj->getRef().num, obj->getRef().gen, &obj1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/qt4/Makefile.in new/poppler-0.18.3/qt4/Makefile.in --- old/poppler-0.18.2/qt4/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/qt4/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -203,6 +203,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/qt4/demos/Makefile.in new/poppler-0.18.3/qt4/demos/Makefile.in --- old/poppler-0.18.2/qt4/demos/Makefile.in 2011-12-04 15:46:37.000000000 +0100 +++ new/poppler-0.18.3/qt4/demos/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -219,6 +219,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/qt4/src/Makefile.in new/poppler-0.18.3/qt4/src/Makefile.in --- old/poppler-0.18.2/qt4/src/Makefile.in 2011-12-04 15:46:38.000000000 +0100 +++ new/poppler-0.18.3/qt4/src/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -260,6 +260,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/qt4/tests/Makefile.in new/poppler-0.18.3/qt4/tests/Makefile.in --- old/poppler-0.18.2/qt4/tests/Makefile.in 2011-12-04 15:46:38.000000000 +0100 +++ new/poppler-0.18.3/qt4/tests/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -364,6 +364,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/splash/Makefile.in new/poppler-0.18.3/splash/Makefile.in --- old/poppler-0.18.2/splash/Makefile.in 2011-12-04 15:46:38.000000000 +0100 +++ new/poppler-0.18.3/splash/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -232,6 +232,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/test/Makefile.in new/poppler-0.18.3/test/Makefile.in --- old/poppler-0.18.2/test/Makefile.in 2011-12-04 15:46:38.000000000 +0100 +++ new/poppler-0.18.3/test/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -219,6 +219,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/utils/Makefile.am new/poppler-0.18.3/utils/Makefile.am --- old/poppler-0.18.2/utils/Makefile.am 2011-11-22 22:33:29.000000000 +0100 +++ new/poppler-0.18.3/utils/Makefile.am 2012-01-13 18:56:01.000000000 +0100 @@ -17,7 +17,7 @@ -I$(top_srcdir)/poppler \ $(UTILS_CFLAGS) \ $(FONTCONFIG_CFLAGS) \ - $(CAIRO_CFLAGS) + $(PDFTOCAIRO_CFLAGS) LDADD = \ $(top_builddir)/poppler/libpoppler.la \ @@ -32,7 +32,7 @@ pdftocairo_LDADD = \ $(top_builddir)/poppler/libpoppler-cairo.la \ - $(LDADD) $(CAIRO_LIBS) + $(LDADD) $(PDFTOCAIRO_LIBS) pdftocairo_binary = pdftocairo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/utils/Makefile.in new/poppler-0.18.3/utils/Makefile.in --- old/poppler-0.18.2/utils/Makefile.in 2011-12-04 15:46:38.000000000 +0100 +++ new/poppler-0.18.3/utils/Makefile.in 2012-01-15 15:22:04.000000000 +0100 @@ -307,6 +307,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PC_REQUIRES = @PC_REQUIRES@ PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@ +PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@ +PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -409,7 +411,7 @@ -I$(top_srcdir)/poppler \ $(UTILS_CFLAGS) \ $(FONTCONFIG_CFLAGS) \ - $(CAIRO_CFLAGS) + $(PDFTOCAIRO_CFLAGS) LDADD = \ $(top_builddir)/poppler/libpoppler.la \ @@ -422,7 +424,7 @@ @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \ @BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \ -@BUILD_CAIRO_OUTPUT_TRUE@ $(LDADD) $(CAIRO_LIBS) +@BUILD_CAIRO_OUTPUT_TRUE@ $(LDADD) $(PDFTOCAIRO_LIBS) @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_binary = pdftocairo @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_manpage = pdftocairo.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/utils/parseargs.cc new/poppler-0.18.3/utils/parseargs.cc --- old/poppler-0.18.2/utils/parseargs.cc 2011-11-22 22:33:29.000000000 +0100 +++ new/poppler-0.18.3/utils/parseargs.cc 2012-01-15 15:13:41.000000000 +0100 @@ -16,7 +16,7 @@ under GPL version 2 or later Copyright (C) 2008, 2009 Albert Astals Cid <[email protected]> - Copyright (C) 2011 Adrian Johnson <[email protected]> + Copyright (C) 2011, 2012 Adrian Johnson <[email protected]> To see a description of the changes please see the Changelog file that came with your tarball or type make ChangeLog if you are building from git @@ -157,8 +157,7 @@ break; case argGooString: if (i + 1 < *argc) { - ((GooString*)arg->val)->Set(argv[i+1], arg->size - 1); - ((GooString*)arg->val)->append('\0'); + ((GooString*)arg->val)->Set(argv[i+1]); n = 2; } else { ok = gFalse; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/utils/pdfseparate.cc new/poppler-0.18.3/utils/pdfseparate.cc --- old/poppler-0.18.2/utils/pdfseparate.cc 2011-11-22 22:33:30.000000000 +0100 +++ new/poppler-0.18.3/utils/pdfseparate.cc 2012-01-15 15:04:23.000000000 +0100 @@ -4,7 +4,7 @@ // // This file is licensed under the GPLv2 or later // -// Copyright (C) 2011 Thomas Freitag <[email protected]> +// Copyright (C) 2011, 2012 Thomas Freitag <[email protected]> // //======================================================================== #include "config.h" @@ -17,6 +17,7 @@ #include "goo/GooString.h" #include "PDFDoc.h" #include "ErrorCodes.h" +#include "GlobalParams.h" static int firstPage = 0; static int lastPage = 0; @@ -107,7 +108,9 @@ exitCode = 0; goto err0; } + globalParams = new GlobalParams(); extractPages (argv[1], argv[2]); + delete globalParams; err0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-0.18.2/utils/pdfunite.cc new/poppler-0.18.3/utils/pdfunite.cc --- old/poppler-0.18.2/utils/pdfunite.cc 2011-11-22 22:33:30.000000000 +0100 +++ new/poppler-0.18.3/utils/pdfunite.cc 2012-01-13 18:56:01.000000000 +0100 @@ -5,9 +5,11 @@ // This file is licensed under the GPLv2 or later // // Copyright (C) 2011 Thomas Freitag <[email protected]> +// Copyright (C) 2012 Arseny Solokha <[email protected]> // //======================================================================== #include <PDFDoc.h> +#include <GlobalParams.h> #include "parseargs.h" #include "config.h" #include <poppler-config.h> @@ -66,6 +68,7 @@ return exitCode; } exitCode = 0; + globalParams = new GlobalParams(); for (i = 1; i < argc - 1; i++) { GooString *gfileName = new GooString(argv[i]); @@ -172,5 +175,6 @@ delete countRef; for (j = 0; j < (int) pages.size (); j++) pages[j].free(); for (i = 0; i < (int) docs.size (); i++) delete docs[i]; + delete globalParams; return exitCode; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
