diff -Nru poppler-0.11.3/ChangeLog poppler-0.12.0/ChangeLog --- poppler-0.11.3/ChangeLog 2009-08-18 20:03:56.000000000 +0100 +++ poppler-0.12.0/ChangeLog 2009-09-09 18:25:33.000000000 +0100 @@ -1,3 +1,191 @@ +commit e8ed7210346cb18f6e4588ad557f993c6d42f4a3 +Author: Albert Astals Cid +Date: Wed Sep 9 19:21:21 2009 +0200 + + increase library to 3.2.0 + + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e950107006a3b1889646d3705323c1b3d41eaa49 +Author: David Benjamin +Date: Wed Sep 9 01:19:38 2009 +0200 + + Fix infinite loop in JBIG2Decoder + + Bug 23025 + Also fixes problems in bug-poppler6881-2.pdf and bug-poppler6500.pdf + + poppler/JBIG2Stream.cc | 13 ++++++++----- + 1 files changed, 8 insertions(+), 5 deletions(-) + +commit 1cb25a4adaaf3e2da50724312a3db6928991f425 +Author: Carlos Garcia Campos +Date: Sun Sep 6 10:45:56 2009 +0200 + + [glib] Ignore attachments with an invalid embedded file + + Fixes bug #10386 + + glib/poppler-document.cc | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 842e00f3114666609ef4dec6fa613d46f330a40c +Author: Albert Astals Cid +Date: Sat Sep 5 15:20:35 2009 +0200 + + Add EmbeddedFile::isValid + + Also do not crash if data() is called on an invalid file + + qt4/src/poppler-embeddedfile.cc | 10 +++++++++- + qt4/src/poppler-qt4.h | 9 ++++++++- + 2 files changed, 17 insertions(+), 2 deletions(-) + +commit 9d40b268f5a9a9a0fb79da0e1627dd8eebc4db6a +Author: Albert Astals Cid +Date: Sat Sep 5 15:19:27 2009 +0200 + + Add EmbFile::isOk + + At the moment returns false if the object stream is not really a stream + + poppler/Catalog.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 642650b6f70425c8fff2df978ae71249a5ae07f3 +Author: David Benjamin +Date: Sat Sep 5 01:12:49 2009 +0200 + + Better fallback when there's a type mismatch + + Bug #17252 + + poppler/GfxFont.cc | 38 ++++++++++++++++++++++++++++++++------ + 1 files changed, 32 insertions(+), 6 deletions(-) + +commit bf5811f5331292ccf30f1b0f089fe43d351d96be +Author: Albert Astals Cid +Date: Wed Aug 26 00:43:46 2009 +0200 + + Improve shading color rendering + + Shading is not necessarily lineal so require another bisection to + assume all the area in between have the same color. Fixes bug #20238 + + poppler/Gfx.cc | 17 ++++++++++++++++- + 1 files changed, 16 insertions(+), 1 deletions(-) + +commit e94430b790fde6ce7b7cb163c2e0adf2d071c81d +Author: Albert Astals Cid +Date: Wed Aug 26 00:42:49 2009 +0200 + + Make code a bit more readable + + poppler/Gfx.cc | 23 +++++++++++------------ + 1 files changed, 11 insertions(+), 12 deletions(-) + +commit 465212780557705fd939dfe54f96913505bfc96e +Author: Albert Astals Cid +Date: Tue Aug 25 21:55:45 2009 +0200 + + forgot to update my copyright + + poppler/JPEG2000Stream.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 4f6016d01ced32002bef22b9b5d5426a74e55842 +Author: Albert Astals Cid +Date: Tue Aug 25 21:10:07 2009 +0200 + + Fix format security warnings + + Don't just directly print strings of unknown content; use "%s". + + poppler/JPEG2000Stream.cc | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 4616b23382b5d155f8b2f1942733037cf5730844 +Author: Christian Persch +Date: Tue Aug 25 21:09:40 2009 +0200 + + Fix format security warnings + + Don't just directly print strings of unknown content; use "%s". + + poppler/GfxState.cc | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit 6c5c8d008456d1e4f3d60bc182209747c2a175dc +Author: Christian Persch +Date: Tue Aug 25 21:03:16 2009 +0200 + + Support AM_SILENT_RULES + + When using automake 1.11, should support silent build rules. + + Makefile.am | 2 +- + configure.ac | 1 + + glib/Makefile.am | 4 ++-- + qt4/demos/Makefile.am | 2 +- + qt4/src/Makefile.am | 2 +- + qt4/tests/Makefile.am | 2 +- + 6 files changed, 7 insertions(+), 6 deletions(-) + +commit e7dd1c47b01d8f31599ee686eafbe7c54d7c023a +Author: Christian Persch +Date: Tue Aug 25 21:01:13 2009 +0200 + + Fix automake check, and add automake 1.11 support + + Fix the automake checks to take the *newest* version available, not the + oldest one. Add support for automake 1.11. FDO#23473. + + autogen.sh | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + +commit 493d2c5aa78a3241e70108c5d7eccba9ac72f834 +Author: Rex Dieter +Date: Mon Aug 24 20:08:46 2009 +0200 + + Use Requires.private if available + + The following patch minimizes pkg-config deps similar to how the + glib-related pkg-config deps are done. + + poppler-qt.pc.cmake | 3 ++- + poppler-qt.pc.in | 3 ++- + poppler-qt4.pc.cmake | 3 ++- + poppler-qt4.pc.in | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +commit 341cd3ecd08a39cd146c1c57f356b50a2881c03f +Author: Jakub Wilk +Date: Mon Aug 24 19:51:34 2009 +0200 + + common options for pdftoabw + + The attached patch fixes command line handling for pdftoabw and implements some + common options (e.g., --help) that are already found in other pdftosomething + utilities. + + utils/pdftoabw.cc | 39 ++++++++++++++++++++++++++++++++------- + 1 files changed, 32 insertions(+), 7 deletions(-) + +commit 365683d5faea6e0a7570b139d1f3366c22271f8e +Author: Albert Astals Cid +Date: Tue Aug 18 21:18:13 2009 +0200 + + 0.11.3 + + CMakeLists.txt | 2 +- + NEWS | 22 ++++++++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 28 insertions(+), 6 deletions(-) + commit cb28bc8a637d300664b3c7569263445275333878 Author: Carlos Garcia Campos Date: Mon Aug 17 14:14:03 2009 +0200 diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/CMakeLists.txt /tmp/9MerXF9qtu/poppler-0.12.0/CMakeLists.txt --- poppler-0.11.3/CMakeLists.txt 2009-08-18 19:55:06.000000000 +0100 +++ poppler-0.12.0/CMakeLists.txt 2009-09-09 18:00:16.000000000 +0100 @@ -12,8 +12,8 @@ include(MacroBoolTo01) set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "11") -set(POPPLER_MICRO_VERSION "3") +set(POPPLER_MINOR_VERSION "12") +set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/config.log /tmp/9MerXF9qtu/poppler-0.12.0/config.log --- poppler-0.11.3/config.log 2009-09-10 02:24:09.000000000 +0100 +++ poppler-0.12.0/config.log 1970-01-01 01:00:00.000000000 +0100 @@ -1,742 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by poppler configure 0.11.3, which was -generated by GNU Autoconf 2.63. Invocation command line was - - $ /home/seb128/boulot/package/poppler/poppler-0.11.3/./configure --build=i486-linux-gnu --prefix=/usr --includedir=${prefix}/include --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc/xpdf --localstatedir=/var --libexecdir=${prefix}/lib/poppler --disable-maintainer-mode --disable-dependency-tracking --srcdir=. --enable-libjpeg --disable-openjpeg --enable-splash-output --enable-cairo-output --enable-poppler-glib --enable-poppler-qt --enable-poppler-qt4 --enable-a4-paper --enable-gtk-doc --disable-gtk-test - -## --------- ## -## Platform. ## -## --------- ## - -hostname = seb128-laptop -uname -m = i686 -uname -r = 2.6.31-5-generic -uname -s = Linux -uname -v = #24-Ubuntu SMP Sat Aug 1 12:48:18 UTC 2009 - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = unknown -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -/usr/bin/hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /usr/share/qt4/bin -PATH: /usr/sbin -PATH: /usr/bin -PATH: /sbin -PATH: /bin -PATH: /usr/bin/X11 - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:2294: checking for a BSD-compatible install -configure:2362: result: /usr/bin/install -c -configure:2373: checking whether build environment is sane -configure:2416: result: yes -configure:2441: checking for a thread-safe mkdir -p -configure:2480: result: /bin/mkdir -p -configure:2493: checking for gawk -configure:2509: found /usr/bin/gawk -configure:2520: result: gawk -configure:2531: checking whether make sets $(MAKE) -configure:2553: result: yes -configure:2748: checking build system type -configure:2766: result: i486-pc-linux-gnu -configure:2788: checking host system type -configure:2803: result: i486-pc-linux-gnu -configure:3166: checking for style of include used by make -configure:3194: result: GNU -configure:3264: checking for gcc -configure:3291: result: cc -configure:3523: checking for C compiler version -configure:3531: cc --version >&5 -cc (Ubuntu 4.4.1-3ubuntu3) 4.4.1 -Copyright (C) 2009 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:3535: $? = 0 -configure:3542: cc -v >&5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-3ubuntu3' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu -Thread model: posix -gcc version 4.4.1 (Ubuntu 4.4.1-3ubuntu3) -configure:3546: $? = 0 -configure:3553: cc -V >&5 -cc: '-V' option must have argument -configure:3557: $? = 1 -configure:3580: checking for C compiler default output file name -configure:3602: cc -g -O2 -g -Wall -O2 -Wl,-Bsymbolic-functions conftest.c >&5 -configure:3606: $? = 0 -configure:3644: result: a.out -configure:3663: checking whether the C compiler works -configure:3673: ./a.out -configure:3677: $? = 0 -configure:3696: result: yes -configure:3703: checking whether we are cross compiling -configure:3705: result: no -configure:3708: checking for suffix of executables -configure:3715: cc -o conftest -g -O2 -g -Wall -O2 -Wl,-Bsymbolic-functions conftest.c >&5 -configure:3719: $? = 0 -configure:3745: result: -configure:3751: checking for suffix of object files -configure:3777: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:3781: $? = 0 -configure:3806: result: o -configure:3810: checking whether we are using the GNU C compiler -configure:3839: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:3846: $? = 0 -configure:3863: result: yes -configure:3872: checking whether cc accepts -g -configure:3902: cc -c -g conftest.c >&5 -configure:3909: $? = 0 -configure:4010: result: yes -configure:4027: checking for cc option to accept ISO C89 -configure:4101: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4108: $? = 0 -configure:4131: result: none needed -configure:4151: checking dependency style of cc -configure:4242: result: none -configure:4257: checking for a sed that does not truncate output -configure:4323: result: /bin/sed -configure:4341: checking for grep that handles long lines and -e -configure:4401: result: /bin/grep -configure:4406: checking for egrep -configure:4470: result: /bin/grep -E -configure:4475: checking for fgrep -configure:4539: result: /bin/grep -F -configure:4574: checking for ld used by cc -configure:4641: result: /usr/bin/ld -configure:4650: checking if the linker (/usr/bin/ld) is GNU ld -configure:4665: result: yes -configure:4677: checking for BSD- or MS-compatible name lister (nm) -configure:4726: result: /usr/bin/nm -B -configure:4844: checking the name lister (/usr/bin/nm -B) interface -configure:4851: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:4854: /usr/bin/nm -B "conftest.o" -configure:4857: output -00000000 B some_variable -configure:4864: result: BSD nm -configure:4867: checking whether ln -s works -configure:4871: result: yes -configure:4879: checking the maximum length of command line arguments -configure:4999: result: 805306365 -configure:5016: checking whether the shell understands some XSI constructs -configure:5026: result: yes -configure:5030: checking whether the shell understands "+=" -configure:5036: result: yes -configure:5071: checking for /usr/bin/ld option to reload object files -configure:5078: result: -r -configure:5147: checking for objdump -configure:5174: result: objdump -configure:5203: checking how to recognize dependent libraries -configure:5399: result: pass_all -configure:5459: checking for ar -configure:5475: found /usr/bin/ar -configure:5486: result: ar -configure:5564: checking for strip -configure:5580: found /usr/bin/strip -configure:5591: result: strip -configure:5663: checking for ranlib -configure:5679: found /usr/bin/ranlib -configure:5690: result: ranlib -configure:5780: checking command to parse /usr/bin/nm -B output from cc object -configure:5898: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:5901: $? = 0 -configure:5905: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm -configure:5908: $? = 0 -configure:5962: cc -o conftest -g -O2 -g -Wall -O2 -Wl,-Bsymbolic-functions conftest.c conftstm.o >&5 -configure:5965: $? = 0 -configure:6003: result: ok -configure:6870: checking how to run the C preprocessor -configure:6910: cc -E conftest.c -configure:6917: $? = 0 -configure:6948: cc -E conftest.c -conftest.c:10:28: error: ac_nonexistent.h: No such file or directory -configure:6955: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "poppler" -| #define PACKAGE_TARNAME "poppler" -| #define PACKAGE_VERSION "0.11.3" -| #define PACKAGE_STRING "poppler 0.11.3" -| #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=poppler" -| #define PACKAGE "poppler" -| #define VERSION "0.11.3" -| /* end confdefs.h. */ -| #include -configure:6988: result: cc -E -configure:7017: cc -E conftest.c -configure:7024: $? = 0 -configure:7055: cc -E conftest.c -conftest.c:10:28: error: ac_nonexistent.h: No such file or directory -configure:7062: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| #define PACKAGE_NAME "poppler" -| #define PACKAGE_TARNAME "poppler" -| #define PACKAGE_VERSION "0.11.3" -| #define PACKAGE_STRING "poppler 0.11.3" -| #define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=poppler" -| #define PACKAGE "poppler" -| #define VERSION "0.11.3" -| /* end confdefs.h. */ -| #include -configure:7102: checking for ANSI C header files -configure:7132: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7139: $? = 0 -configure:7238: cc -o conftest -g -O2 -g -Wall -O2 -Wl,-Bsymbolic-functions conftest.c >&5 -configure:7242: $? = 0 -configure:7248: ./conftest -configure:7252: $? = 0 -configure:7270: result: yes -configure:7294: checking for sys/types.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for sys/stat.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for stdlib.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for string.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for memory.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for strings.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for inttypes.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for stdint.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7294: checking for unistd.h -configure:7315: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7322: $? = 0 -configure:7339: result: yes -configure:7357: checking for dlfcn.h -configure:7378: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:7385: $? = 0 -configure:7402: result: yes -configure:7586: checking for objdir -configure:7601: result: .libs -configure:7897: checking if cc supports -fno-rtti -fno-exceptions -configure:7915: cc -c -g -O2 -g -Wall -O2 -fno-rtti -fno-exceptions conftest.c >&5 -cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C -configure:7919: $? = 0 -configure:7932: result: no -configure:7952: checking for cc option to produce PIC -configure:8224: result: -fPIC -DPIC -configure:8236: checking if cc PIC flag -fPIC -DPIC works -configure:8254: cc -c -g -O2 -g -Wall -O2 -fPIC -DPIC -DPIC conftest.c >&5 -configure:8258: $? = 0 -configure:8271: result: yes -configure:8295: checking if cc static flag -static works -configure:8323: result: yes -configure:8338: checking if cc supports -c -o file.o -configure:8359: cc -c -g -O2 -g -Wall -O2 -o out/conftest2.o conftest.c >&5 -configure:8363: $? = 0 -configure:8385: result: yes -configure:8393: checking if cc supports -c -o file.o -configure:8440: result: yes -configure:8473: checking whether the cc linker (/usr/bin/ld) supports shared libraries -configure:9548: result: yes -configure:9585: checking whether -lc should be explicitly linked in -configure:9590: cc -c -g -O2 -g -Wall -O2 conftest.c >&5 -configure:9593: $? = 0 -configure:9608: cc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep -lc \>/dev/null 2\>\&1 -configure:9611: $? = 0 -configure:9623: result: no -configure:9787: checking dynamic linker characteristics -configure:10230: cc -o conftest -g -O2 -g -Wall -O2 -Wl,-Bsymbolic-functions -Wl,-rpath -Wl,/foo conftest.c >&5 -configure:10237: $? = 0 -configure:10482: result: GNU/Linux ld.so -configure:10584: checking how to hardcode library paths into programs -configure:10609: result: immediate -configure:11442: checking whether stripping libraries is possible -configure:11447: result: yes -configure:11482: checking if libtool supports shared libraries -configure:11484: result: yes -configure:11487: checking whether to build shared libraries -configure:11508: result: yes -configure:11511: checking whether to build static libraries -configure:11515: result: yes -configure:11599: checking for gcc -configure:11626: result: cc -configure:11858: checking for C compiler version -configure:11866: cc --version >&5 -cc (Ubuntu 4.4.1-3ubuntu3) 4.4.1 -Copyright (C) 2009 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:11870: $? = 0 -configure:11877: cc -v >&5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-3ubuntu3' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu -Thread model: posix -gcc version 4.4.1 (Ubuntu 4.4.1-3ubuntu3) -configure:11881: $? = 0 -configure:11888: cc -V >&5 -cc: '-V' option must have argument -configure:11892: $? = 1 -configure:11895: checking whether we are using the GNU C compiler -configure:11948: result: yes -configure:11957: checking whether cc accepts -g -configure:12095: result: yes -configure:12112: checking for cc option to accept ISO C89 -configure:12216: result: none needed -configure:12236: checking dependency style of cc -configure:12327: result: none -configure:12454: checking for C++ compiler version -configure:12462: g++ --version >&5 -g++ (Ubuntu 4.4.1-3ubuntu3) 4.4.1 -Copyright (C) 2009 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:12466: $? = 0 -configure:12473: g++ -v >&5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-3ubuntu3' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu -Thread model: posix -gcc version 4.4.1 (Ubuntu 4.4.1-3ubuntu3) -configure:12477: $? = 0 -configure:12484: g++ -V >&5 -g++: '-V' option must have argument -configure:12488: $? = 1 -configure:12491: checking whether we are using the GNU C++ compiler -configure:12520: g++ -c -g -O2 -g -Wall -O2 conftest.cpp >&5 -configure:12527: $? = 0 -configure:12544: result: yes -configure:12553: checking whether g++ accepts -g -configure:12583: g++ -c -g conftest.cpp >&5 -configure:12590: $? = 0 -configure:12691: result: yes -configure:12716: checking dependency style of g++ -configure:12807: result: none -configure:12935: checking for C++ compiler version -configure:12943: g++ --version >&5 -g++ (Ubuntu 4.4.1-3ubuntu3) 4.4.1 -Copyright (C) 2009 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:12947: $? = 0 -configure:12954: g++ -v >&5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-3ubuntu3' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu -Thread model: posix -gcc version 4.4.1 (Ubuntu 4.4.1-3ubuntu3) -configure:12958: $? = 0 -configure:12965: g++ -V >&5 -g++: '-V' option must have argument -configure:12969: $? = 1 -configure:12972: checking whether we are using the GNU C++ compiler -configure:13025: result: yes -configure:13034: checking whether g++ accepts -g -configure:13172: result: yes -configure:13197: checking dependency style of g++ -configure:13288: result: none -configure:13311: checking how to run the C++ preprocessor -configure:13347: g++ -E conftest.cpp - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=i486-pc-linux-gnu -ac_cv_c_compiler_gnu=yes -ac_cv_cxx_compiler_gnu=yes -ac_cv_env_ABIWORD_CFLAGS_set= -ac_cv_env_ABIWORD_CFLAGS_value= -ac_cv_env_ABIWORD_LIBS_set= -ac_cv_env_ABIWORD_LIBS_value= -ac_cv_env_CAIRO_CFLAGS_set= -ac_cv_env_CAIRO_CFLAGS_value= -ac_cv_env_CAIRO_LIBS_set= -ac_cv_env_CAIRO_LIBS_value= -ac_cv_env_CCC_set= -ac_cv_env_CCC_value= -ac_cv_env_CC_set=set -ac_cv_env_CC_value=cc -ac_cv_env_CFLAGS_set=set -ac_cv_env_CFLAGS_value='-g -O2 -g -Wall -O2' -ac_cv_env_CPPFLAGS_set=set -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CPP_set= -ac_cv_env_CPP_value= -ac_cv_env_CXXCPP_set= -ac_cv_env_CXXCPP_value= -ac_cv_env_CXXFLAGS_set=set -ac_cv_env_CXXFLAGS_value='-g -O2 -g -Wall -O2' -ac_cv_env_CXX_set=set -ac_cv_env_CXX_value=g++ -ac_cv_env_FONTCONFIG_CFLAGS_set= -ac_cv_env_FONTCONFIG_CFLAGS_value= -ac_cv_env_FONTCONFIG_LIBS_set= -ac_cv_env_FONTCONFIG_LIBS_value= -ac_cv_env_FREETYPE_CFLAGS_set= -ac_cv_env_FREETYPE_CFLAGS_value= -ac_cv_env_FREETYPE_LIBS_set= -ac_cv_env_FREETYPE_LIBS_value= -ac_cv_env_GDK_CFLAGS_set= -ac_cv_env_GDK_CFLAGS_value= -ac_cv_env_GDK_LIBS_set= -ac_cv_env_GDK_LIBS_value= -ac_cv_env_GTK_TEST_CFLAGS_set= -ac_cv_env_GTK_TEST_CFLAGS_value= -ac_cv_env_GTK_TEST_LIBS_set= -ac_cv_env_GTK_TEST_LIBS_value= -ac_cv_env_LCMS_CFLAGS_set= -ac_cv_env_LCMS_CFLAGS_value= -ac_cv_env_LCMS_LIBS_set= -ac_cv_env_LCMS_LIBS_value= -ac_cv_env_LDFLAGS_set=set -ac_cv_env_LDFLAGS_value=-Wl,-Bsymbolic-functions -ac_cv_env_LIBS_set= -ac_cv_env_LIBS_value= -ac_cv_env_PKG_CONFIG_set= -ac_cv_env_PKG_CONFIG_value= -ac_cv_env_POPPLER_GLIB_CFLAGS_set= -ac_cv_env_POPPLER_GLIB_CFLAGS_value= -ac_cv_env_POPPLER_GLIB_LIBS_set= -ac_cv_env_POPPLER_GLIB_LIBS_value= -ac_cv_env_POPPLER_QT4_CFLAGS_set= -ac_cv_env_POPPLER_QT4_CFLAGS_value= -ac_cv_env_POPPLER_QT4_LIBS_set= -ac_cv_env_POPPLER_QT4_LIBS_value= -ac_cv_env_POPPLER_QT4_TEST_CFLAGS_set= -ac_cv_env_POPPLER_QT4_TEST_CFLAGS_value= -ac_cv_env_POPPLER_QT4_TEST_LIBS_set= -ac_cv_env_POPPLER_QT4_TEST_LIBS_value= -ac_cv_env_XMKMF_set= -ac_cv_env_XMKMF_value= -ac_cv_env_build_alias_set=set -ac_cv_env_build_alias_value=i486-linux-gnu -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_header_dlfcn_h=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_memory_h=yes -ac_cv_header_stdc=yes -ac_cv_header_stdint_h=yes -ac_cv_header_stdlib_h=yes -ac_cv_header_string_h=yes -ac_cv_header_strings_h=yes -ac_cv_header_sys_stat_h=yes -ac_cv_header_sys_types_h=yes -ac_cv_header_unistd_h=yes -ac_cv_host=i486-pc-linux-gnu -ac_cv_objext=o -ac_cv_path_EGREP='/bin/grep -E' -ac_cv_path_FGREP='/bin/grep -F' -ac_cv_path_GREP=/bin/grep -ac_cv_path_SED=/bin/sed -ac_cv_path_install='/usr/bin/install -c' -ac_cv_path_mkdir=/bin/mkdir -ac_cv_prog_AWK=gawk -ac_cv_prog_CPP='cc -E' -ac_cv_prog_ac_ct_AR=ar -ac_cv_prog_ac_ct_CC=cc -ac_cv_prog_ac_ct_OBJDUMP=objdump -ac_cv_prog_ac_ct_RANLIB=ranlib -ac_cv_prog_ac_ct_STRIP=strip -ac_cv_prog_cc_c89= -ac_cv_prog_cc_g=yes -ac_cv_prog_cxx_g=yes -ac_cv_prog_make_make_set=yes -am_cv_CC_dependencies_compiler_type=none -am_cv_CXX_dependencies_compiler_type=none -lt_cv_deplibs_check_method=pass_all -lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_ld_reload_flag=-r -lt_cv_nm_interface='BSD nm' -lt_cv_objdir=.libs -lt_cv_path_LD=/usr/bin/ld -lt_cv_path_NM='/usr/bin/nm -B' -lt_cv_prog_compiler_c_o=yes -lt_cv_prog_compiler_pic_works=yes -lt_cv_prog_compiler_rtti_exceptions=no -lt_cv_prog_compiler_static_works=yes -lt_cv_prog_gnu_ld=yes -lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\''' -lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"\2", (void *) \&\2},/p'\''' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/ {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/ {"lib\2", (void *) \&\2},/p'\''' -lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\''' -lt_cv_sys_max_cmd_len=805306365 - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -ABIWORD_CFLAGS='' -ABIWORD_LIBS='' -ACLOCAL='${SHELL} /home/seb128/boulot/package/poppler/poppler-0.11.3/missing --run aclocal-1.10' -AMDEPBACKSLASH='' -AMDEP_FALSE='' -AMDEP_TRUE='#' -AMTAR='${SHELL} /home/seb128/boulot/package/poppler/poppler-0.11.3/missing --run tar' -AR='ar' -AS='as' -AUTOCONF='${SHELL} /home/seb128/boulot/package/poppler/poppler-0.11.3/missing --run autoconf' -AUTOHEADER='${SHELL} /home/seb128/boulot/package/poppler/poppler-0.11.3/missing --run autoheader' -AUTOMAKE='${SHELL} /home/seb128/boulot/package/poppler/poppler-0.11.3/missing --run automake-1.10' -AWK='gawk' -BUILD_ABIWORD_OUTPUT_FALSE='' -BUILD_ABIWORD_OUTPUT_TRUE='' -BUILD_CAIRO_OUTPUT_FALSE='' -BUILD_CAIRO_OUTPUT_TRUE='' -BUILD_GTK_TEST_FALSE='' -BUILD_GTK_TEST_TRUE='' -BUILD_LIBJPEG_FALSE='' -BUILD_LIBJPEG_TRUE='' -BUILD_LIBOPENJPEG_FALSE='' -BUILD_LIBOPENJPEG_TRUE='' -BUILD_LIBPNG_FALSE='' -BUILD_LIBPNG_TRUE='' -BUILD_POPPLER_GLIB_FALSE='' -BUILD_POPPLER_GLIB_TRUE='' -BUILD_POPPLER_QT4_FALSE='' -BUILD_POPPLER_QT4_TRUE='' -BUILD_POPPLER_QT_FALSE='' -BUILD_POPPLER_QT_TRUE='' -BUILD_SPLASH_OUTPUT_FALSE='' -BUILD_SPLASH_OUTPUT_TRUE='' -BUILD_UTILS_FALSE='' -BUILD_UTILS_TRUE='' -BUILD_WITH_GDK_FALSE='' -BUILD_WITH_GDK_TRUE='' -BUILD_ZLIB_FALSE='' -BUILD_ZLIB_TRUE='' -CAIRO_CFLAGS='' -CAIRO_FEATURE='' -CAIRO_LIBS='' -CAIRO_REQ='' -CAIRO_VERSION='' -CC='cc' -CCDEPMODE='depmode=none' -CFLAGS='-g -O2 -g -Wall -O2' -CPP='cc -E' -CPPFLAGS='' -CXX='g++' -CXXCPP='g++ -E' -CXXDEPMODE='depmode=none' -CXXFLAGS='-g -O2 -g -Wall -O2' -CYGPATH_W='echo' -DEFS='' -DEPDIR='.deps' -DLLTOOL='dlltool' -DSYMUTIL='' -DUMPBIN='' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='/bin/grep -E' -ENABLE_GTK_DOC_FALSE='' -ENABLE_GTK_DOC_TRUE='' -ENABLE_XPDF_HEADERS_FALSE='' -ENABLE_XPDF_HEADERS_TRUE='' -EXEEXT='' -FGREP='/bin/grep -F' -FONTCONFIG_CFLAGS='' -FONTCONFIG_LIBS='' -FREETYPE_CFLAGS='' -FREETYPE_CONFIG='' -FREETYPE_LIBS='' -GDK_CFLAGS='' -GDK_FEATURE='' -GDK_LIBS='' -GLIB_MKENUMS='' -GREP='/bin/grep' -GTKDOC_CHECK='' -GTKDOC_MKPDF='' -GTKDOC_REBASE='' -GTK_DOC_BUILD_HTML_FALSE='' -GTK_DOC_BUILD_HTML_TRUE='' -GTK_DOC_BUILD_PDF_FALSE='' -GTK_DOC_BUILD_PDF_TRUE='' -GTK_DOC_USE_LIBTOOL_FALSE='' -GTK_DOC_USE_LIBTOOL_TRUE='' -GTK_DOC_USE_REBASE_FALSE='' -GTK_DOC_USE_REBASE_TRUE='' -GTK_TEST_CFLAGS='' -GTK_TEST_LIBS='' -HTML_DIR='' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' -LCMS_CFLAGS='' -LCMS_LIBS='' -LD='/usr/bin/ld' -LDFLAGS='-Wl,-Bsymbolic-functions' -LIBJPEG_LIBS='' -LIBOBJS='' -LIBOPENJPEG_LIBS='' -LIBPNG_LIBS='' -LIBS='' -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -LIPO='' -LN_S='ln -s' -LTLIBOBJS='' -MAKEINFO='${SHELL} /home/seb128/boulot/package/poppler/poppler-0.11.3/missing --run makeinfo' -MKDIR_P='/bin/mkdir -p' -MOCQT4='' -NM='/usr/bin/nm -B' -NMEDIT='' -OBJDUMP='objdump' -OBJEXT='o' -OTOOL64='' -OTOOL='' -PACKAGE='poppler' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' -PACKAGE_NAME='poppler' -PACKAGE_STRING='poppler 0.11.3' -PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.11.3' -PATH_SEPARATOR=':' -PC_REQUIRES='' -PC_REQUIRES_PRIVATE='' -PKG_CONFIG='' -POPPLER_DATADIR='' -POPPLER_GLIB_CFLAGS='' -POPPLER_GLIB_DISABLE_DEPRECATED='' -POPPLER_GLIB_DISABLE_SINGLE_INCLUDES='' -POPPLER_GLIB_LIBS='' -POPPLER_MAJOR_VERSION='' -POPPLER_MICRO_VERSION='' -POPPLER_MINOR_VERSION='' -POPPLER_QT4_CFLAGS='' -POPPLER_QT4_CXXFLAGS='' -POPPLER_QT4_LIBS='' -POPPLER_QT4_TEST_CFLAGS='' -POPPLER_QT4_TEST_LIBS='' -POPPLER_QT_CXXFLAGS='' -POPPLER_QT_LIBS='' -PTHREAD_CC='' -PTHREAD_CFLAGS='' -PTHREAD_LIBS='' -RANLIB='ranlib' -SED='/bin/sed' -SET_MAKE='' -SHELL='/bin/bash' -STRIP='strip' -USE_CMS_FALSE='' -USE_CMS_TRUE='' -VERSION='0.11.3' -XMKMF='' -X_CFLAGS='' -X_EXTRA_LIBS='' -X_LIBS='' -X_PRE_LIBS='' -ZLIB_LIBS='' -ac_ct_CC='cc' -ac_ct_CXX='' -ac_ct_DUMPBIN='' -acx_pthread_config='' -am__fastdepCC_FALSE='' -am__fastdepCC_TRUE='#' -am__fastdepCXX_FALSE='' -am__fastdepCXX_TRUE='#' -am__include='include' -am__isrc='' -am__leading_dot='.' -am__quote='' -am__tar='${AMTAR} chof - "$$tardir"' -am__untar='${AMTAR} xf -' -auto_import_flags='' -bindir='${exec_prefix}/bin' -build='i486-pc-linux-gnu' -build_alias='i486-linux-gnu' -build_cpu='i486' -build_os='linux-gnu' -build_vendor='pc' -create_shared_lib='' -datadir='${datarootdir}' -datarootdir='${prefix}/share' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -dvidir='${docdir}' -exec_prefix='NONE' -host='i486-pc-linux-gnu' -host_alias='' -host_cpu='i486' -host_os='linux-gnu' -host_vendor='pc' -htmldir='${docdir}' -includedir='${prefix}/include' -infodir='${prefix}/share/info' -install_sh='$(SHELL) /home/seb128/boulot/package/poppler/poppler-0.11.3/install-sh' -libdir='${exec_prefix}/lib' -libexecdir='${prefix}/lib/poppler' -localedir='${datarootdir}/locale' -localstatedir='/var' -lt_ECHO='echo' -mandir='${prefix}/share/man' -mkdir_p='/bin/mkdir -p' -oldincludedir='/usr/include' -pdfdir='${docdir}' -prefix='/usr' -program_transform_name='s,x,x,' -psdir='${docdir}' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='/etc/xpdf' -target_alias='' -win32_libs='' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -#define PACKAGE_NAME "poppler" -#define PACKAGE_TARNAME "poppler" -#define PACKAGE_VERSION "0.11.3" -#define PACKAGE_STRING "poppler 0.11.3" -#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=poppler" -#define PACKAGE "poppler" -#define VERSION "0.11.3" -#define STDC_HEADERS 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_DLFCN_H 1 -#define LT_OBJDIR ".libs/" - -configure: caught signal 2 -configure: exit 1 diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/configure /tmp/9MerXF9qtu/poppler-0.12.0/configure --- poppler-0.11.3/configure 2009-08-18 20:04:23.000000000 +0100 +++ poppler-0.12.0/configure 2009-09-09 18:22:36.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for poppler 0.11.3. +# Generated by GNU Autoconf 2.63 for poppler 0.12.0. # # Report bugs to . # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='poppler' PACKAGE_TARNAME='poppler' -PACKAGE_VERSION='0.11.3' -PACKAGE_STRING='poppler 0.11.3' +PACKAGE_VERSION='0.12.0' +PACKAGE_STRING='poppler 0.12.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler' # Factoring default headers for most tests. @@ -1621,7 +1621,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.11.3 to adapt to many kinds of systems. +\`configure' configures poppler 0.12.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1695,7 +1695,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poppler 0.11.3:";; + short | recursive ) echo "Configuration of poppler 0.12.0:";; esac cat <<\_ACEOF @@ -1861,7 +1861,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poppler configure 0.11.3 +poppler configure 0.12.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1875,7 +1875,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.11.3, which was +It was created by poppler $as_me 0.12.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2592,7 +2592,7 @@ # Define the identity of the package. PACKAGE='poppler' - VERSION='0.11.3' + VERSION='0.12.0' cat >>confdefs.h <<_ACEOF @@ -2734,6 +2734,7 @@ + ac_config_headers="$ac_config_headers config.h" ac_config_headers="$ac_config_headers poppler/poppler-config.h" @@ -4848,13 +4849,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4851: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4852: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4854: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4855: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4857: output\"" >&5) + (eval echo "\"\$as_me:4858: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6057,7 +6058,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6060 "configure"' > conftest.$ac_ext + echo '#line 6061 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7912,11 +7913,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7915: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7916: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7919: \$? = $ac_status" >&5 + echo "$as_me:7920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8251,11 +8252,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8254: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8255: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8258: \$? = $ac_status" >&5 + echo "$as_me:8259: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8356,11 +8357,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8359: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8360: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8363: \$? = $ac_status" >&5 + echo "$as_me:8364: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8411,11 +8412,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8414: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8415: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8418: \$? = $ac_status" >&5 + echo "$as_me:8419: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11224,7 +11225,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11227 "configure" +#line 11228 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11320,7 +11321,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11323 "configure" +#line 11324 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15350,11 +15351,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15353: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15354: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15357: \$? = $ac_status" >&5 + echo "$as_me:15358: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15449,11 +15450,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15452: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15453: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15456: \$? = $ac_status" >&5 + echo "$as_me:15457: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15501,11 +15502,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15504: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15505: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15508: \$? = $ac_status" >&5 + echo "$as_me:15509: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22788,7 +22789,7 @@ do for j in png.h; do - echo "configure: 22791: $i/$j" >&5 + echo "configure: 22792: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 png_incdir=$i @@ -25981,9 +25982,9 @@ POPPLER_MAJOR_VERSION=0 -POPPLER_MINOR_VERSION=11 +POPPLER_MINOR_VERSION=12 -POPPLER_MICRO_VERSION=3 +POPPLER_MICRO_VERSION=0 ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/demo/Makefile test/Makefile qt/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile poppler.pc poppler-cairo.pc poppler-splash.pc poppler-glib.pc poppler-qt.pc poppler-qt4.pc" @@ -26589,7 +26590,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.11.3, which was +This file was extended by poppler $as_me 0.12.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26652,7 +26653,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -poppler config.status 0.11.3 +poppler config.status 0.12.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/configure.ac /tmp/9MerXF9qtu/poppler-0.12.0/configure.ac --- poppler-0.11.3/configure.ac 2009-08-18 20:04:10.000000000 +0100 +++ poppler-0.12.0/configure.ac 2009-09-09 18:00:00.000000000 +0100 @@ -1,12 +1,13 @@ m4_define([poppler_version_major],[0]) -m4_define([poppler_version_minor],[11]) -m4_define([poppler_version_micro],[3]) +m4_define([poppler_version_minor],[12]) +m4_define([poppler_version_micro],[0]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=poppler]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])]) AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(poppler/poppler-config.h) diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/debian/changelog /tmp/9MerXF9qtu/poppler-0.12.0/debian/changelog --- poppler-0.11.3/debian/changelog 2009-09-10 02:24:09.000000000 +0100 +++ poppler-0.12.0/debian/changelog 2009-09-10 02:24:09.000000000 +0100 @@ -1,8 +1,27 @@ -poppler (0.11.3-0ubuntu2~ppa1) karmic; urgency=low +poppler (0.12.0-0ubuntu3~ppa1) karmic; urgency=low * Add poppler-glib-0.11.2-hinting.patch. - -- Tobias Wolf Mon, 31 Aug 2009 16:20:03 +0200 + -- Tobias Wolf Thu, 10 Sep 2009 03:14:51 +0200 + +poppler (0.12.0-0ubuntu1) karmic; urgency=low + + * New upstream version: + core: + - Fix printf format security warnings + - Improve rendering of radial shadings. Bug #20238 + - Better fallback when there's a font type mismatch. Bug #17252 + - Do not crash on attachments without data stream. Bug #10386 + - Fix infinite loop in JBIG2Decoder. Bug #23025 + build system: + - Minimizes pkg-config dependencies for Qt frontends + - Add automake 1.11 support + - Use the newest automake found and not the oldest + - Support AM_SILENT_RULES when using automake 1.11 + utils: + - Add common options to pdftoabw + + -- Sebastien Bacher Wed, 09 Sep 2009 22:59:03 +0200 poppler (0.11.3-0ubuntu1) karmic; urgency=low diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/Makefile.am /tmp/9MerXF9qtu/poppler-0.12.0/glib/Makefile.am --- poppler-0.11.3/glib/Makefile.am 2009-07-12 18:09:18.000000000 +0100 +++ poppler-0.12.0/glib/Makefile.am 2009-09-02 19:48:16.000000000 +0100 @@ -29,13 +29,13 @@ @true stamp-poppler-enums.h: poppler-enums.h.template $(poppler_glib_public_headers) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ + $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ && (cmp -s xgen-etbh poppler-enums.h || cp xgen-etbh poppler-enums.h ) \ && rm -f xgen-etbh \ && echo timestamp > $(@F) poppler-enums.c: poppler-enums.c.template $(poppler_glib_public_headers) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ + $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ && (cmp -s xgen-etbc poppler-enums.c || cp xgen-etbc poppler-enums.c ) \ && rm -f xgen-etbc diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/Makefile.in /tmp/9MerXF9qtu/poppler-0.12.0/glib/Makefile.in --- poppler-0.11.3/glib/Makefile.in 2009-08-18 20:04:21.000000000 +0100 +++ poppler-0.12.0/glib/Makefile.in 2009-09-09 18:22:36.000000000 +0100 @@ -844,13 +844,13 @@ @true stamp-poppler-enums.h: poppler-enums.h.template $(poppler_glib_public_headers) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ + $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ && (cmp -s xgen-etbh poppler-enums.h || cp xgen-etbh poppler-enums.h ) \ && rm -f xgen-etbh \ && echo timestamp > $(@F) poppler-enums.c: poppler-enums.c.template $(poppler_glib_public_headers) - $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ + $(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ && (cmp -s xgen-etbc poppler-enums.c || cp xgen-etbc poppler-enums.c ) \ && rm -f xgen-etbc # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/poppler-document.cc /tmp/9MerXF9qtu/poppler-0.12.0/glib/poppler-document.cc --- poppler-0.11.3/glib/poppler-document.cc 2009-08-18 19:41:57.000000000 +0100 +++ poppler-0.12.0/glib/poppler-document.cc 2009-09-09 00:21:48.000000000 +0100 @@ -468,6 +468,10 @@ EmbFile *emb_file; emb_file = catalog->embeddedFile (i); + if (!emb_file->isOk ()) { + delete emb_file; + continue; + } attachment = _poppler_attachment_new (document, emb_file); delete emb_file; diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/poppler-features.h /tmp/9MerXF9qtu/poppler-0.12.0/glib/poppler-features.h --- poppler-0.11.3/glib/poppler-features.h 2009-08-18 20:04:38.000000000 +0100 +++ poppler-0.12.0/glib/poppler-features.h 2009-09-09 18:22:50.000000000 +0100 @@ -23,8 +23,8 @@ #define POPPLER_WITH_GDK 1 #define POPPLER_MAJOR_VERSION (0) -#define POPPLER_MINOR_VERSION (11) -#define POPPLER_MICRO_VERSION (3) +#define POPPLER_MINOR_VERSION (12) +#define POPPLER_MICRO_VERSION (0) #define POPPLER_CHECK_VERSION(major,minor,micro) \ (POPPLER_MAJOR_VERSION > (major) || \ diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/html/ch01.html /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/html/ch01.html --- poppler-0.11.3/glib/reference/html/ch01.html 2009-08-18 20:04:45.000000000 +0100 +++ poppler-0.12.0/glib/reference/html/ch01.html 2009-09-09 18:25:35.000000000 +0100 @@ -22,7 +22,7 @@

-Poppler

+Poppler
poppler diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/html/poppler-poppler-features.html /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/html/poppler-poppler-features.html --- poppler-0.11.3/glib/reference/html/poppler-poppler-features.html 2009-08-18 20:04:45.000000000 +0100 +++ poppler-0.12.0/glib/reference/html/poppler-poppler-features.html 2009-09-09 18:25:35.000000000 +0100 @@ -87,7 +87,7 @@

POPPLER_MINOR_VERSION

-
#define POPPLER_MINOR_VERSION (11)
+
#define POPPLER_MINOR_VERSION (12)
 

 

 

@@ -97,7 +97,7 @@
 

 

 
POPPLER_MICRO_VERSION

-
#define POPPLER_MICRO_VERSION (333)
+
#define POPPLER_MICRO_VERSION (0)
 

 

 The micro version number of the poppler header files (e.g. in poppler version
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/tmpl/poppler-action.sgml /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/tmpl/poppler-action.sgml
--- poppler-0.11.3/glib/reference/tmpl/poppler-action.sgml	2009-08-18 20:04:45.000000000 +0100
+++ poppler-0.12.0/glib/reference/tmpl/poppler-action.sgml	2009-09-09 18:25:35.000000000 +0100
@@ -109,6 +109,11 @@
 
 @type: 
 @title: 
+@operation: 
+@has_annotation_ref: 
+@has_annotation_title: 
+@annotation_title: 
+@annotation_id: 
 
 
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/tmpl/poppler-annot.sgml /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/tmpl/poppler-annot.sgml
--- poppler-0.11.3/glib/reference/tmpl/poppler-annot.sgml	2009-08-18 20:04:45.000000000 +0100
+++ poppler-0.12.0/glib/reference/tmpl/poppler-annot.sgml	2009-09-09 18:25:35.000000000 +0100
@@ -142,6 +142,15 @@
 @Returns: 
 
 
+
+
+
+
+
+@poppler_annot: 
+@Returns: 
+
+
 
 
 
@@ -280,6 +289,32 @@
 @Returns: 
 
 
+
+
+
+
+
+@poppler_annot: 
+@Returns: 
+
+
+
+
+
+
+
+@poppler_annot: 
+@Returns: 
+
+
+
+
+
+
+
+@Returns: 
+
+
 
 
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/tmpl/poppler-attachment.sgml.sgml /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/tmpl/poppler-attachment.sgml.sgml
--- poppler-0.11.3/glib/reference/tmpl/poppler-attachment.sgml.sgml	2009-08-18 20:04:45.000000000 +0100
+++ poppler-0.12.0/glib/reference/tmpl/poppler-attachment.sgml.sgml	1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-
-poppler-attachment.sgml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@attachment: 
-@filename: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@attachment: 
-@save_func: 
-@user_data: 
-@error: 
-@Returns: 
-
-
-
-
-Specifies the type of the function passed to
-poppler_attachment_save_to_callback().  It is called once for each block of
-bytes that is "written" by poppler_attachment_save_to_callback().  If
-successful it should return %TRUE.  If an error occurs it should set
-@error and return %FALSE, in which case poppler_attachment_save_to_callback()
-will fail with the same error.
-
-
-@buf: buffer containing bytes to be written.
-@count: number of bytes in @buf.
-@data: A location to return an error.
-@error: user data passed to poppler_attachment_save_to_callback()
-@Returns: %TRUE if successful, %FALSE (with @error set) if failed.
-
-
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/tmpl/poppler-private.sgml /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/tmpl/poppler-private.sgml
--- poppler-0.11.3/glib/reference/tmpl/poppler-private.sgml	2009-08-18 20:04:45.000000000 +0100
+++ poppler-0.12.0/glib/reference/tmpl/poppler-private.sgml	2009-09-09 18:25:35.000000000 +0100
@@ -43,16 +43,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/tmpl/poppler.sgml /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/tmpl/poppler.sgml
--- poppler-0.11.3/glib/reference/tmpl/poppler.sgml	2009-08-18 20:04:45.000000000 +0100
+++ poppler-0.12.0/glib/reference/tmpl/poppler.sgml	2009-09-09 18:25:35.000000000 +0100
@@ -79,16 +79,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/glib/reference/tmpl/poppler-unused.sgml /tmp/9MerXF9qtu/poppler-0.12.0/glib/reference/tmpl/poppler-unused.sgml
--- poppler-0.11.3/glib/reference/tmpl/poppler-unused.sgml	2009-08-18 20:04:45.000000000 +0100
+++ poppler-0.12.0/glib/reference/tmpl/poppler-unused.sgml	2009-09-09 18:25:35.000000000 +0100
@@ -1,31 +0,0 @@
-
-
-
-
-
-@poppler_annot: 
-@Returns: 
-
-
-
-
-
-
-@poppler_annot: 
-@Returns: 
-
-
-
-
-
-
-@poppler_annot: 
-@Returns: 
-
-
-
-
-
-
-@Returns: 
-
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/Makefile.am /tmp/9MerXF9qtu/poppler-0.12.0/Makefile.am
--- poppler-0.11.3/Makefile.am	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/Makefile.am	2009-09-02 19:48:16.000000000 +0100
@@ -89,4 +89,4 @@
 dist-hook: ChangeLog
 
 ChangeLog : .git/HEAD
-	git log --stat > ChangeLog
+	$(AM_V_GEN) git log --stat > ChangeLog
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/Makefile.in /tmp/9MerXF9qtu/poppler-0.12.0/Makefile.in
--- poppler-0.11.3/Makefile.in	2009-08-18 20:04:22.000000000 +0100
+++ poppler-0.12.0/Makefile.in	2009-09-09 18:22:38.000000000 +0100
@@ -800,7 +800,7 @@
 dist-hook: ChangeLog
 
 ChangeLog : .git/HEAD
-	git log --stat > ChangeLog
+	$(AM_V_GEN) git log --stat > ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/NEWS /tmp/9MerXF9qtu/poppler-0.12.0/NEWS
--- poppler-0.11.3/NEWS	2009-08-18 19:54:40.000000000 +0100
+++ poppler-0.12.0/NEWS	2009-09-09 17:56:36.000000000 +0100
@@ -1,3 +1,21 @@
+Release 0.12.0
+
+	core:
+	 * Fix printf format security warnings
+	 * Improve rendering of radial shadings. Bug #20238
+	 * Better fallback when there's a font type mismatch. Bug #17252
+	 * Do not crash on attachments without data stream. Bug #10386
+	 * Fix infinite loop in JBIG2Decoder. Bug #23025
+	
+	build system:
+	 * Minimizes pkg-config dependencies for Qt frontends
+	 * Add automake 1.11 support
+	 * Use the newest automake found and not the oldest
+	 * Support AM_SILENT_RULES when using automake 1.11
+	
+	utils:
+	 * Add common options to pdftoabw
+
 Release 0.11.3 (0.12 RC 1)
 
 	core:
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler/Catalog.h /tmp/9MerXF9qtu/poppler-0.12.0/poppler/Catalog.h
--- poppler-0.11.3/poppler/Catalog.h	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/poppler/Catalog.h	2009-09-05 14:19:20.000000000 +0100
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg 
-// Copyright (C) 2005, 2007 Albert Astals Cid 
+// Copyright (C) 2005, 2007, 2009 Albert Astals Cid 
 // Copyright (C) 2005 Jonathan Blandford 
 // Copyright (C) 2005, 2006, 2008 Brad Hards 
 // Copyright (C) 2007 Julien Rebetez 
@@ -117,6 +117,7 @@
   GooString *checksum() { return m_checksum; }
   GooString *mimeType() { return m_mimetype; }
   Object &streamObject() { return m_objStr; }
+  bool isOk() { return m_objStr.isStream(); }
 
 private:
   GooString *m_name;
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler/Gfx.cc /tmp/9MerXF9qtu/poppler-0.12.0/poppler/Gfx.cc
--- poppler-0.11.3/poppler/Gfx.cc	2009-08-16 19:51:12.000000000 +0100
+++ poppler-0.12.0/poppler/Gfx.cc	2009-09-02 22:10:28.000000000 +0100
@@ -293,6 +293,15 @@
 
 #define numOps (sizeof(opTab) / sizeof(Operator))
 
+static inline GBool isSameGfxColor(const GfxColor &colorA, const GfxColor &colorB, uint nComps, double delta) {
+  for (uint k = 0; k < nComps; ++k) {
+    if (abs(colorA.c[k] - colorB.c[k]) > delta) {
+      return false;
+    }
+  }
+  return true;
+}
+
 //------------------------------------------------------------------------
 // GfxResources
 //------------------------------------------------------------------------
@@ -2512,12 +2521,7 @@
 	tt = t0 + (t1 - t0) * ta[j];
       }
       shading->getColor(tt, &color1);
-      for (k = 0; k < nComps; ++k) {
-	if (abs(color1.c[k] - color0.c[k]) > axialColorDelta) {
-	  break;
-	}
-      }
-      if (k == nComps) {
+      if (isSameGfxColor(color1, color0, nComps, axialColorDelta)) {
          // in these two if what we guarantee is that if we are skipping lots of 
          // positions because the colors are the same, we still create a region
          // with vertexs passing by bboxIntersections[1] and bboxIntersections[2]
@@ -2823,13 +2827,23 @@
       shading->getColor(tb, &colorB);
     }
     while (ib - ia > 1) {
-      for (k = 0; k < nComps; ++k) {
-	if (abs(colorB.c[k] - colorA.c[k]) > radialColorDelta) {
-	  break;
+      if (isSameGfxColor(colorB, colorA, nComps, radialColorDelta) && ib < radialMaxSplits) {
+	// The shading is not necessarily lineal so having two points with the
+	// same color does not mean all the areas in between have the same color too
+	// Do another bisection to be a bit more sure we are not doing something wrong
+	GfxColor colorC;
+	int ic = (ia + ib) / 2;
+	double sc = sMin + ((double)ic / (double)radialMaxSplits) * (sMax - sMin);
+	double tc = t0 + sc * (t1 - t0);
+	if (tc < t0) {
+	  shading->getColor(t0, &colorC);
+	} else if (tc > t1) {
+	  shading->getColor(t1, &colorC);
+	} else {
+	  shading->getColor(tc, &colorC);
 	}
-      }
-      if (k == nComps && ib < radialMaxSplits) {
-	break;
+	if (isSameGfxColor(colorC, colorA, nComps, radialColorDelta))
+	  break;
       }
       ib = (ia + ib) / 2;
       sb = sMin + ((double)ib / (double)radialMaxSplits) * (sMax - sMin);
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler/GfxFont.cc /tmp/9MerXF9qtu/poppler-0.12.0/poppler/GfxFont.cc
--- poppler-0.11.3/poppler/GfxFont.cc	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/poppler/GfxFont.cc	2009-09-05 00:12:31.000000000 +0100
@@ -21,6 +21,7 @@
 // Copyright (C) 2008 Ed Avis 
 // Copyright (C) 2008 Hib Eris 
 // Copyright (C) 2009 Peter Kerzum 
+// Copyright (C) 2009 David Benjamin 
 //
 // 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
@@ -272,7 +273,12 @@
       embFontID = obj2.getRef();
       if (type != fontType1) {
 	error(-1, "Mismatch between font type and embedded font file");
-	type = fontType1;
+	if (isCIDFont()) {
+	  error(-1, "CID font has FontFile attribute; assuming CIDType0");
+	  type = fontCIDType0;
+	} else {
+	  type = fontType1;
+	}
       }
     }
     obj2.free();
@@ -281,7 +287,7 @@
       embFontID = obj2.getRef();
       if (type != fontTrueType && type != fontCIDType2) {
 	error(-1, "Mismatch between font type and embedded font file");
-	type = type == fontCIDType0 ? fontCIDType2 : fontTrueType;
+	type = isCIDFont() ? fontCIDType2 : fontTrueType;
       }
     }
     obj2.free();
@@ -293,26 +299,46 @@
 	  embFontID = obj2.getRef();
 	  if (type != fontType1) {
 	    error(-1, "Mismatch between font type and embedded font file");
-	    type = fontType1;
+	    if (isCIDFont()) {
+	      error(-1, "Embedded CID font has type Type1; assuming CIDType0");
+	      type = fontCIDType0;
+	    } else {
+	      type = fontType1;
+	    }
 	  }
 	} else if (obj4.isName("Type1C")) {
 	  embFontID = obj2.getRef();
 	  if (type != fontType1 && type != fontType1C) {
 	    error(-1, "Mismatch between font type and embedded font file");
 	  }
-	  type = fontType1C;
+	  if (isCIDFont()) {
+	    error(-1, "Embedded CID font has type Type1C; assuming CIDType0C");
+	    type = fontCIDType0C;
+	  } else {
+	    type = fontType1C;
+	  }
 	} else if (obj4.isName("TrueType")) {
 	  embFontID = obj2.getRef();
 	  if (type != fontTrueType) {
 	    error(-1, "Mismatch between font type and embedded font file");
-	    type = fontTrueType;
+	    if (isCIDFont()) {
+	      error(-1, "Embedded CID font has type TrueType; assuming CIDType2");
+	      type = fontCIDType2;
+	    } else {
+	      type = fontTrueType;
+	    }
 	  }
 	} else if (obj4.isName("CIDFontType0C")) {
 	  embFontID = obj2.getRef();
 	  if (type != fontCIDType0) {
 	    error(-1, "Mismatch between font type and embedded font file");
 	  }
-	  type = fontCIDType0C;
+	  if (isCIDFont()) {
+	    type = fontCIDType0C;
+	  } else {
+	    error(-1, "Embedded non-CID font has type CIDFontType0c; assuming Type1C");
+	    type = fontType1C;
+	  }
 	} else if (obj4.isName("OpenType")) {
 	  embFontID = obj2.getRef();
 	  if (type == fontTrueType) {
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler/GfxState.cc /tmp/9MerXF9qtu/poppler-0.12.0/poppler/GfxState.cc
--- poppler-0.11.3/poppler/GfxState.cc	2009-07-27 22:25:29.000000000 +0100
+++ poppler-0.12.0/poppler/GfxState.cc	2009-09-02 19:48:16.000000000 +0100
@@ -19,6 +19,7 @@
 // Copyright (C) 2006-2009 Albert Astals Cid 
 // Copyright (C) 2009 Koji Otani 
 // Copyright (C) 2009 Thomas Freitag 
+// Copyright (C) 2009 Christian Persch 
 //
 // 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
@@ -301,7 +302,7 @@
 
 static int CMSError(int ecode, const char *msg)
 {
-    error(-1,const_cast(msg));
+    error(-1, "%s", msg);
     return 1;
 }
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler/JBIG2Stream.cc /tmp/9MerXF9qtu/poppler-0.12.0/poppler/JBIG2Stream.cc
--- poppler-0.11.3/poppler/JBIG2Stream.cc	2009-07-30 21:51:18.000000000 +0100
+++ poppler-0.12.0/poppler/JBIG2Stream.cc	2009-09-09 00:21:49.000000000 +0100
@@ -1587,12 +1587,15 @@
     goto eofError;
   }
 
-  // compute symbol code length
+  // compute symbol code length, per 6.5.8.2.3
+  //  symCodeLen = ceil( log2( numInputSyms + numNewSyms ) )
   symCodeLen = 1;
-  i = (numInputSyms + numNewSyms) >> 1;
-  while (i) {
-    ++symCodeLen;
-    i >>= 1;
+  if (likely(numInputSyms + numNewSyms > 0)) { // don't fail too badly if the sum is 0
+    i = (numInputSyms + numNewSyms - 1) >> 1;
+    while (i) {
+      ++symCodeLen;
+      i >>= 1;
+    }
   }
 
   // get the input symbol bitmaps
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler/JPEG2000Stream.cc /tmp/9MerXF9qtu/poppler-0.12.0/poppler/JPEG2000Stream.cc
--- poppler-0.11.3/poppler/JPEG2000Stream.cc	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/poppler/JPEG2000Stream.cc	2009-09-02 19:48:16.000000000 +0100
@@ -4,7 +4,7 @@
 //
 // A JPX stream decoder using OpenJPEG
 //
-// Copyright 2008 Albert Astals Cid 
+// Copyright 2008, 2009 Albert Astals Cid 
 //
 // Licensed under GPLv2 or later
 //
@@ -86,11 +86,11 @@
 }
 
 static void libopenjpeg_error_callback(const char *msg, void * /*client_data*/) {
-  error(-1, (char*)msg);
+  error(-1, "%s", msg);
 }
 
 static void libopenjpeg_warning_callback(const char *msg, void * /*client_data*/) {
-  error(-1, (char*)msg);
+  error(-1, "%s", msg);
 }
 
 void JPXStream::init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format)
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler-qt4.pc.cmake /tmp/9MerXF9qtu/poppler-0.12.0/poppler-qt4.pc.cmake
--- poppler-0.11.3/poppler-qt4.pc.cmake	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/poppler-qt4.pc.cmake	2009-09-02 19:48:16.000000000 +0100
@@ -6,7 +6,8 @@
 Name: poppler-qt4
 Description: Qt4 bindings for poppler
 Version: @POPPLER_VERSION@
-Requires: poppler = @POPPLER_VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-qt4
 Cflags: -I${includedir}/poppler/qt4
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler-qt4.pc.in /tmp/9MerXF9qtu/poppler-0.12.0/poppler-qt4.pc.in
--- poppler-0.11.3/poppler-qt4.pc.in	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/poppler-qt4.pc.in	2009-09-02 19:48:16.000000000 +0100
@@ -6,7 +6,8 @@
 Name: poppler-qt4
 Description: Qt4 bindings for poppler
 Version: @VERSION@
-Requires: poppler = @VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-qt4
 Cflags: -I${includedir}/poppler/qt4
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler-qt.pc.cmake /tmp/9MerXF9qtu/poppler-0.12.0/poppler-qt.pc.cmake
--- poppler-0.11.3/poppler-qt.pc.cmake	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/poppler-qt.pc.cmake	2009-09-02 19:48:16.000000000 +0100
@@ -6,7 +6,8 @@
 Name: poppler-qt
 Description: Qt bindings for poppler
 Version: @POPPLER_VERSION@
-Requires: poppler = @POPPLER_VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-qt
 Cflags: -I${includedir}/poppler/qt3
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/poppler-qt.pc.in /tmp/9MerXF9qtu/poppler-0.12.0/poppler-qt.pc.in
--- poppler-0.11.3/poppler-qt.pc.in	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/poppler-qt.pc.in	2009-09-02 19:48:16.000000000 +0100
@@ -6,7 +6,8 @@
 Name: poppler-qt
 Description: Qt bindings for poppler
 Version: @VERSION@
-Requires: poppler = @VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
 
 Libs: -L${libdir} -lpoppler-qt
 Cflags: -I${includedir}/poppler/qt3
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/demos/Makefile.am /tmp/9MerXF9qtu/poppler-0.12.0/qt4/demos/Makefile.am
--- poppler-0.11.3/qt4/demos/Makefile.am	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/qt4/demos/Makefile.am	2009-09-02 19:48:16.000000000 +0100
@@ -16,7 +16,7 @@
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 noinst_PROGRAMS = poppler_qt4viewer
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/demos/Makefile.in /tmp/9MerXF9qtu/poppler-0.12.0/qt4/demos/Makefile.in
--- poppler-0.11.3/qt4/demos/Makefile.in	2009-08-18 20:04:22.000000000 +0100
+++ poppler-0.12.0/qt4/demos/Makefile.in	2009-09-09 18:22:37.000000000 +0100
@@ -578,7 +578,7 @@
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 abstractinfodock.$(OBJEXT): abstractinfodock.moc
 embeddedfiles.$(OBJEXT): embeddedfiles.moc
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/src/CMakeLists.txt /tmp/9MerXF9qtu/poppler-0.12.0/qt4/src/CMakeLists.txt
--- poppler-0.11.3/qt4/src/CMakeLists.txt	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/qt4/src/CMakeLists.txt	2009-09-09 18:19:44.000000000 +0100
@@ -33,7 +33,7 @@
 endif (ENABLE_SPLASH)
 qt4_automoc(${poppler_qt4_SRCS})
 add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
-set_target_properties(poppler-qt4 PROPERTIES VERSION 3.1.0 SOVERSION 3)
+set_target_properties(poppler-qt4 PROPERTIES VERSION 3.2.0 SOVERSION 3)
 target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
 if(MSVC)
 target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/src/Makefile.am /tmp/9MerXF9qtu/poppler-0.12.0/qt4/src/Makefile.am
--- poppler-0.11.3/qt4/src/Makefile.am	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/qt4/src/Makefile.am	2009-09-09 18:20:30.000000000 +0100
@@ -61,11 +61,11 @@
 	$(top_builddir)/poppler/libpoppler-arthur.la
 endif
 
-libpoppler_qt4_la_LDFLAGS = -version-info 4:0:1
+libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 poppler-optcontent.lo: poppler-optcontent.moc
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/src/Makefile.in /tmp/9MerXF9qtu/poppler-0.12.0/qt4/src/Makefile.in
--- poppler-0.11.3/qt4/src/Makefile.in	2009-08-18 20:04:22.000000000 +0100
+++ poppler-0.12.0/qt4/src/Makefile.in	2009-09-09 18:22:37.000000000 +0100
@@ -334,7 +334,7 @@
 
 libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
 	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
-libpoppler_qt4_la_LDFLAGS = -version-info 4:0:1
+libpoppler_qt4_la_LDFLAGS = -version-info 5:0:2
 all: all-am
 
 .SUFFIXES:
@@ -651,7 +651,7 @@
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 poppler-optcontent.lo: poppler-optcontent.moc
 
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/src/poppler-embeddedfile.cc /tmp/9MerXF9qtu/poppler-0.12.0/qt4/src/poppler-embeddedfile.cc
--- poppler-0.11.3/qt4/src/poppler-embeddedfile.cc	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/qt4/src/poppler-embeddedfile.cc	2009-09-05 14:20:04.000000000 +0100
@@ -1,5 +1,5 @@
 /* poppler-document.cc: qt interface to poppler
- * Copyright (C) 2005, 2008, Albert Astals Cid 
+ * Copyright (C) 2005, 2008, 2009, Albert Astals Cid 
  * Copyright (C) 2005, Brad Hards 
  * Copyright (C) 2008, Pino Toscano 
  *
@@ -88,6 +88,9 @@
 
 QByteArray EmbeddedFile::data()
 {
+	if (!isValid())
+		return QByteArray();
+	
 	Object obj;
 	Stream *stream = m_embeddedFile->embfile->streamObject().getStream();
 	stream->reset();
@@ -102,4 +105,9 @@
 	return fileArray;
 }
 
+bool EmbeddedFile::isValid() const
+{
+	return m_embeddedFile->embfile->isOk();
+}
+
 }
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/src/poppler-qt4.h /tmp/9MerXF9qtu/poppler-0.12.0/qt4/src/poppler-qt4.h
--- poppler-0.11.3/qt4/src/poppler-qt4.h	2009-08-18 19:41:57.000000000 +0100
+++ poppler-0.12.0/qt4/src/poppler-qt4.h	2009-09-05 14:20:14.000000000 +0100
@@ -1,7 +1,7 @@
 /* poppler-qt.h: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
  * Copyright (C) 2005, 2007, Brad Hards 
- * Copyright (C) 2005-2008, Albert Astals Cid 
+ * Copyright (C) 2005-2009, Albert Astals Cid 
  * Copyright (C) 2005, Stefan Kebekus 
  * Copyright (C) 2006-2009, Pino Toscano 
  * Copyright (C) 2009 Shawn Rutledge 
@@ -337,6 +337,13 @@
 	QByteArray data();
 
 	/**
+	   Is the embedded file valid?
+	   
+	   \since 0.12
+	*/
+	bool isValid() const;
+
+	/**
 	   A QDataStream for the actual data?
 	*/
 	//QDataStream dataStream() const;
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/tests/Makefile.am /tmp/9MerXF9qtu/poppler-0.12.0/qt4/tests/Makefile.am
--- poppler-0.11.3/qt4/tests/Makefile.am	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/qt4/tests/Makefile.am	2009-09-02 19:48:16.000000000 +0100
@@ -15,7 +15,7 @@
 SUFFIXES: .moc
 
 .cpp.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 noinst_PROGRAMS = test-poppler-qt4 stress-poppler-qt4 \
 	poppler-fonts test-password-qt4 stress-poppler-dir \
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/qt4/tests/Makefile.in /tmp/9MerXF9qtu/poppler-0.12.0/qt4/tests/Makefile.in
--- poppler-0.11.3/qt4/tests/Makefile.in	2009-08-18 20:04:22.000000000 +0100
+++ poppler-0.12.0/qt4/tests/Makefile.in	2009-09-09 18:22:37.000000000 +0100
@@ -881,7 +881,7 @@
 SUFFIXES: .moc
 
 .cpp.moc:
-	$(MOCQT4) -i $< -o $@
+	$(AM_V_GEN) $(MOCQT4) -i $< -o $@
 
 clean-generic:
 	rm -f *.moc
diff -Nru /tmp/sQAV1Ky1yL/poppler-0.11.3/utils/pdftoabw.cc /tmp/9MerXF9qtu/poppler-0.12.0/utils/pdftoabw.cc
--- poppler-0.11.3/utils/pdftoabw.cc	2009-07-12 18:09:18.000000000 +0100
+++ poppler-0.12.0/utils/pdftoabw.cc	2009-09-02 19:48:16.000000000 +0100
@@ -2,6 +2,8 @@
  * Copyright (C) 2007 Jauco Noordzij 
  * Copyright (C) 2007 Dominic Lachowicz 
  * Copyright (C) 2007 Kouhei Sutou 
+ * Copyright (C) 2009 Jakub Wilk 
+ * Copyright (C) 2009 Albert Astals Cid 
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +51,9 @@
 
 static int firstPage = 1;
 static int lastPage = 0;
+static GBool quiet = gFalse;
 static GBool printHelp = gFalse;
+static GBool printVersion = gFalse;
 static GBool stout = gFalse;
 static char ownerPassword[33] = "";
 static char userPassword[33] = "";
@@ -61,20 +65,29 @@
    "first page to convert"},
   {"-l",      argInt,      &lastPage,      0,
    "last page to convert"},
-  {"-h",      argFlag,     &printHelp,     0,
-   "print usage information"},
-  {"--help",   argFlag,     &printHelp,     0,
-   "print usage information"},
   {"--stdout"  ,argFlag,    &stout,         0,
    "use standard output"},
   {"--opw",    argString,   ownerPassword,  sizeof(ownerPassword),
    "owner password (for encrypted files)"},
   {"--upw",    argString,   userPassword,   sizeof(userPassword),
    "user password (for encrypted files)"},
+  {"-q",       argFlag,     &quiet,         0,
+   "don't print any messages or errors"},
+  {"-v",       argFlag,     &printVersion,  0,
+   "print copyright and version info"},
+  {"-h",       argFlag,     &printHelp,     0,
+   "print usage information"},
+  {"-help",    argFlag,     &printHelp,     0,
+   "print usage information"},
+  {"--help",   argFlag,     &printHelp,     0,
+   "print usage information"},
+  {"-?",       argFlag,     &printHelp,     0,
+   "print usage information"},
   {NULL}
 };
 
 int main(int argc, char *argv[]) {
+  GBool ok;
   PDFDoc *doc = NULL;
   GooString *fileName = NULL;
 //  GooString *abwFileName = NULL;
@@ -89,11 +102,23 @@
   xmlDocPtr XMLdoc = NULL;
 
   // parse args
-  parseArgs(argDesc, &argc, argv);
+  ok = parseArgs(argDesc, &argc, argv);
+  if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) {
+    fprintf(stderr, "pdftoabw version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
+    fprintf(stderr, "%s\n", xpdfCopyright);
+    if (!printVersion) {
+      printUsage("pdftoabw", " [abw-file]", argDesc);
+    }
+    goto err0;
+  }
   globalParams = new GlobalParams();
+  if (quiet) {
+    globalParams->setErrQuiet(quiet);
+  }
 
   fileName = new GooString(argv[1]);
-  if (stout || (argc < 2)){
+  if (stout || (argc < 3)){
     outpName = "-";
   }
   else {
@@ -159,7 +184,7 @@
   if(doc) delete doc;
   if(XMLdoc) xmlFreeDoc(XMLdoc);
   if(abwOut) delete abwOut;
-  
+ err0:
   // check for memory leaks
   Object::memCheck(stderr);
   gMemReport(stderr);