Hello community,
here is the log from the commit of package poppler for openSUSE:Factory
checked in at Sun Oct 2 10:25:23 CEST 2011.
--------
--- openSUSE:Factory/poppler/poppler-qt.changes 2011-09-23 12:41:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/poppler/poppler-qt.changes 2011-09-27 09:55:55.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Sep 27 07:40:22 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 0.18.0:
+ + core:
+ - Fix small memory leak when dealing with marked content
+ - Remove DCTStream::getRawStream since Stream::getNextStream
+ does the same
+ + utils:
+ - Rename pdfmerge to pdfunite
+ - Rename pdfextract to pdfseparate
+ - pdfseparate: Complain if %d is not present and it should
+ - Add pdfseparate and pdfunite man pages
+ + build system:
+ - Minor cleanup in regarding removed qt code
+- Bump poppler_soname to 18, following upstream soversion change.
+
+-------------------------------------------------------------------
@@ -7,0 +25,2 @@
+- Bump poppler_api define since the typelib file is now versioned
+ 0.18.
--- openSUSE:Factory/poppler/poppler.changes 2011-09-23 12:41:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/poppler/poppler.changes 2011-09-27 09:55:56.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Sep 27 07:40:22 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 0.18.0:
+ + core:
+ - Fix small memory leak when dealing with marked content
+ - Remove DCTStream::getRawStream since Stream::getNextStream
+ does the same
+ + utils:
+ - Rename pdfmerge to pdfunite
+ - Rename pdfextract to pdfseparate
+ - pdfseparate: Complain if %d is not present and it should
+ - Add pdfseparate and pdfunite man pages
+ + build system:
+ - Minor cleanup in regarding removed qt code
+- Bump poppler_soname to 18, following upstream soversion change.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
poppler-0.17.4.tar.gz
New:
----
poppler-0.18.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler-qt.spec ++++++
--- /var/tmp/diff_new_pack.cu9FhY/_old 2011-10-02 10:25:16.000000000 +0200
+++ /var/tmp/diff_new_pack.cu9FhY/_new 2011-10-02 10:25:16.000000000 +0200
@@ -20,11 +20,11 @@
Name: poppler-qt
%define _name poppler
-Version: 0.17.4
+Version: 0.18.0
Release: 1
# Actual version of poppler-data:
%define poppler_data_version 0.2.1
-%define poppler_soname 17
+%define poppler_soname 18
%define poppler_cpp_soname 0
%define poppler_glib_soname 8
%define poppler_qt4_soname 3
poppler.spec: same change
++++++ poppler-0.17.4.tar.gz -> poppler-0.18.0.tar.gz ++++++
++++ 1999 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/CMakeLists.txt new/poppler-0.18.0/CMakeLists.txt
--- old/poppler-0.17.4/CMakeLists.txt 2011-09-12 13:17:00.000000000 +0200
+++ new/poppler-0.18.0/CMakeLists.txt 2011-09-27 00:20:53.000000000 +0200
@@ -15,8 +15,8 @@
test_big_endian(WORDS_BIGENDIAN)
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "17")
-set(POPPLER_MICRO_VERSION "4")
+set(POPPLER_MINOR_VERSION "18")
+set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -351,7 +351,7 @@
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 17.0.0 SOVERSION 17)
+set_target_properties(poppler PROPERTIES VERSION 18.0.0 SOVERSION 18)
target_link_libraries(poppler ${poppler_LIBS})
target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/ChangeLog new/poppler-0.18.0/ChangeLog
--- old/poppler-0.17.4/ChangeLog 2011-09-12 13:30:15.000000000 +0200
+++ new/poppler-0.18.0/ChangeLog 2011-09-27 00:31:36.000000000 +0200
@@ -1,3 +1,275 @@
+commit 19f5db7acd64330d198f18695175df02141794d7
+Author: Albert Astals Cid
+Date: Tue Sep 27 00:15:15 2011 +0200
+
+ Update Carlos (C) year
+
+ poppler/Gfx.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 6d34d4af90b8b41360de4dabb000bbcc894775d0
+Author: Albert Astals Cid
+Date: Tue Sep 27 00:09:54 2011 +0200
+
+ Rename pdfmerge and pdfextract
+
+ To pdfunite and pdfseparate, the old names were taken
+
+ utils/.gitignore | 4 +-
+ utils/CMakeLists.txt | 28 ++++----
+ utils/Makefile.am | 16 ++--
+ utils/pdfextract.1 | 49 --------------
+ utils/pdfextract.cc | 115 --------------------------------
+ utils/pdfmerge.1 | 33 ---------
+ utils/pdfmerge.cc | 176
+ --------------------------------------------------
+ utils/pdfseparate.1 | 49 ++++++++++++++
+ utils/pdfseparate.cc | 115 ++++++++++++++++++++++++++++++++
+ utils/pdfunite.1 | 33 +++++++++
+ utils/pdfunite.cc | 176
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 11 files changed, 397 insertions(+), 397 deletions(-)
+
+commit baf54c2876edd476ffc68da6518598847bb7ec8a
+Author: Albert Astals Cid
+Date: Mon Sep 26 15:54:46 2011 +0200
+
+ Remove getRawStream
+
+ Since it does exactly the same as getNextStream
+
+ poppler/DCTStream.h | 1 -
+ poppler/Stream.h | 1 -
+ utils/HtmlOutputDev.cc | 7 ++-----
+ utils/ImageOutputDev.cc | 9 +++------
+ 4 files changed, 5 insertions(+), 13 deletions(-)
+
+commit 69707f0a9b5a94c80817039db943fb4f26e743e3
+Author: Adrian Johnson
+Date: Mon Sep 19 22:00:34 2011 +0930
+
+ Update .gitignore
+
+ regtest/.gitignore | 1 +
+ utils/.gitignore | 2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 0de477817e424078cfcfcae114e7745809f0848d
+Author: Adrian Johnson
+Date: Mon Sep 19 21:57:07 2011 +0930
+
+ utils: Add Glyph & Cog copyright to pdfmerge and pdfextract man pages
+
+ utils/pdfextract.1 | 3 ++-
+ utils/pdfmerge.1 | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit ce7372db64ee807dc2b491e121fbe557dbf697e8
+Author: Adrian Johnson
+Date: Mon Sep 19 22:04:27 2011 +0930
+
+ regtest: render cairo at 72ppi
+
+ For consistency with splash. It is faster and easier to compare with
+ splash results.
+
+ regtest/backends/cairo.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 6cf7330089c4dcc1099906d9c37c3607a2a1eeba
+Author: Carlos Garcia Campos
+Date: Mon Sep 19 18:42:35 2011 +0200
+
+ regtest: Ignore checksums of crashed, failed and stderr files
+
+ They shouldn't have a checksum, but it might happen with md5 files
+ generated with previous versions.
+
+ regtest/backends/__init__.py | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+commit 6512bf1c5dab37058460882fec3407b396830981
+Author: Albert Astals Cid
+Date: Sun Sep 18 18:38:32 2011 +0200
+
+ Render at 72 instead of 150, it's faster :D
+
+ regtest/backends/splash.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit b828f63ed3896a22f3fe7ddbe2ec2f549d7a2c62
+Author: Albert Astals Cid
+Date: Sun Sep 18 18:20:47 2011 +0200
+
+ install pdfextract and pdfmerge manpages
+
+ utils/CMakeLists.txt | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 986759dfbe85998c85ee9b0825c7522395567531
+Author: Thomas Freitag
+Date: Sun Sep 18 18:19:30 2011 +0200
+
+ pdfextract and pdfmerge man pages
+
+ utils/Makefile.am | 2 ++
+ utils/pdfextract.1 | 48
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ utils/pdfmerge.1 | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 82 insertions(+), 0 deletions(-)
+
+commit 90da1af542fd7f3cecef31b15da6971345b38209
+Author: Thomas Freitag
+Date: Sun Sep 18 18:19:04 2011 +0200
+
+ Complain if %d is not present and it should
+
+ utils/pdfextract.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 40e066a84ddb3a5c41805c095659af5f5704d6d8
+Author: suzuki toshiya
+Date: Sun Sep 18 18:16:14 2011 +0200
+
+ qt_subdir is unneeded
+
+ Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e23f6b9cade804136bd4bb58182f4fe0b072fbf2
+Author: Carlos Garcia Campos
+Date: Sun Sep 18 16:27:50 2011 +0200
+
+ regtest: Do not create checksums for crashed, failed and stderr files
+
+ regtest/backends/__init__.py | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+commit 110b8be1d9f2694b42bd12dcb6af02bfca9866dd
+Author: Carlos Garcia Campos
+Date: Sun Sep 18 16:26:58 2011 +0200
+
+ Fix memory leak
+
+ poppler/Gfx.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 12c6239ca4f1f6a5de72aebd755f9d1354ea5837
+Author: Carlos Garcia Campos
+Date: Sun Sep 18 11:08:06 2011 +0200
+
+ regtest: Fix checksum check for tests containing spaces in filename
+
+ regtest/backends/__init__.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 93ba92db0a3af35f197a4faa5a528af98ea0f624
+Author: Albert Astals Cid
+Date: Wed Sep 14 00:58:44 2011 +0200
+
+ Make it work with Python3
+
+ regtest/Config.py | 4 ++--
+ regtest/TestReferences.py | 8 ++++----
+ regtest/TestRun.py | 32 ++++++++++++++++----------------
+ regtest/Timer.py | 8 ++++----
+ regtest/backends/__init__.py | 12 ++++++------
+ regtest/commands/__init__.py | 6 +++---
+ regtest/commands/create-refs.py | 2 +-
+ regtest/commands/run-tests.py | 2 +-
+ regtest/main.py | 2 +-
+ 9 files changed, 38 insertions(+), 38 deletions(-)
+
+commit da1b5437148e1e6317246b16f7235c8bc280be97
+Author: Carlos Garcia Campos
+Date: Tue Sep 13 20:09:56 2011 +0200
+
+ regtest: Add a way to skip files
+
+ A new command line option --skip has been added to give a file
+ with the
+ list of test to skip. When --skip is not used, it look for a file
+ named
+ Skipped in the tests dir. Lines starting with '#' are considered
+ comments and are ignored.
+
+ regtest/TestReferences.py | 9 +++++++--
+ regtest/TestRun.py | 9 +++++++--
+ regtest/Utils.py | 20 ++++++++++++++++++++
+ regtest/main.py | 6 +++++-
+ 4 files changed, 39 insertions(+), 5 deletions(-)
+
+commit b730b2c1d9666f62f940762663c8318e64049d61
+Author: Carlos Garcia Campos
+Date: Tue Sep 13 19:04:04 2011 +0200
+
+ regtest: Limit the number of arguments to 1
+
+ It's easier to run poppler-regtest more than once if you need to run
+ different tests.
+
+ regtest/commands/create-refs.py | 24 ++++++++++++------------
+ regtest/commands/run-tests.py | 26 +++++++++++++-------------
+ regtest/main.py | 2 +-
+ 3 files changed, 26 insertions(+), 26 deletions(-)
+
+commit 5ce045d0358318859c844340c639483485b69c58
+Author: Carlos Garcia Campos
+Date: Tue Sep 13 18:18:21 2011 +0200
+
+ regtest: Sort tests before create-refs/run-tests and show progress
+
+ regtest/TestReferences.py | 20 ++++++++------------
+ regtest/TestRun.py | 21 ++++++++++-----------
+ regtest/Utils.py | 35 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 53 insertions(+), 23 deletions(-)
+
+commit 10801b6faee9037af054fe74cc4a03620ea41d45
+Author: Carlos Garcia Campos
+Date: Mon Sep 12 20:13:17 2011 +0200
+
+ Add initial poppler regressions test program
+
+ regtest/Config.py | 32 ++++++
+ regtest/TestReferences.py | 73 +++++++++++++
+ regtest/TestRun.py | 156 +++++++++++++++++++++++++++
+ regtest/Timer.py | 73 +++++++++++++
+ regtest/backends/__init__.py | 220
+ +++++++++++++++++++++++++++++++++++++++
+ regtest/backends/cairo.py | 39 +++++++
+ regtest/backends/postscript.py | 35 ++++++
+ regtest/backends/splash.py | 39 +++++++
+ regtest/backends/text.py | 48 +++++++++
+ regtest/commands/__init__.py | 93 ++++++++++++++++
+ regtest/commands/create-refs.py | 65 ++++++++++++
+ regtest/commands/run-tests.py | 69 ++++++++++++
+ regtest/main.py | 77 ++++++++++++++
+ regtest/poppler-regtest | 6 +
+ 14 files changed, 1025 insertions(+), 0 deletions(-)
+
+commit 245e331a14e11a615bf47abbeb34a3561e393b41
+Author: Albert Astals Cid
+Date: Mon Sep 12 13:43:49 2011 +0200
+
+ 0.17.4
+
+ CMakeLists.txt | 2 +-
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 9 insertions(+), 4 deletions(-)
+
+commit 194b2413eb2c6a1641508aec63336aaf89ec3b51
+Author: Albert Astals Cid
+Date: Mon Sep 12 13:43:35 2011 +0200
+
+ gir 0.18
+
+ glib/CMakeLists.txt | 12 ++++++------
+ glib/Makefile.am | 12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
commit bf2cb5c9c47b4a61192101f0a48771657228e383
Author: Adrian Johnson
Date: Tue Aug 30 19:08:40 2011 +0930
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/Makefile.am new/poppler-0.18.0/Makefile.am
--- old/poppler-0.17.4/Makefile.am 2011-06-30 23:41:10.000000000 +0200
+++ new/poppler-0.18.0/Makefile.am 2011-09-18 18:17:01.000000000 +0200
@@ -29,7 +29,7 @@
utils_subdir = utils
endif
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(cpp_subdir)
EXTRA_DIST = \
README-XPDF \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/NEWS new/poppler-0.18.0/NEWS
--- old/poppler-0.17.4/NEWS 2011-09-12 13:16:35.000000000 +0200
+++ new/poppler-0.18.0/NEWS 2011-09-27 00:19:42.000000000 +0200
@@ -1,3 +1,17 @@
+Release 0.18.0
+ core:
+ * Fix small memory leak when dealing with marked content
+ * Remove DCTStream::getRawStream since Stream::getNextStream does the same
+
+ utils:
+ * Rename pdfmerge to pdfunite
+ * Rename pdfextract to pdfseparate
+ * pdfseparate: Complain if %d is not present and it should
+ * Add pdfseparate and pdfunite man pages
+
+ build system:
+ * Minor cleanup in regarding removed qt code
+
Release 0.17.4 (0.18 RC)
core:
* SplashOutputDev: Compile when defining USE_FIXEDPOINT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/configure.ac new/poppler-0.18.0/configure.ac
--- old/poppler-0.17.4/configure.ac 2011-09-12 13:16:50.000000000 +0200
+++ new/poppler-0.18.0/configure.ac 2011-09-27 00:19:58.000000000 +0200
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[17])
-m4_define([poppler_version_micro],[4])
+m4_define([poppler_version_minor],[18])
+m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/cpp/poppler-version.h new/poppler-0.18.0/cpp/poppler-version.h
--- old/poppler-0.17.4/cpp/poppler-version.h 2011-09-12 13:19:10.000000000 +0200
+++ new/poppler-0.18.0/cpp/poppler-version.h 2011-09-27 00:23:28.000000000 +0200
@@ -21,10 +21,10 @@
#include "poppler-global.h"
-#define POPPLER_VERSION "0.17.4"
+#define POPPLER_VERSION "0.18.0"
#define POPPLER_VERSION_MAJOR 0
-#define POPPLER_VERSION_MINOR 17
-#define POPPLER_VERSION_MICRO 4
+#define POPPLER_VERSION_MINOR 18
+#define POPPLER_VERSION_MICRO 0
namespace poppler
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/glib/reference/html/ch01.html new/poppler-0.18.0/glib/reference/html/ch01.html
--- old/poppler-0.17.4/glib/reference/html/ch01.html 2011-09-12 13:30:17.000000000 +0200
+++ new/poppler-0.18.0/glib/reference/html/ch01.html 2011-09-27 00:31:39.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id587533"></a>Poppler</h2></div></div></div>
+<a name="id511757"></a>Poppler</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="poppler-poppler.html">poppler</a></span><span class="refpurpose"></span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/glib/reference/html/index.html new/poppler-0.18.0/glib/reference/html/index.html
--- old/poppler-0.17.4/glib/reference/html/index.html 2011-09-12 13:30:17.000000000 +0200
+++ new/poppler-0.18.0/glib/reference/html/index.html 2011-09-27 00:31:39.000000000 +0200
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for Poppler 0.17.4
+ for Poppler 0.18.0
</p></div>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.18.0/glib/reference/html/poppler-Version-and-Features-Information.html
--- old/poppler-0.17.4/glib/reference/html/poppler-Version-and-Features-Information.html 2011-09-12 13:30:17.000000000 +0200
+++ new/poppler-0.18.0/glib/reference/html/poppler-Version-and-Features-Information.html 2011-09-27 00:31:39.000000000 +0200
@@ -82,7 +82,7 @@
<hr>
<div class="refsect2">
<a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3>
-<pre class="programlisting">#define POPPLER_MINOR_VERSION (17)
+<pre class="programlisting">#define POPPLER_MINOR_VERSION (18)
</pre>
<p>
The major version number of the poppler header files (e.g. in poppler version
@@ -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 (4)
+<pre class="programlisting">#define POPPLER_MICRO_VERSION (0)
</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' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/glib/reference/version.xml new/poppler-0.18.0/glib/reference/version.xml
--- old/poppler-0.17.4/glib/reference/version.xml 2011-09-12 13:19:09.000000000 +0200
+++ new/poppler-0.18.0/glib/reference/version.xml 2011-09-27 00:23:28.000000000 +0200
@@ -1 +1 @@
-0.17.4
+0.18.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/gtk-doc.make new/poppler-0.18.0/gtk-doc.make
--- old/poppler-0.17.4/gtk-doc.make 2011-06-30 23:41:10.000000000 +0200
+++ new/poppler-0.18.0/gtk-doc.make 2011-09-27 00:22:27.000000000 +0200
@@ -30,12 +30,11 @@
$(DOC_MODULE)-overrides.txt
EXTRA_DIST = \
- $(HTML_IMAGES) \
$(SETUP_FILES)
DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
html-build.stamp pdf-build.stamp \
- sgml.stamp html.stamp pdf.stamp
+ setup.stamp sgml.stamp html.stamp pdf.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
@@ -76,41 +75,36 @@
setup-build.stamp:
-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- echo ' DOC Preparing build'; \
- files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
- if test "x$$files" != "x" ; then \
- for file in $$files ; do \
- test -f $(abs_srcdir)/$$file && \
- cp -p $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
- done; \
- fi \
+ echo 'gtk-doc: Preparing build'; \
+ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+ if test "x$$files" != "x" ; then \
+ for file in $$files ; do \
+ test -f $(abs_srcdir)/$$file && \
+ cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
+ done \
+ fi \
fi
@touch setup-build.stamp
+setup.stamp: setup-build.stamp
+ @true
+
+
#### scan ####
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
- @echo ' DOC Scanning header files'
+ @echo 'gtk-doc: Scanning header files'
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
done ; \
gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
- echo " DOC Introspecting gobjects"; \
- scanobj_options=""; \
- gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
- if test "x$(V)" = "x1"; then \
- scanobj_options="--verbose"; \
- fi; \
- fi; \
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
- gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
else \
for i in $(SCANOBJ_FILES) ; do \
- test -f $$i || touch $$i ; \
+ test -f $$i || touch $$i ; \
done \
fi
@touch scan-build.stamp
@@ -120,8 +114,8 @@
#### xml ####
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
- @echo ' DOC Building XML'
+sgml-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
@_source_dir='' ; \
for i in $(DOC_SOURCE_DIR) ; do \
_source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -135,19 +129,13 @@
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo ' DOC Building HTML'
+ @echo 'gtk-doc: Building HTML'
@rm -rf html
@mkdir html
@mkhtml_options=""; \
- gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
- if test "x$(AM_DEFAULT_VERBOSITY)" = "x1"; then \
- mkhtml_options="$$mkhtml_options --verbose"; \
- fi; \
- fi; \
gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
if test "$(?)" = "0"; then \
- mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
+ mkhtml_options=--path="$(abs_srcdir)"; \
fi; \
cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-@test "x$(HTML_IMAGES)" = "x" || \
@@ -159,54 +147,48 @@
cp $(abs_builddir)/$$file $(abs_builddir)/html; \
fi; \
done;
- @echo ' DOC Fixing cross-references'
+ @echo 'gtk-doc: Fixing cross-references'
@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@touch html-build.stamp
#### pdf ####
pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
- @echo ' DOC Building PDF'
- @rm -f $(DOC_MODULE).pdf
- @mkpdf_options=""; \
- gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \
- if test "$(?)" = "0"; then \
- if test "x$(AM_DEFAULT_VERBOSITY)" = "x1"; then \
- mkpdf_options="$$mkpdf_options --verbose"; \
- fi; \
- fi; \
+ @echo 'gtk-doc: Building PDF'
+ @rm -rf $(DOC_MODULE).pdf
+ @mkpdf_imgdirs=""; \
if test "x$(HTML_IMAGES)" != "x"; then \
for img in $(HTML_IMAGES); do \
part=`dirname $$img`; \
- echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
+ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
if test $$? != 0; then \
- mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
+ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
fi; \
done; \
fi; \
- gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
@touch pdf-build.stamp
##############
clean-local:
- @rm -f *~ *.bak
- @rm -rf .libs
+ rm -f *~ *.bak
+ rm -rf .libs
distclean-local:
- @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+ rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
$(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
fi
maintainer-clean-local: clean
- @rm -rf xml html
+ rm -rf xml html
install-data-local:
- @installfiles=`echo $(srcdir)/html/*`; \
+ @installfiles=`echo $(builddir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo 1>&2 'Nothing to install' ; \
+ then echo '-- Nothing to install' ; \
else \
if test -n "$(DOC_MODULE_VERSION)"; then \
installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -215,7 +197,7 @@
fi; \
$(mkinstalldirs) $${installdir} ; \
for i in $$installfiles; do \
- echo ' $(INSTALL_DATA) '$$i ; \
+ echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $${installdir}; \
done; \
if test -n "$(DOC_MODULE_VERSION)"; then \
@@ -247,12 +229,12 @@
endif
dist-hook: dist-check-gtkdoc dist-hook-local
- @mkdir $(distdir)/html
- @cp ./html/* $(distdir)/html
- @-cp ./$(DOC_MODULE).pdf $(distdir)/
- @-cp ./$(DOC_MODULE).types $(distdir)/
- @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
- @cd $(distdir) && rm -f $(DISTCLEANFILES)
- @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+ mkdir $(distdir)/html
+ cp $(builddir)/html/* $(distdir)/html
+ -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(builddir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(builddir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/poppler/DCTStream.h new/poppler-0.18.0/poppler/DCTStream.h
--- old/poppler-0.17.4/poppler/DCTStream.h 2011-07-16 23:01:36.000000000 +0200
+++ new/poppler-0.18.0/poppler/DCTStream.h 2011-09-26 15:46:22.000000000 +0200
@@ -68,7 +68,6 @@
virtual int lookChar();
virtual GooString *getPSFilter(int psLevel, char *indent);
virtual GBool isBinary(GBool last = gTrue);
- Stream *getRawStream() { return str; }
private:
void init();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/poppler/Gfx.cc new/poppler-0.18.0/poppler/Gfx.cc
--- old/poppler-0.17.4/poppler/Gfx.cc 2011-08-18 17:37:37.000000000 +0200
+++ new/poppler-0.18.0/poppler/Gfx.cc 2011-09-27 00:15:13.000000000 +0200
@@ -17,7 +17,7 @@
// Copyright (C) 2005-2010 Albert Astals Cid
// Copyright (C) 2006 Thorkild Stray
// Copyright (C) 2006 Kristian Høgsberg
-// Copyright (C) 2006-2010 Carlos Garcia Campos
+// Copyright (C) 2006-2011 Carlos Garcia Campos
// Copyright (C) 2006, 2007 Jeff Muizelaar
// Copyright (C) 2007, 2008 Brad Hards
// Copyright (C) 2007, 2011 Adrian Johnson
@@ -4804,7 +4804,8 @@
bool visible = contentConfig->optContentIsVisible( &markedContent );
MarkedContentStack *mc = mcStack;
mc->ocSuppressed = !(visible);
- }
+ }
+ markedContent.free();
} else {
error(getPos(), "DID NOT find %s", name1);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/poppler/Makefile.am new/poppler-0.18.0/poppler/Makefile.am
--- old/poppler-0.17.4/poppler/Makefile.am 2011-08-29 22:45:43.000000000 +0200
+++ new/poppler-0.18.0/poppler/Makefile.am 2011-09-27 00:21:02.000000000 +0200
@@ -171,7 +171,7 @@
$(PTHREAD_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 17:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 18:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/poppler/Stream.h new/poppler-0.18.0/poppler/Stream.h
--- old/poppler-0.17.4/poppler/Stream.h 2011-07-16 23:01:36.000000000 +0200
+++ new/poppler-0.18.0/poppler/Stream.h 2011-09-26 15:46:14.000000000 +0200
@@ -841,7 +841,6 @@
virtual int lookChar();
virtual GooString *getPSFilter(int psLevel, char *indent);
virtual GBool isBinary(GBool last = gTrue);
- Stream *getRawStream() { return str; }
virtual void unfilteredReset();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/CMakeLists.txt new/poppler-0.18.0/utils/CMakeLists.txt
--- old/poppler-0.17.4/utils/CMakeLists.txt 2011-08-29 22:06:49.000000000 +0200
+++ new/poppler-0.18.0/utils/CMakeLists.txt 2011-09-27 00:07:49.000000000 +0200
@@ -102,18 +102,20 @@
install(TARGETS pdftohtml DESTINATION bin)
install(FILES pdftohtml.1 DESTINATION share/man/man1)
-# pdfextract
-set(pdfextract_SOURCES ${common_srcs}
- pdfextract.cc
+# pdfseparate
+set(pdfseparate_SOURCES ${common_srcs}
+ pdfseparate.cc
)
-add_executable(pdfextract ${pdfextract_SOURCES})
-target_link_libraries(pdfextract ${common_libs})
-install(TARGETS pdfextract DESTINATION bin)
+add_executable(pdfseparate ${pdfseparate_SOURCES})
+target_link_libraries(pdfseparate ${common_libs})
+install(TARGETS pdfseparate DESTINATION bin)
+install(FILES pdfseparate.1 DESTINATION share/man/man1)
-# pdfmerge
-set(pdfmerge_SOURCES ${common_srcs}
- pdfmerge.cc
+# pdfunite
+set(pdfunite_SOURCES ${common_srcs}
+ pdfunite.cc
)
-add_executable(pdfmerge ${pdfmerge_SOURCES})
-target_link_libraries(pdfmerge ${common_libs})
-install(TARGETS pdfmerge DESTINATION bin)
+add_executable(pdfunite ${pdfunite_SOURCES})
+target_link_libraries(pdfunite ${common_libs})
+install(TARGETS pdfunite DESTINATION bin)
+install(FILES pdfunite.1 DESTINATION share/man/man1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/HtmlOutputDev.cc new/poppler-0.18.0/utils/HtmlOutputDev.cc
--- old/poppler-0.17.4/utils/HtmlOutputDev.cc 2011-08-18 18:47:12.000000000 +0200
+++ new/poppler-0.18.0/utils/HtmlOutputDev.cc 2011-09-26 15:49:55.000000000 +0200
@@ -57,9 +57,6 @@
#include "Page.h"
#include "Annot.h"
#include "PNGWriter.h"
-#ifdef ENABLE_LIBJPEG
-#include "DCTStream.h"
-#endif
#include "GlobalParams.h"
#include "HtmlOutputDev.h"
#include "HtmlFonts.h"
@@ -1266,7 +1263,7 @@
}
// initialize stream
- str = ((DCTStream *)str)->getRawStream();
+ str = str->getNextStream();
str->reset();
// copy the stream
@@ -1318,7 +1315,7 @@
}
// initialize stream
- str = ((DCTStream *)str)->getRawStream();
+ str = str->getNextStream();
str->reset();
// copy the stream
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/ImageOutputDev.cc new/poppler-0.18.0/utils/ImageOutputDev.cc
--- old/poppler-0.17.4/utils/ImageOutputDev.cc 2011-01-15 12:43:25.000000000 +0100
+++ new/poppler-0.18.0/utils/ImageOutputDev.cc 2011-09-26 15:59:53.000000000 +0200
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2007 Albert Astals Cid
+// Copyright (C) 2005, 2007, 2011 Albert Astals Cid
// Copyright (C) 2006 Rainer Keller
// Copyright (C) 2008 Timothy Lee
// Copyright (C) 2008 Vasile Gaburici
@@ -42,9 +42,6 @@
#include "GfxState.h"
#include "Object.h"
#include "Stream.h"
-#ifdef ENABLE_LIBJPEG
-#include "DCTStream.h"
-#endif
#include "ImageOutputDev.h"
ImageOutputDev::ImageOutputDev(char *fileRootA, GBool pageNamesA, GBool dumpJPEGA) {
@@ -89,7 +86,7 @@
}
// initialize stream
- str = ((DCTStream *)str)->getRawStream();
+ str = str->getNextStream();
str->reset();
// copy the stream
@@ -156,7 +153,7 @@
}
// initialize stream
- str = ((DCTStream *)str)->getRawStream();
+ str = str->getNextStream();
str->reset();
// copy the stream
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/Makefile.am new/poppler-0.18.0/utils/Makefile.am
--- old/poppler-0.17.4/utils/Makefile.am 2011-08-29 22:06:49.000000000 +0200
+++ new/poppler-0.18.0/utils/Makefile.am 2011-09-27 00:08:12.000000000 +0200
@@ -50,8 +50,8 @@
pdftops \
pdftotext \
pdftohtml \
- pdfextract \
- pdfmerge \
+ pdfseparate \
+ pdfunite \
$(pdftoppm_binary) \
$(pdftocairo_binary)
@@ -62,6 +62,8 @@
pdftops.1 \
pdftotext.1 \
pdftohtml.1 \
+ pdfseparate.1 \
+ pdfunite.1 \
$(pdftoppm_manpage) \
$(pdftocairo_manpage)
@@ -104,12 +106,12 @@
HtmlUtils.h \
$(common)
-pdfextract_SOURCES = \
- pdfextract.cc \
+pdfseparate_SOURCES = \
+ pdfseparate.cc \
$(common)
-pdfmerge_SOURCES = \
- pdfmerge.cc \
+pdfunite_SOURCES = \
+ pdfunite.cc \
$(common)
# Yay, automake! It should be able to figure out that it has to dist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/pdfextract.cc new/poppler-0.18.0/utils/pdfextract.cc
--- old/poppler-0.17.4/utils/pdfextract.cc 2011-08-25 23:59:27.000000000 +0200
+++ new/poppler-0.18.0/utils/pdfextract.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,111 +0,0 @@
-//========================================================================
-//
-// pdfextract.cc
-//
-// This file is licensed under the GPLv2 or later
-//
-// Copyright (C) 2011 Thomas Freitag
-//
-//========================================================================
-#include "config.h"
-#include
-#include
-#include
-#include
-#include
-#include "parseargs.h"
-#include "goo/GooString.h"
-#include "PDFDoc.h"
-#include "ErrorCodes.h"
-
-static int firstPage = 0;
-static int lastPage = 0;
-static GBool printVersion = gFalse;
-static GBool printHelp = gFalse;
-
-static const ArgDesc argDesc[] = {
- {"-f", argInt, &firstPage, 0,
- "first page to extract"},
- {"-l", argInt, &lastPage, 0,
- "last page to extract"},
- {"-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}
-};
-
-bool extractPages (const char *srcFileName, const char *destFileName) {
- char pathName[1024];
- GooString *gfileName = new GooString (srcFileName);
- PDFDoc *doc = new PDFDoc (gfileName, NULL, NULL, NULL);
-
- if (!doc->isOk()) {
- error(-1, "Could not extract page(s) from damaged file ('%s')", srcFileName);
- return false;
- }
- if (doc->isEncrypted()) {
- error(-1, "Could not extract page(s) from encrypted file ('%s')", srcFileName);
- return false;
- }
-
- if (firstPage == 0 && lastPage == 0) {
- firstPage = 1;
- lastPage = doc->getNumPages();
- }
- if (lastPage == 0)
- lastPage = doc->getNumPages();
- if (firstPage == 0)
- firstPage = 1;
- for (int pageNo = firstPage; pageNo <= lastPage; pageNo++) {
- sprintf (pathName, destFileName, pageNo);
- GooString *gpageName = new GooString (pathName);
- int errCode = doc->savePageAs(gpageName, pageNo);
- if ( errCode != errNone) {
- delete gpageName;
- delete gfileName;
- return false;
- }
- delete gpageName;
- }
- delete gfileName;
- return true;
-}
-
-int
-main (int argc, char *argv[])
-{
- Object info;
- GBool ok;
- int exitCode;
-
- exitCode = 99;
-
- // parse args
- ok = parseArgs (argDesc, &argc, argv);
- if (!ok || argc != 3 || printVersion || printHelp)
- {
- fprintf (stderr, "pdfextract version %s\n", PACKAGE_VERSION);
- fprintf (stderr, "%s\n", popplerCopyright);
- fprintf (stderr, "%s\n", xpdfCopyright);
- if (!printVersion)
- {
- printUsage ("pdfextract", "<PDF-sourcefile> <PDF-pattern-destfile>",
- argDesc);
- }
- if (printVersion || printHelp)
- exitCode = 0;
- goto err0;
- }
- extractPages (argv[1], argv[2]);
-
-err0:
-
- return exitCode;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/pdfmerge.cc new/poppler-0.18.0/utils/pdfmerge.cc
--- old/poppler-0.17.4/utils/pdfmerge.cc 2011-08-29 22:06:49.000000000 +0200
+++ new/poppler-0.18.0/utils/pdfmerge.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,176 +0,0 @@
-//========================================================================
-//
-// pdfmerge.cc
-//
-// This file is licensed under the GPLv2 or later
-//
-// Copyright (C) 2011 Thomas Freitag
-//
-//========================================================================
-#include
-#include "parseargs.h"
-#include "config.h"
-#include
-#include <vector>
-
-static GBool printVersion = gFalse;
-static GBool printHelp = gFalse;
-
-static const ArgDesc argDesc[] = {
- {"-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[])
-///////////////////////////////////////////////////////////////////////////
-// Merge PDF files given by arguments 1 to argc-2 and write the result
-// to the file specified by argument argc-1.
-///////////////////////////////////////////////////////////////////////////
-{
- int objectsCount = 0;
- Guint numOffset = 0;
- std::vector<Object> pages;
- std::vector<Guint> offsets;
- XRef *yRef, *countRef;
- FILE *f;
- OutStream *outStr;
- int i;
- int j, rootNum;
- std::vectordocs;
- int majorVersion = 0;
- int minorVersion = 0;
- char *fileName = argv[argc - 1];
- int exitCode;
-
- exitCode = 99;
- if (argc <= 3 || printVersion || printHelp) {
- fprintf(stderr, "pdfmerge version %s\n", PACKAGE_VERSION);
- fprintf(stderr, "%s\n", popplerCopyright);
- fprintf(stderr, "%s\n", xpdfCopyright);
- if (!printVersion) {
- printUsage("pdfmerge", "<PDF-sourcefile-1>..<PDF-sourcefile-n> <PDF-destfile>",
- argDesc);
- }
- if (printVersion || printHelp)
- exitCode = 0;
- return exitCode;
- }
- exitCode = 0;
-
- for (i = 1; i < argc - 1; i++) {
- GooString *gfileName = new GooString(argv[i]);
- PDFDoc *doc = new PDFDoc(gfileName, NULL, NULL, NULL);
- if (doc->isOk() && !doc->isEncrypted()) {
- docs.push_back(doc);
- if (doc->getPDFMajorVersion() > majorVersion) {
- majorVersion = doc->getPDFMajorVersion();
- minorVersion = doc->getPDFMinorVersion();
- } else if (doc->getPDFMajorVersion() == majorVersion) {
- if (doc->getPDFMinorVersion() > minorVersion) {
- minorVersion = doc->getPDFMinorVersion();
- }
- }
- } else if (doc->isOk()) {
- error(-1, "Could not merge encrypted files ('%s')", argv[i]);
- return -1;
- } else {
- error(-1, "Could not merge damaged documents ('%s')", argv[i]);
- return -1;
- }
- }
-
- if (!(f = fopen(fileName, "wb"))) {
- error(-1, "Could not open file '%s'", fileName);
- return -1;
- }
- outStr = new FileOutStream(f, 0);
-
- yRef = new XRef();
- countRef = new XRef();
- yRef->add(0, 65535, 0, gFalse);
- PDFDoc::writeHeader(outStr, majorVersion, minorVersion);
-
- for (i = 0; i < (int) docs.size(); i++) {
- for (j = 1; j <= docs[i]->getNumPages(); j++) {
- PDFRectangle *cropBox = NULL;
- if (docs[i]->getCatalog()->getPage(j)->isCropped())
- cropBox = docs[i]->getCatalog()->getPage(j)->getCropBox();
- docs[i]->replacePageDict(j,
- docs[i]->getCatalog()->getPage(j)->getRotate(),
- docs[i]->getCatalog()->getPage(j)->getMediaBox(), cropBox, NULL);
- Ref *refPage = docs[i]->getCatalog()->getPageRef(j);
- Object page;
- docs[i]->getXRef()->fetch(refPage->num, refPage->gen, &page);
- pages.push_back(page);
- offsets.push_back(numOffset);
- Dict *pageDict = page.getDict();
- docs[i]->markPageObjects(pageDict, yRef, countRef, numOffset);
- }
- objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset);
- numOffset = yRef->getNumObjects() + 1;
- }
-
- rootNum = yRef->getNumObjects() + 1;
- yRef->add(rootNum, 0, outStr->getPos(), gTrue);
- outStr->printf("%d 0 obj\n", rootNum);
- outStr->printf("<< /Type /Catalog /Pages %d 0 R", rootNum + 1);
- outStr->printf(">>\nendobj\n");
- objectsCount++;
-
- yRef->add(rootNum + 1, 0, outStr->getPos(), gTrue);
- outStr->printf("%d 0 obj\n", rootNum + 1);
- outStr->printf("<< /Type /Pages /Kids [");
- for (j = 0; j < (int) pages.size(); j++)
- outStr->printf(" %d 0 R", rootNum + j + 2);
- outStr->printf(" ] /Count %d >>\nendobj\n", pages.size());
- objectsCount++;
-
- for (i = 0; i < (int) pages.size(); i++) {
- yRef->add(rootNum + i + 2, 0, outStr->getPos(), gTrue);
- outStr->printf("%d 0 obj\n", rootNum + i + 2);
- outStr->printf("<< ");
- Dict *pageDict = pages[i].getDict();
- for (j = 0; j < pageDict->getLength(); j++) {
- if (j > 0)
- outStr->printf(" ");
- const char *key = pageDict->getKey(j);
- Object value;
- pageDict->getValNF(j, &value);
- if (strcmp(key, "Parent") == 0) {
- outStr->printf("/Parent %d 0 R", rootNum + 1);
- } else {
- outStr->printf("/%s ", key);
- PDFDoc::writeObject(&value, NULL, outStr, yRef, offsets[i]);
- }
- value.free();
- }
- outStr->printf(" >>\nendobj\n");
- objectsCount++;
- }
- Guint uxrefOffset = outStr->getPos();
- yRef->writeToFile(outStr, gFalse /* do not write unnecessary entries */ );
-
- Ref ref;
- ref.num = rootNum;
- ref.gen = 0;
- PDFDoc::writeTrailer(uxrefOffset, objectsCount, outStr, (GBool) gFalse, 0,
- &ref, yRef, fileName, outStr->getPos());
-
- outStr->close();
- fclose(f);
- delete yRef;
- delete countRef;
- for (j = 0; j < (int) pages.size (); j++) pages[j].free();
- for (i = 0; i < (int) docs.size (); i++) delete docs[i];
- return exitCode;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/pdfseparate.1 new/poppler-0.18.0/utils/pdfseparate.1
--- old/poppler-0.17.4/utils/pdfseparate.1 1970-01-01 01:00:00.000000000 +0100
+++ new/poppler-0.18.0/utils/pdfseparate.1 2011-09-27 00:09:17.000000000 +0200
@@ -0,0 +1,49 @@
+.\" Copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
+.TH pdfseparate 1 "15 September 2011"
+.SH NAME
+pdfseparate \- Portable Document Format (PDF) page extractor
+.SH SYNOPSIS
+.B pdfseparate
+[options]
+.I PDF-file PDF-page-pattern
+.SH DESCRIPTION
+.B pdfseparate
+extract single pages from a Portable Document Format (PDF).
+.PP
+pdfseparate reads the PDF file
+.IR PDF-file ,
+extracts one or more pages, and writes one PDF file for each page to
+.IR PDF-page-pattern,
+PDF-page-pattern should contain
+.B %d
+.%d is replaced by the page number
+.TP
+The PDF-file should not be encrypted.
+.SH OPTIONS
+.TP
+.BI \-f " number"
+Specifies the first page to extract. If -f is omitted, extraction starts with page 1.
+.TP
+.BI \-l " number"
+Specifies the last page to extract. if -p is omitted, extraction ends with the last page.
+.TP
+.B \-v
+Print copyright and version information.
+.TP
+.B \-h
+Print usage information.
+.RB ( \-help
+and
+.B \-\-help
+are equivalent.)
+.SH EXAMPLE
+pdfseparate sample.pdf sample-%d.pdf
+.TP
+extracts all pages from sample.pdf, if i.e. sample.pdf has 3 pages, it produces
+.TP
+sample-1.pdf, sample-2.pdf, sample-3.pdf
+.SH AUTHOR
+The pdfseparate software and documentation are copyright 1996-2004 Glyph
+& Cog, LLC and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
+.SH "SEE ALSO"
+.BR pdfunite (1),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/pdfseparate.cc new/poppler-0.18.0/utils/pdfseparate.cc
--- old/poppler-0.17.4/utils/pdfseparate.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/poppler-0.18.0/utils/pdfseparate.cc 2011-09-27 00:08:36.000000000 +0200
@@ -0,0 +1,115 @@
+//========================================================================
+//
+// pdfseparate.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2011 Thomas Freitag
+//
+//========================================================================
+#include "config.h"
+#include
+#include
+#include
+#include
+#include
+#include "parseargs.h"
+#include "goo/GooString.h"
+#include "PDFDoc.h"
+#include "ErrorCodes.h"
+
+static int firstPage = 0;
+static int lastPage = 0;
+static GBool printVersion = gFalse;
+static GBool printHelp = gFalse;
+
+static const ArgDesc argDesc[] = {
+ {"-f", argInt, &firstPage, 0,
+ "first page to extract"},
+ {"-l", argInt, &lastPage, 0,
+ "last page to extract"},
+ {"-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}
+};
+
+bool extractPages (const char *srcFileName, const char *destFileName) {
+ char pathName[1024];
+ GooString *gfileName = new GooString (srcFileName);
+ PDFDoc *doc = new PDFDoc (gfileName, NULL, NULL, NULL);
+
+ if (!doc->isOk()) {
+ error(-1, "Could not extract page(s) from damaged file ('%s')", srcFileName);
+ return false;
+ }
+ if (doc->isEncrypted()) {
+ error(-1, "Could not extract page(s) from encrypted file ('%s')", srcFileName);
+ return false;
+ }
+
+ if (firstPage == 0 && lastPage == 0) {
+ firstPage = 1;
+ lastPage = doc->getNumPages();
+ }
+ if (lastPage == 0)
+ lastPage = doc->getNumPages();
+ if (firstPage == 0)
+ firstPage = 1;
+ if (firstPage != lastPage && strstr(destFileName, "%d") == NULL) {
+ error(-1, "'%s' must contain '%%d' if more than one page should be extracted", destFileName);
+ return false;
+ }
+ for (int pageNo = firstPage; pageNo <= lastPage; pageNo++) {
+ sprintf (pathName, destFileName, pageNo);
+ GooString *gpageName = new GooString (pathName);
+ int errCode = doc->savePageAs(gpageName, pageNo);
+ if ( errCode != errNone) {
+ delete gpageName;
+ delete gfileName;
+ return false;
+ }
+ delete gpageName;
+ }
+ delete gfileName;
+ return true;
+}
+
+int
+main (int argc, char *argv[])
+{
+ Object info;
+ GBool ok;
+ int exitCode;
+
+ exitCode = 99;
+
+ // parse args
+ ok = parseArgs (argDesc, &argc, argv);
+ if (!ok || argc != 3 || printVersion || printHelp)
+ {
+ fprintf (stderr, "pdfseparate version %s\n", PACKAGE_VERSION);
+ fprintf (stderr, "%s\n", popplerCopyright);
+ fprintf (stderr, "%s\n", xpdfCopyright);
+ if (!printVersion)
+ {
+ printUsage ("pdfseparate", "<PDF-sourcefile> <PDF-pattern-destfile>",
+ argDesc);
+ }
+ if (printVersion || printHelp)
+ exitCode = 0;
+ goto err0;
+ }
+ extractPages (argv[1], argv[2]);
+
+err0:
+
+ return exitCode;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/pdfunite.1 new/poppler-0.18.0/utils/pdfunite.1
--- old/poppler-0.17.4/utils/pdfunite.1 1970-01-01 01:00:00.000000000 +0100
+++ new/poppler-0.18.0/utils/pdfunite.1 2011-09-27 00:08:21.000000000 +0200
@@ -0,0 +1,33 @@
+.\" Copyright 2011 The Poppler Developers - http://poppler.freedesktop.org
+.TH pdfunite 1 "15 September 2011"
+.SH NAME
+pdfunite \- Portable Document Format (PDF) page merger
+.SH SYNOPSIS
+.B pdfunite
+[options]
+.I PDF-sourcefile1..PDF-sourcefilen PDF-destfile
+.SH DESCRIPTION
+.B pdfunite
+merges several PDF (Portable Document Format) files in order of their occurence on command line to one PDF result file.
+.TP
+Neither of the PDF-sourcefile1 to PDF-sourcefilen should be encrypted.
+.SH OPTIONS
+.TP
+.B \-v
+Print copyright and version information.
+.TP
+.B \-h
+Print usage information.
+.RB ( \-help
+and
+.B \-\-help
+are equivalent.)
+.SH EXAMPLE
+pdfunite sample1.pdf sample2.pdf sample.pdf
+.TP
+merges all pages from sample1.pdf and sample2.pdf (in that order) and creates sample.pdf
+.SH AUTHOR
+The pdfunite software and documentation are copyright 1996-2004 Glyph & Cog, LLC
+and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org
+.SH "SEE ALSO"
+.BR pdfseparate (1),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/poppler-0.17.4/utils/pdfunite.cc new/poppler-0.18.0/utils/pdfunite.cc
--- old/poppler-0.17.4/utils/pdfunite.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/poppler-0.18.0/utils/pdfunite.cc 2011-09-27 00:06:17.000000000 +0200
@@ -0,0 +1,176 @@
+//========================================================================
+//
+// pdfunite.cc
+//
+// This file is licensed under the GPLv2 or later
+//
+// Copyright (C) 2011 Thomas Freitag
+//
+//========================================================================
+#include
+#include "parseargs.h"
+#include "config.h"
+#include
+#include <vector>
+
+static GBool printVersion = gFalse;
+static GBool printHelp = gFalse;
+
+static const ArgDesc argDesc[] = {
+ {"-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[])
+///////////////////////////////////////////////////////////////////////////
+// Merge PDF files given by arguments 1 to argc-2 and write the result
+// to the file specified by argument argc-1.
+///////////////////////////////////////////////////////////////////////////
+{
+ int objectsCount = 0;
+ Guint numOffset = 0;
+ std::vector<Object> pages;
+ std::vector<Guint> offsets;
+ XRef *yRef, *countRef;
+ FILE *f;
+ OutStream *outStr;
+ int i;
+ int j, rootNum;
+ std::vectordocs;
+ int majorVersion = 0;
+ int minorVersion = 0;
+ char *fileName = argv[argc - 1];
+ int exitCode;
+
+ exitCode = 99;
+ if (argc <= 3 || printVersion || printHelp) {
+ fprintf(stderr, "pdfunite version %s\n", PACKAGE_VERSION);
+ fprintf(stderr, "%s\n", popplerCopyright);
+ fprintf(stderr, "%s\n", xpdfCopyright);
+ if (!printVersion) {
+ printUsage("pdfunite", "<PDF-sourcefile-1>..<PDF-sourcefile-n> <PDF-destfile>",
+ argDesc);
+ }
+ if (printVersion || printHelp)
+ exitCode = 0;
+ return exitCode;
+ }
+ exitCode = 0;
+
+ for (i = 1; i < argc - 1; i++) {
+ GooString *gfileName = new GooString(argv[i]);
+ PDFDoc *doc = new PDFDoc(gfileName, NULL, NULL, NULL);
+ if (doc->isOk() && !doc->isEncrypted()) {
+ docs.push_back(doc);
+ if (doc->getPDFMajorVersion() > majorVersion) {
+ majorVersion = doc->getPDFMajorVersion();
+ minorVersion = doc->getPDFMinorVersion();
+ } else if (doc->getPDFMajorVersion() == majorVersion) {
+ if (doc->getPDFMinorVersion() > minorVersion) {
+ minorVersion = doc->getPDFMinorVersion();
+ }
+ }
+ } else if (doc->isOk()) {
+ error(-1, "Could not merge encrypted files ('%s')", argv[i]);
+ return -1;
+ } else {
+ error(-1, "Could not merge damaged documents ('%s')", argv[i]);
+ return -1;
+ }
+ }
+
+ if (!(f = fopen(fileName, "wb"))) {
+ error(-1, "Could not open file '%s'", fileName);
+ return -1;
+ }
+ outStr = new FileOutStream(f, 0);
+
+ yRef = new XRef();
+ countRef = new XRef();
+ yRef->add(0, 65535, 0, gFalse);
+ PDFDoc::writeHeader(outStr, majorVersion, minorVersion);
+
+ for (i = 0; i < (int) docs.size(); i++) {
+ for (j = 1; j <= docs[i]->getNumPages(); j++) {
+ PDFRectangle *cropBox = NULL;
+ if (docs[i]->getCatalog()->getPage(j)->isCropped())
+ cropBox = docs[i]->getCatalog()->getPage(j)->getCropBox();
+ docs[i]->replacePageDict(j,
+ docs[i]->getCatalog()->getPage(j)->getRotate(),
+ docs[i]->getCatalog()->getPage(j)->getMediaBox(), cropBox, NULL);
+ Ref *refPage = docs[i]->getCatalog()->getPageRef(j);
+ Object page;
+ docs[i]->getXRef()->fetch(refPage->num, refPage->gen, &page);
+ pages.push_back(page);
+ offsets.push_back(numOffset);
+ Dict *pageDict = page.getDict();
+ docs[i]->markPageObjects(pageDict, yRef, countRef, numOffset);
+ }
+ objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset);
+ numOffset = yRef->getNumObjects() + 1;
+ }
+
+ rootNum = yRef->getNumObjects() + 1;
+ yRef->add(rootNum, 0, outStr->getPos(), gTrue);
+ outStr->printf("%d 0 obj\n", rootNum);
+ outStr->printf("<< /Type /Catalog /Pages %d 0 R", rootNum + 1);
+ outStr->printf(">>\nendobj\n");
+ objectsCount++;
+
+ yRef->add(rootNum + 1, 0, outStr->getPos(), gTrue);
+ outStr->printf("%d 0 obj\n", rootNum + 1);
+ outStr->printf("<< /Type /Pages /Kids [");
+ for (j = 0; j < (int) pages.size(); j++)
+ outStr->printf(" %d 0 R", rootNum + j + 2);
+ outStr->printf(" ] /Count %d >>\nendobj\n", pages.size());
+ objectsCount++;
+
+ for (i = 0; i < (int) pages.size(); i++) {
+ yRef->add(rootNum + i + 2, 0, outStr->getPos(), gTrue);
+ outStr->printf("%d 0 obj\n", rootNum + i + 2);
+ outStr->printf("<< ");
+ Dict *pageDict = pages[i].getDict();
+ for (j = 0; j < pageDict->getLength(); j++) {
+ if (j > 0)
+ outStr->printf(" ");
+ const char *key = pageDict->getKey(j);
+ Object value;
+ pageDict->getValNF(j, &value);
+ if (strcmp(key, "Parent") == 0) {
+ outStr->printf("/Parent %d 0 R", rootNum + 1);
+ } else {
+ outStr->printf("/%s ", key);
+ PDFDoc::writeObject(&value, NULL, outStr, yRef, offsets[i]);
+ }
+ value.free();
+ }
+ outStr->printf(" >>\nendobj\n");
+ objectsCount++;
+ }
+ Guint uxrefOffset = outStr->getPos();
+ yRef->writeToFile(outStr, gFalse /* do not write unnecessary entries */ );
+
+ Ref ref;
+ ref.num = rootNum;
+ ref.gen = 0;
+ PDFDoc::writeTrailer(uxrefOffset, objectsCount, outStr, (GBool) gFalse, 0,
+ &ref, yRef, fileName, outStr->getPos());
+
+ outStr->close();
+ fclose(f);
+ delete yRef;
+ delete countRef;
+ for (j = 0; j < (int) pages.size (); j++) pages[j].free();
+ for (i = 0; i < (int) docs.size (); i++) delete docs[i];
+ return exitCode;
+}
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org