Hello community,
here is the log from the commit of package poppler for openSUSE:Factory checked in at 2012-01-06 11:46:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/poppler (Old)
and /work/SRC/openSUSE:Factory/.poppler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler", Maintainer is "BiLi@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2011-11-16 17:22:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2012-01-06 11:46:40.000000000 +0100
@@ -1,0 +2,18 @@
+Wed Jan 4 14:48:18 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 0.18.2:
+ + core:
+ - Fix leak in GooString when resizing to a smaller string
+ - Fix crash if failing to parse the colorspace (fdo#42793)
+ - Make GfxColorSpace::parse accept dicts
+ + qt4:
+ - Use PDFDoc(wchar_t *, ...) on Windows (fdo#35378)
+ - Add missing include
+ - Minor fixes in documentation
+ + utils:
+ - pdftocairo: Fix crash when rendering only odd/even pages in a
+ printing format
+ + build system:
+ - Fix pkg-config files
+
+-------------------------------------------------------------------
poppler.changes: same change
Old:
----
poppler-0.18.1.tar.gz
New:
----
poppler-0.18.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler-qt.spec ++++++
--- /var/tmp/diff_new_pack.Y7bXgY/_old 2012-01-06 11:46:41.000000000 +0100
+++ /var/tmp/diff_new_pack.Y7bXgY/_new 2012-01-06 11:46:41.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package poppler-qt
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%define build_qt 1
Name: poppler-qt
%define _name poppler
-Version: 0.18.1
-Release: 1
+Version: 0.18.2
+Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.2.1
%define poppler_soname 19
@@ -30,12 +29,12 @@
%define poppler_qt4_soname 3
%define poppler_api 0.18
Url: http://poppler.freedesktop.org/
-Group: System/Libraries
-License: GPL-2.0+
Summary: PDF Rendering Library
+License: GPL-2.0+
+Group: System/Libraries
Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.gz
-BuildRequires: gobject-introspection-devel
BuildRequires: gcc-c++
+BuildRequires: gobject-introspection-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
%if %build_qt
@@ -57,9 +56,9 @@
%package -n libpoppler%{poppler_soname}
+Summary: PDF Rendering Library
License: GPL-2.0
Group: System/Libraries
-Summary: PDF Rendering Library
# Last appeared in OpenSUSE 10.3:
Provides: poppler = %{version}
Obsoletes: poppler < %{version}
@@ -70,18 +69,18 @@
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-cpp%{poppler_cpp_soname}
+Summary: PDF Rendering Library
License: GPL-2.0
Group: System/Libraries
-Summary: PDF Rendering Library
%description -n libpoppler-cpp%{poppler_cpp_soname}
Poppler is a PDF rendering library, forked from the xpdf PDF viewer
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-glib%{poppler_glib_soname}
+Summary: PDF Rendering Library - GLib Wrapper
License: GPL-2.0+
Group: System/Libraries
-Summary: PDF Rendering Library - GLib Wrapper
Requires: libpoppler%{poppler_soname} >= %{version}
# Last appeared in OpenSUSE 10.3:
Provides: poppler-glib = %{version}
@@ -94,9 +93,9 @@
%if %build_qt
%package -n libpoppler-qt4-%{poppler_qt4_soname}
+Summary: PDF Rendering Library - Qt4 Wrapper
License: GPL-2.0+
Group: System/Libraries
-Summary: PDF Rendering Library - Qt4 Wrapper
Requires: libpoppler%{poppler_soname} >= %{version}
# Last appeared in OpenSUSE 10.3:
Provides: poppler-qt4 = %{version}
@@ -108,9 +107,9 @@
%endif
%package tools
+Summary: PDF Rendering Library Tools
License: GPL-2.0
Group: Productivity/Publishing/PDF
-Summary: PDF Rendering Library Tools
Requires: libpoppler%{poppler_soname} >= %{version}
# last version in openSUSE 11.1/SLE11
Provides: xpdf-tools = 3.02
@@ -122,9 +121,9 @@
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-devel
+Summary: PDF rendering library
License: GPL-2.0
Group: Development/Libraries/C and C++
-Summary: PDF rendering library
Requires: libpoppler%{poppler_soname} = %{version}
Requires: libstdc++-devel
# Last appeared in OpenSUSE 10.3:
@@ -136,9 +135,9 @@
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-glib-devel
+Summary: PDF rendering library - GLib Wrapper
License: GPL-2.0
Group: Development/Libraries/C and C++
-Summary: PDF rendering library - GLib Wrapper
Requires: libpoppler-glib%{poppler_glib_soname} = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: poppler-devel:%{_libdir}/libpoppler-glib.so
@@ -156,9 +155,9 @@
%if %build_qt
%package -n libpoppler-qt4-devel
+Summary: PDF rendering library - Qt4 Wrapper
License: GPL-2.0+
Group: Development/Libraries/C and C++
-Summary: PDF rendering library - Qt4 Wrapper
Requires: libpoppler-devel = %{version}
Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version}
Requires: libqt4-devel
++++++ poppler.spec ++++++
--- /var/tmp/diff_new_pack.Y7bXgY/_old 2012-01-06 11:46:41.000000000 +0100
+++ /var/tmp/diff_new_pack.Y7bXgY/_new 2012-01-06 11:46:41.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package poppler
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%define build_qt 0
Name: poppler
%define _name poppler
-Version: 0.18.1
-Release: 1
+Version: 0.18.2
+Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.2.1
%define poppler_soname 19
@@ -30,12 +29,12 @@
%define poppler_qt4_soname 3
%define poppler_api 0.18
Url: http://poppler.freedesktop.org/
-Group: System/Libraries
-License: GPL-2.0+
Summary: PDF Rendering Library
+License: GPL-2.0+
+Group: System/Libraries
Source: http://poppler.freedesktop.org/%{_name}-%{version}.tar.gz
-BuildRequires: gobject-introspection-devel
BuildRequires: gcc-c++
+BuildRequires: gobject-introspection-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
%if %build_qt
@@ -57,9 +56,9 @@
%package -n libpoppler%{poppler_soname}
+Summary: PDF Rendering Library
License: GPL-2.0
Group: System/Libraries
-Summary: PDF Rendering Library
# Last appeared in OpenSUSE 10.3:
Provides: poppler = %{version}
Obsoletes: poppler < %{version}
@@ -70,18 +69,18 @@
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-cpp%{poppler_cpp_soname}
+Summary: PDF Rendering Library
License: GPL-2.0
Group: System/Libraries
-Summary: PDF Rendering Library
%description -n libpoppler-cpp%{poppler_cpp_soname}
Poppler is a PDF rendering library, forked from the xpdf PDF viewer
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-glib%{poppler_glib_soname}
+Summary: PDF Rendering Library - GLib Wrapper
License: GPL-2.0+
Group: System/Libraries
-Summary: PDF Rendering Library - GLib Wrapper
Requires: libpoppler%{poppler_soname} >= %{version}
# Last appeared in OpenSUSE 10.3:
Provides: poppler-glib = %{version}
@@ -94,9 +93,9 @@
%if %build_qt
%package -n libpoppler-qt4-%{poppler_qt4_soname}
+Summary: PDF Rendering Library - Qt4 Wrapper
License: GPL-2.0+
Group: System/Libraries
-Summary: PDF Rendering Library - Qt4 Wrapper
Requires: libpoppler%{poppler_soname} >= %{version}
# Last appeared in OpenSUSE 10.3:
Provides: poppler-qt4 = %{version}
@@ -108,9 +107,9 @@
%endif
%package tools
+Summary: PDF Rendering Library Tools
License: GPL-2.0
Group: Productivity/Publishing/PDF
-Summary: PDF Rendering Library Tools
Requires: libpoppler%{poppler_soname} >= %{version}
# last version in openSUSE 11.1/SLE11
Provides: xpdf-tools = 3.02
@@ -122,9 +121,9 @@
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-devel
+Summary: PDF rendering library
License: GPL-2.0
Group: Development/Libraries/C and C++
-Summary: PDF rendering library
Requires: libpoppler%{poppler_soname} = %{version}
Requires: libstdc++-devel
# Last appeared in OpenSUSE 10.3:
@@ -136,9 +135,9 @@
developed by Derek Noonburg of Glyph and Cog, LLC.
%package -n libpoppler-glib-devel
+Summary: PDF rendering library - GLib Wrapper
License: GPL-2.0
Group: Development/Libraries/C and C++
-Summary: PDF rendering library - GLib Wrapper
Requires: libpoppler-glib%{poppler_glib_soname} = %{version}
# Last appeared in OpenSUSE 10.3:
Provides: poppler-devel:%{_libdir}/libpoppler-glib.so
@@ -156,9 +155,9 @@
%if %build_qt
%package -n libpoppler-qt4-devel
+Summary: PDF rendering library - Qt4 Wrapper
License: GPL-2.0+
Group: Development/Libraries/C and C++
-Summary: PDF rendering library - Qt4 Wrapper
Requires: libpoppler-devel = %{version}
Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version}
Requires: libqt4-devel
++++++ poppler-0.18.1.tar.gz -> poppler-0.18.2.tar.gz ++++++
++++ 2178 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.18.1/CMakeLists.txt new/poppler-0.18.2/CMakeLists.txt
--- old/poppler-0.18.1/CMakeLists.txt 2011-10-26 14:37:19.000000000 +0200
+++ new/poppler-0.18.2/CMakeLists.txt 2011-12-04 15:43:57.000000000 +0100
@@ -16,7 +16,7 @@
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "18")
-set(POPPLER_MICRO_VERSION "1")
+set(POPPLER_MICRO_VERSION "2")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -347,6 +347,7 @@
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+set(CMAKE_CXX_FLAGS "/Zc:wchar_t- ${CMAKE_CXX_FLAGS}")
add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
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.18.1/ChangeLog new/poppler-0.18.2/ChangeLog
--- old/poppler-0.18.1/ChangeLog 2011-10-26 14:47:28.000000000 +0200
+++ new/poppler-0.18.2/ChangeLog 2011-12-04 15:48:02.000000000 +0100
@@ -1,3 +1,195 @@
+commit 447a958ce43b697ab99084ba1371b989331c6ccc
+Author: Albert Astals Cid
+Date: Sun Dec 4 15:44:52 2011 +0100
+
+ 0.18.2
+
+ CMakeLists.txt | 2 +-
+ NEWS | 17 +++++++++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 5 files changed, 21 insertions(+), 4 deletions(-)
+
+commit 22601c2a64f094ede8085a3ccca3de9daaa556e7
+Author: Albert Astals Cid
+Date: Sun Dec 4 15:37:20 2011 +0100
+
+ update name and copyright
+
+ utils/pdftocairo.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit 51e5a67c913c0d6c83f5f6b358b7fca7bb5584e1
+Author: Axel Strübing
+Date: Thu Nov 24 22:32:57 2011 +0100
+
+ Fix typo/regression introduced in
+ f6d026bfa18624ccd321e102bb39ba744998de1e
+ (cherry picked from commit bdb439ac5a751d6146204ae0d61fdbf7828c89c3)
+
+ poppler/Gfx.cc | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+commit a44d572f38ae5994ceeba8272f38cb51eb583da5
+Author: Albert Astals Cid
+Date: Thu Nov 24 18:54:27 2011 +0100
+
+ Fix typo
+ (cherry picked from commit 74e11d8c912dd95d235e44e7b34b8ea1be082b9f)
+
+ qt4/src/poppler-qt4.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+commit f7d79774460697ca5665eb8b711a7bae0d2eacfc
+Author: Albert Astals Cid
+Date: Mon Nov 21 23:40:12 2011 +0100
+
+ qt4: Include QFile
+
+ We use it and the include is not there, WAndre reported it did not
+ compile for him without it
+
+ qt4/src/poppler-private.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 8bd54e8fcb3ef202fb985bca4c2c4a355594e11c
+Author: Albert Astals Cid
+Date: Mon Nov 14 13:22:53 2011 +0100
+
+ Make GfxColorSpace::parse accept dicts too
+ (cherry picked from commit a4c78946bc1fc3d52152af2e319051050ab05e28)
+
+ poppler/GfxState.cc | 14 +++++++++++++-
+ 1 files changed, 13 insertions(+), 1 deletions(-)
+
+commit 8b4d6056e0a56fec31ff648a01d88d5942f36b0b
+Author: Albert Astals Cid
+Date: Fri Nov 11 16:37:27 2011 +0100
+
+ Do not crash if failing to parse the colorspace
+
+ Fixes bug 42793
+ (cherry picked from commit f6d026bfa18624ccd321e102bb39ba744998de1e)
+
+ poppler/Gfx.cc | 52
+ +++++++++++++++++++++++++++++-----------------------
+ 1 files changed, 29 insertions(+), 23 deletions(-)
+
+commit 105142ed49d82ab8f3593fcd36769fab29b7a432
+Author: Kenji Uno
+Date: Wed Nov 9 12:39:41 2011 +0100
+
+ Fix leak in GooString when resizing
+
+ If resizing from "long" to shorter
+ (cherry picked from commit e7dbd17ff07afa465636a90f526cd7ac8c731862)
+
+ goo/GooString.cc | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+commit 145c9ae835bd5b0bdc97739c9b096121e3e7d43e
+Author: Carlos Garcia Campos
+Date: Sun Nov 6 15:44:06 2011 +0100
+
+ regtest: Skip tests with results when creating refs
+
+ Not only tests that have md5, but also crashed or failed tests.
+
+ regtest/TestReferences.py | 4 ++--
+ regtest/backends/__init__.py | 3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+commit d4da0fc45cf36c481570b37bf6c6938a45f70303
+Author: Albert Astals Cid
+Date: Wed Nov 2 20:20:41 2011 +0100
+
+ Compile with MSVC needed for last change in the qt4 frontend
+ (cherry picked from commit 955cd0c7bd3a72340deba098f4242a4904adc60f)
+
+ CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+commit 5294d0b017ce6643207fce5cc9e85ba4e29f4d86
+Author: Hib Eris
+Date: Tue Nov 1 14:15:09 2011 +0100
+
+ qt4: Use PDFDoc(wchar_t *, ...) on Windows
+
+ Bug 35378
+ (cherry picked from commit e0f5bc1deebaa9861baffd7c9ba31ea31585cd1d)
+
+ qt4/src/poppler-document.cc | 6 +++---
+ qt4/src/poppler-private.h | 17 +++++++++++++++--
+ 2 files changed, 18 insertions(+), 5 deletions(-)
+
+commit 372dc1ef79983f51c1eac52d211d7569a305a273
+Author: Carlos Garcia Campos
+Date: Tue Nov 1 14:13:10 2011 +0100
+
+ regtest: Add --update-refs command line option to run-tests command
+
+ It allows to update the references of failing tests.
+
+ regtest/TestRun.py | 2 +-
+ regtest/backends/__init__.py | 34 ++++++++++++++++++++++++++++++++--
+ regtest/commands/run-tests.py | 4 ++++
+ 3 files changed, 37 insertions(+), 3 deletions(-)
+
+commit ebf7fbc74da10d1bc423d33b26e30166870642e4
+Author: Rex Dieter
+Date: Tue Nov 1 09:40:53 2011 +0100
+
+ Fix pkg-config files
+
+ We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
+
+ configure.ac | 1 +
+ poppler-glib-uninstalled.pc.in | 2 +-
+ poppler-glib.pc.cmake | 2 +-
+ poppler-glib.pc.in | 2 +-
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+commit 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015
+Author: Carlos Garcia Campos
+Date: Sun Oct 30 16:08:46 2011 +0100
+
+ pdftocairo: Use fisrtPage instead of uninitialized pg variable
+
+ This fixes an error in my previous commit.
+
+ utils/pdftocairo.cc | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit e4a2adb02969e872e37e408ced4c39131c6751ea
+Author: Carlos Garcia Campos
+Date: Sun Oct 30 16:02:19 2011 +0100
+
+ pdftocairo: Make sure beginDocument() is always called
+
+ This fixes a crash when rendering only odd/even pages in a printing
+ format.
+
+ utils/pdftocairo.cc | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+commit 124a5a471ebae8c268c6b920722be6b22b8c1c2d
+Author: Albert Astals Cid
+Date: Wed Oct 26 15:30:27 2011 +0200
+
+ 0.18.1
+
+ CMakeLists.txt | 4 +-
+ NEWS | 21 ++++++++++
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ gtk-doc.make | 112
+ +++++++++++++++++++++++++++++----------------------
+ m4/gtk-doc.m4 | 6 +++
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 8 files changed, 97 insertions(+), 54 deletions(-)
+
commit 6d571cc2ce129c4477d394de3ee2c8ad83f18535
Author: Albert Astals Cid
Date: Wed Oct 26 14:26:38 2011 +0200
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.18.1/NEWS new/poppler-0.18.2/NEWS
--- old/poppler-0.18.1/NEWS 2011-10-26 14:34:08.000000000 +0200
+++ new/poppler-0.18.2/NEWS 2011-12-04 15:43:34.000000000 +0100
@@ -1,3 +1,20 @@
+Release 0.18.2
+ core:
+ * Fix leak in GooString when resizing to a smaller string
+ * Fix crash if failing to parse the colorspace. Bug #42793
+ * Make GfxColorSpace::parse accept dicts
+
+ qt4:
+ * Use PDFDoc(wchar_t *, ...) on Windows. Bug #35378
+ * Add missing include
+ * Minor fixes in documentation
+
+ utils:
+ * pdftocairo: Fix crash when rendering only odd/even pages in a printing format
+
+ build system:
+ * Fix pkg-config files
+
Release 0.18.1
core:
* PSOutputDev: Output PS that does not confuse libspectre
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.18.1/configure.ac new/poppler-0.18.2/configure.ac
--- old/poppler-0.18.1/configure.ac 2011-10-26 14:34:22.000000000 +0200
+++ new/poppler-0.18.2/configure.ac 2011-12-04 15:43:49.000000000 +0100
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[18])
-m4_define([poppler_version_micro],[1])
+m4_define([poppler_version_micro],[2])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
@@ -409,6 +409,7 @@
POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
GLIB_REQUIRED=2.18
+ AC_SUBST(GLIB_REQUIRED)
AC_ARG_ENABLE(poppler-glib,
AC_HELP_STRING([--disable-poppler-glib],
[Don't compile poppler glib wrapper.]),
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.18.1/cpp/poppler-version.h new/poppler-0.18.2/cpp/poppler-version.h
--- old/poppler-0.18.1/cpp/poppler-version.h 2011-10-26 14:40:21.000000000 +0200
+++ new/poppler-0.18.2/cpp/poppler-version.h 2011-12-04 15:46:47.000000000 +0100
@@ -21,10 +21,10 @@
#include "poppler-global.h"
-#define POPPLER_VERSION "0.18.1"
+#define POPPLER_VERSION "0.18.2"
#define POPPLER_VERSION_MAJOR 0
#define POPPLER_VERSION_MINOR 18
-#define POPPLER_VERSION_MICRO 1
+#define POPPLER_VERSION_MICRO 2
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.18.1/glib/reference/html/PopplerAnnot.html new/poppler-0.18.2/glib/reference/html/PopplerAnnot.html
--- old/poppler-0.18.1/glib/reference/html/PopplerAnnot.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerAnnot.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerAnnot</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerFormField.html" title="PoppplerFormField">
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.18.1/glib/reference/html/PopplerAttachment.html new/poppler-0.18.2/glib/reference/html/PopplerAttachment.html
--- old/poppler-0.18.1/glib/reference/html/PopplerAttachment.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerAttachment.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerAttachment</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="poppler-PopplerAction.html" title="PopplerAction">
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.18.1/glib/reference/html/PopplerDocument.html new/poppler-0.18.2/glib/reference/html/PopplerDocument.html
--- old/poppler-0.18.1/glib/reference/html/PopplerDocument.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerDocument.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerDocument</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="poppler-poppler.html" title="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.18.1/glib/reference/html/PopplerFormField.html new/poppler-0.18.2/glib/reference/html/PopplerFormField.html
--- old/poppler-0.18.1/glib/reference/html/PopplerFormField.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerFormField.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PoppplerFormField</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerAttachment.html" title="PopplerAttachment">
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.18.1/glib/reference/html/PopplerLayer.html new/poppler-0.18.2/glib/reference/html/PopplerLayer.html
--- old/poppler-0.18.1/glib/reference/html/PopplerLayer.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerLayer.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerLayer</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerAnnot.html" title="PopplerAnnot">
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.18.1/glib/reference/html/PopplerMedia.html new/poppler-0.18.2/glib/reference/html/PopplerMedia.html
--- old/poppler-0.18.1/glib/reference/html/PopplerMedia.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerMedia.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerMedia</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerLayer.html" title="PopplerLayer">
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.18.1/glib/reference/html/PopplerMovie.html new/poppler-0.18.2/glib/reference/html/PopplerMovie.html
--- old/poppler-0.18.1/glib/reference/html/PopplerMovie.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerMovie.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerMovie</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerMedia.html" title="PopplerMedia">
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.18.1/glib/reference/html/PopplerPage.html new/poppler-0.18.2/glib/reference/html/PopplerPage.html
--- old/poppler-0.18.1/glib/reference/html/PopplerPage.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/PopplerPage.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerPage</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerDocument.html" title="PopplerDocument">
@@ -68,25 +68,25 @@
<span class="returnvalue">gboolean</span> <a class="link" href="PopplerPage.html#poppler-page-get-thumbnail-size" title="poppler_page_get_thumbnail_size ()">poppler_page_get_thumbnail_size</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
<em class="parameter"><code><span class="type">int</span> *width</code></em>,
<em class="parameter"><code><span class="type">int</span> *height</code></em>);
-<a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html#cairo-surface-t"><span class="returnvalue">cairo_surface_t</span></a> * <a class="link" href="PopplerPage.html#poppler-page-get-thumbnail" title="poppler_page_get_thumbnail ()">poppler_page_get_thumbnail</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>);
+<span class="returnvalue">cairo_surface_t</span> * <a class="link" href="PopplerPage.html#poppler-page-get-thumbnail" title="poppler_page_get_thumbnail ()">poppler_page_get_thumbnail</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>);
<span class="returnvalue">void</span> <a class="link" href="PopplerPage.html#poppler-page-render" title="poppler_page_render ()">poppler_page_render</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>);
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>);
<span class="returnvalue">void</span> <a class="link" href="PopplerPage.html#poppler-page-render-for-printing" title="poppler_page_render_for_printing ()">poppler_page_render_for_printing</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>);
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>);
<span class="returnvalue">void</span> <a class="link" href="PopplerPage.html#poppler-page-render-for-printing-with-options" title="poppler_page_render_for_printing_with_options ()">poppler_page_render_for_printing_with_options</a>
(<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>,
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>,
<em class="parameter"><code><a class="link" href="poppler-poppler.html#PopplerPrintFlags" title="enum PopplerPrintFlags"><span class="type">PopplerPrintFlags</span></a> options</code></em>);
<span class="returnvalue">void</span> <a class="link" href="PopplerPage.html#poppler-page-render-to-ps" title="poppler_page_render_to_ps ()">poppler_page_render_to_ps</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
<em class="parameter"><code><a class="link" href="PopplerDocument.html#PopplerPSFile" title="PopplerPSFile"><span class="type">PopplerPSFile</span></a> *ps_file</code></em>);
<span class="returnvalue">void</span> <a class="link" href="PopplerPage.html#poppler-page-render-selection" title="poppler_page_render_selection ()">poppler_page_render_selection</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>,
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> *selection</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> *old_selection</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerSelectionStyle" title="enum PopplerSelectionStyle"><span class="type">PopplerSelectionStyle</span></a> style</code></em>,
<em class="parameter"><code><a class="link" href="poppler-poppler.html#PopplerColor" title="PopplerColor"><span class="type">PopplerColor</span></a> *glyph_color</code></em>,
<em class="parameter"><code><a class="link" href="poppler-poppler.html#PopplerColor" title="PopplerColor"><span class="type">PopplerColor</span></a> *background_color</code></em>);
-<a href="/usr/share/gtk-doc/html/cairo/cairo-Regions.html#cairo-region-t"><span class="returnvalue">cairo_region_t</span></a> * <a class="link" href="PopplerPage.html#poppler-page-get-selected-region" title="poppler_page_get_selected_region ()">poppler_page_get_selected_region</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
+<span class="returnvalue">cairo_region_t</span> * <a class="link" href="PopplerPage.html#poppler-page-get-selected-region" title="poppler_page_get_selected_region ()">poppler_page_get_selected_region</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
<em class="parameter"><code><span class="type">gdouble</span> scale</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerSelectionStyle" title="enum PopplerSelectionStyle"><span class="type">PopplerSelectionStyle</span></a> style</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> *selection</code></em>);
@@ -109,7 +109,7 @@
<span class="returnvalue">GList</span> * <a class="link" href="PopplerPage.html#poppler-page-get-link-mapping" title="poppler_page_get_link_mapping ()">poppler_page_get_link_mapping</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>);
<span class="returnvalue">void</span> <a class="link" href="PopplerPage.html#poppler-page-free-link-mapping" title="poppler_page_free_link_mapping ()">poppler_page_free_link_mapping</a> (<em class="parameter"><code><span class="type">GList</span> *list</code></em>);
<span class="returnvalue">GList</span> * <a class="link" href="PopplerPage.html#poppler-page-get-image-mapping" title="poppler_page_get_image_mapping ()">poppler_page_get_image_mapping</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>);
-<a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html#cairo-surface-t"><span class="returnvalue">cairo_surface_t</span></a> * <a class="link" href="PopplerPage.html#poppler-page-get-image" title="poppler_page_get_image ()">poppler_page_get_image</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
+<span class="returnvalue">cairo_surface_t</span> * <a class="link" href="PopplerPage.html#poppler-page-get-image" title="poppler_page_get_image ()">poppler_page_get_image</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
<em class="parameter"><code><span class="type">gint</span> image_id</code></em>);
<span class="returnvalue">void</span> <a class="link" href="PopplerPage.html#poppler-page-free-image-mapping" title="poppler_page_free_image_mapping ()">poppler_page_free_image_mapping</a> (<em class="parameter"><code><span class="type">GList</span> *list</code></em>);
<span class="returnvalue">GList</span> * <a class="link" href="PopplerPage.html#poppler-page-get-form-field-mapping" title="poppler_page_get_form_field_mapping ()">poppler_page_get_form_field_mapping</a> (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>);
@@ -781,7 +781,7 @@
<hr>
<div class="refsect2">
<a name="poppler-page-get-thumbnail"></a><h3>poppler_page_get_thumbnail ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html#cairo-surface-t"><span class="returnvalue">cairo_surface_t</span></a> * poppler_page_get_thumbnail (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>);</pre>
+<pre class="programlisting"><span class="returnvalue">cairo_surface_t</span> * poppler_page_get_thumbnail (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>);</pre>
<p>
Get the embedded thumbnail for the specified page. If the document
doesn't have an embedded thumbnail for the page, this function
@@ -806,7 +806,7 @@
<div class="refsect2">
<a name="poppler-page-render"></a><h3>poppler_page_render ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> poppler_page_render (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>);</pre>
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>);</pre>
<p>
Render the page to the given cairo context. This function
is for rendering a page that will be displayed. If you want
@@ -831,7 +831,7 @@
<div class="refsect2">
<a name="poppler-page-render-for-printing"></a><h3>poppler_page_render_for_printing ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> poppler_page_render_for_printing (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>);</pre>
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>);</pre>
<p>
Render the page to the given cairo context for printing.
</p>
@@ -854,7 +854,7 @@
<a name="poppler-page-render-for-printing-with-options"></a><h3>poppler_page_render_for_printing_with_options ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> poppler_page_render_for_printing_with_options
(<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>,
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>,
<em class="parameter"><code><a class="link" href="poppler-poppler.html#PopplerPrintFlags" title="enum PopplerPrintFlags"><span class="type">PopplerPrintFlags</span></a> options</code></em>);</pre>
<p>
Render the page to the given cairo context for printing
@@ -906,7 +906,7 @@
<div class="refsect2">
<a name="poppler-page-render-selection"></a><h3>poppler_page_render_selection ()</h3>
<pre class="programlisting"><span class="returnvalue">void</span> poppler_page_render_selection (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
- <em class="parameter"><code><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> *cairo</code></em>,
+ <em class="parameter"><code><span class="type">cairo_t</span> *cairo</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> *selection</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> *old_selection</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerSelectionStyle" title="enum PopplerSelectionStyle"><span class="type">PopplerSelectionStyle</span></a> style</code></em>,
@@ -961,7 +961,7 @@
<hr>
<div class="refsect2">
<a name="poppler-page-get-selected-region"></a><h3>poppler_page_get_selected_region ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/cairo/cairo-Regions.html#cairo-region-t"><span class="returnvalue">cairo_region_t</span></a> * poppler_page_get_selected_region (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
+<pre class="programlisting"><span class="returnvalue">cairo_region_t</span> * poppler_page_get_selected_region (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
<em class="parameter"><code><span class="type">gdouble</span> scale</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerSelectionStyle" title="enum PopplerSelectionStyle"><span class="type">PopplerSelectionStyle</span></a> style</code></em>,
<em class="parameter"><code><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> *selection</code></em>);</pre>
@@ -969,7 +969,7 @@
Returns a region containing the area that would be rendered by
<a class="link" href="PopplerPage.html#poppler-page-render-selection" title="poppler_page_render_selection ()"><code class="function">poppler_page_render_selection()</code></a> or
<code class="function">poppler_page_render_selection_to_pixbuf()</code>.
-The returned region must be freed with <a href="/usr/share/gtk-doc/html/cairo/cairo-Regions.html#cairo-region-destroy"><code class="function">cairo_region_destroy()</code></a>
+The returned region must be freed with <code class="function">cairo_region_destroy()</code>
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -1302,7 +1302,7 @@
<hr>
<div class="refsect2">
<a name="poppler-page-get-image"></a><h3>poppler_page_get_image ()</h3>
-<pre class="programlisting"><a href="/usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html#cairo-surface-t"><span class="returnvalue">cairo_surface_t</span></a> * poppler_page_get_image (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
+<pre class="programlisting"><span class="returnvalue">cairo_surface_t</span> * poppler_page_get_image (<em class="parameter"><code><a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> *page</code></em>,
<em class="parameter"><code><span class="type">gint</span> image_id</code></em>);</pre>
<p>
Returns a cairo surface for the image of the <em class="parameter"><code>page</code></em>
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.18.1/glib/reference/html/annotation-glossary.html new/poppler-0.18.2/glib/reference/html/annotation-glossary.html
--- old/poppler-0.18.1/glib/reference/html/annotation-glossary.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/annotation-glossary.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Annotation Glossary</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="index.html" title="Poppler Reference Manual">
<link rel="prev" href="api-index-0-16.html" title="Index of new symbols in 0.16">
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.18.1/glib/reference/html/api-index-0-12.html new/poppler-0.18.2/glib/reference/html/api-index-0-12.html
--- old/poppler-0.18.1/glib/reference/html/api-index-0-12.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/api-index-0-12.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.12</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="index.html" title="Poppler Reference Manual">
<link rel="prev" href="api-index-deprecated.html" title="Index of deprecated symbols">
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.18.1/glib/reference/html/api-index-0-14.html new/poppler-0.18.2/glib/reference/html/api-index-0-14.html
--- old/poppler-0.18.1/glib/reference/html/api-index-0-14.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/api-index-0-14.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.14</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="index.html" title="Poppler Reference Manual">
<link rel="prev" href="api-index-0-12.html" title="Index of new symbols in 0.12">
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.18.1/glib/reference/html/api-index-0-16.html new/poppler-0.18.2/glib/reference/html/api-index-0-16.html
--- old/poppler-0.18.1/glib/reference/html/api-index-0-16.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/api-index-0-16.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of new symbols in 0.16</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="index.html" title="Poppler Reference Manual">
<link rel="prev" href="api-index-0-14.html" title="Index of new symbols in 0.14">
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.18.1/glib/reference/html/api-index-deprecated.html new/poppler-0.18.2/glib/reference/html/api-index-deprecated.html
--- old/poppler-0.18.1/glib/reference/html/api-index-deprecated.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/api-index-deprecated.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of deprecated symbols</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="index.html" title="Poppler Reference Manual">
<link rel="prev" href="api-index-full.html" title="Index of all symbols">
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.18.1/glib/reference/html/api-index-full.html new/poppler-0.18.2/glib/reference/html/api-index-full.html
--- old/poppler-0.18.1/glib/reference/html/api-index-full.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/api-index-full.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Index of all symbols</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="index.html" title="Poppler Reference Manual">
<link rel="prev" href="poppler-Version-and-Features-Information.html" title="Version and Features Information">
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.18.1/glib/reference/html/ch01.html new/poppler-0.18.2/glib/reference/html/ch01.html
--- old/poppler-0.18.1/glib/reference/html/ch01.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/ch01.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Poppler</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="index.html" title="Poppler Reference Manual">
<link rel="prev" href="index.html" title="Poppler Reference Manual">
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="id538739"></a>Poppler</h2></div></div></div>
+<a name="idp142000"></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>
Files old/poppler-0.18.1/glib/reference/html/home.png and new/poppler-0.18.2/glib/reference/html/home.png differ
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.18.1/glib/reference/html/index.html new/poppler-0.18.2/glib/reference/html/index.html
--- old/poppler-0.18.1/glib/reference/html/index.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/index.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Poppler Reference Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="next" href="ch01.html" title="Poppler">
<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Poppler Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for Poppler 0.18.1
+ for Poppler 0.18.2
</p></div>
</div>
Files old/poppler-0.18.1/glib/reference/html/left.png and new/poppler-0.18.2/glib/reference/html/left.png differ
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.18.1/glib/reference/html/poppler-PopplerAction.html new/poppler-0.18.2/glib/reference/html/poppler-PopplerAction.html
--- old/poppler-0.18.1/glib/reference/html/poppler-PopplerAction.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/poppler-PopplerAction.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>PopplerAction</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerPage.html" title="PopplerPage">
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.18.1/glib/reference/html/poppler-Version-and-Features-Information.html new/poppler-0.18.2/glib/reference/html/poppler-Version-and-Features-Information.html
--- old/poppler-0.18.1/glib/reference/html/poppler-Version-and-Features-Information.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/poppler-Version-and-Features-Information.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Version and Features Information</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="PopplerMovie.html" title="PopplerMovie">
@@ -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 (1)
+<pre class="programlisting">#define POPPLER_MICRO_VERSION (2)
</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.18.1/glib/reference/html/poppler-poppler.html new/poppler-0.18.2/glib/reference/html/poppler-poppler.html
--- old/poppler-0.18.1/glib/reference/html/poppler-poppler.html 2011-10-26 14:47:31.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/html/poppler-poppler.html 2011-12-04 15:48:04.000000000 +0100
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>poppler</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Poppler Reference Manual">
<link rel="up" href="ch01.html" title="Poppler">
<link rel="prev" href="ch01.html" title="Poppler">
Files old/poppler-0.18.1/glib/reference/html/right.png and new/poppler-0.18.2/glib/reference/html/right.png differ
Files old/poppler-0.18.1/glib/reference/html/up.png and new/poppler-0.18.2/glib/reference/html/up.png differ
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.18.1/glib/reference/version.xml new/poppler-0.18.2/glib/reference/version.xml
--- old/poppler-0.18.1/glib/reference/version.xml 2011-10-26 14:40:21.000000000 +0200
+++ new/poppler-0.18.2/glib/reference/version.xml 2011-12-04 15:46:46.000000000 +0100
@@ -1 +1 @@
-0.18.1
+0.18.2
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.18.1/goo/GooString.cc new/poppler-0.18.2/goo/GooString.cc
--- old/poppler-0.18.1/goo/GooString.cc 2011-09-28 15:42:50.000000000 +0200
+++ new/poppler-0.18.2/goo/GooString.cc 2011-11-22 22:33:05.000000000 +0100
@@ -19,6 +19,7 @@
// Copyright (C) 2006 Krzysztof Kowalczyk
// Copyright (C) 2007 Jeff Muizelaar
// Copyright (C) 2008-2011 Albert Astals Cid
+// Copyright (C) 2011 Kenji Uno
//
// 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
@@ -129,6 +130,8 @@
} else {
memcpy(s1, s, length);
}
+ if (s != sStatic)
+ gfree(s);
}
}
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.18.1/poppler/Gfx.cc new/poppler-0.18.2/poppler/Gfx.cc
--- old/poppler-0.18.1/poppler/Gfx.cc 2011-09-28 15:42:50.000000000 +0200
+++ new/poppler-0.18.2/poppler/Gfx.cc 2011-11-24 22:35:18.000000000 +0100
@@ -33,6 +33,7 @@
// Copyright (C) 2009, 2010 David Benjamin
// Copyright (C) 2010 Nils Höglund
// Copyright (C) 2010 Christian Feuersänger
+// Copyright (C) 2011 Axel Strübing
//
// 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
@@ -1319,7 +1320,7 @@
void Gfx::opSetFillGray(Object args[], int numArgs) {
GfxColor color;
- GfxColorSpace *colorSpace;
+ GfxColorSpace *colorSpace = NULL;
Object obj;
if (textHaveCSPattern && drawText) {
@@ -1332,11 +1333,12 @@
}
state->setFillPattern(NULL);
res->lookupColorSpace("DefaultGray", &obj);
- if (obj.isNull()) {
- colorSpace = new GfxDeviceGrayColorSpace();
- } else {
+ if (!obj.isNull()) {
colorSpace = GfxColorSpace::parse(&obj, this);
}
+ if (colorSpace == NULL) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ }
obj.free();
state->setFillColorSpace(colorSpace);
out->updateFillColorSpace(state);
@@ -1354,16 +1356,17 @@
void Gfx::opSetStrokeGray(Object args[], int numArgs) {
GfxColor color;
- GfxColorSpace *colorSpace;
+ GfxColorSpace *colorSpace = NULL;
Object obj;
state->setStrokePattern(NULL);
res->lookupColorSpace("DefaultGray", &obj);
- if (obj.isNull()) {
- colorSpace = new GfxDeviceGrayColorSpace();
- } else {
+ if (!obj.isNull()) {
colorSpace = GfxColorSpace::parse(&obj, this);
}
+ if (colorSpace == NULL) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ }
obj.free();
state->setStrokeColorSpace(colorSpace);
out->updateStrokeColorSpace(state);
@@ -1374,7 +1377,7 @@
void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
GfxColor color;
- GfxColorSpace *colorSpace;
+ GfxColorSpace *colorSpace = NULL;
Object obj;
int i;
@@ -1387,11 +1390,12 @@
out->restoreState(state);
}
res->lookupColorSpace("DefaultCMYK", &obj);
- if (obj.isNull()) {
- colorSpace = new GfxDeviceCMYKColorSpace();
- } else {
+ if (!obj.isNull()) {
colorSpace = GfxColorSpace::parse(&obj, this);
}
+ if (colorSpace == NULL) {
+ colorSpace = new GfxDeviceCMYKColorSpace();
+ }
obj.free();
state->setFillPattern(NULL);
state->setFillColorSpace(colorSpace);
@@ -1412,17 +1416,18 @@
void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
GfxColor color;
- GfxColorSpace *colorSpace;
+ GfxColorSpace *colorSpace = NULL;
Object obj;
int i;
state->setStrokePattern(NULL);
res->lookupColorSpace("DefaultCMYK", &obj);
- if (obj.isNull()) {
- colorSpace = new GfxDeviceCMYKColorSpace();
- } else {
+ if (!obj.isNull()) {
colorSpace = GfxColorSpace::parse(&obj, this);
}
+ if (colorSpace == NULL) {
+ colorSpace = new GfxDeviceCMYKColorSpace();
+ }
obj.free();
state->setStrokeColorSpace(colorSpace);
out->updateStrokeColorSpace(state);
@@ -1435,7 +1440,7 @@
void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
Object obj;
- GfxColorSpace *colorSpace;
+ GfxColorSpace *colorSpace = NULL;
GfxColor color;
int i;
@@ -1449,11 +1454,12 @@
}
state->setFillPattern(NULL);
res->lookupColorSpace("DefaultRGB", &obj);
- if (obj.isNull()) {
- colorSpace = new GfxDeviceRGBColorSpace();
- } else {
+ if (!obj.isNull()) {
colorSpace = GfxColorSpace::parse(&obj, this);
}
+ if (colorSpace == NULL) {
+ colorSpace = new GfxDeviceRGBColorSpace();
+ }
obj.free();
state->setFillColorSpace(colorSpace);
out->updateFillColorSpace(state);
@@ -1473,17 +1479,18 @@
void Gfx::opSetStrokeRGBColor(Object args[], int numArgs) {
Object obj;
- GfxColorSpace *colorSpace;
+ GfxColorSpace *colorSpace = NULL;
GfxColor color;
int i;
state->setStrokePattern(NULL);
res->lookupColorSpace("DefaultRGB", &obj);
- if (obj.isNull()) {
- colorSpace = new GfxDeviceRGBColorSpace();
- } else {
+ if (!obj.isNull()) {
colorSpace = GfxColorSpace::parse(&obj, this);
}
+ if (colorSpace == NULL) {
+ colorSpace = new GfxDeviceRGBColorSpace();
+ }
obj.free();
state->setStrokeColorSpace(colorSpace);
out->updateStrokeColorSpace(state);
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.18.1/poppler/GfxState.cc new/poppler-0.18.2/poppler/GfxState.cc
--- old/poppler-0.18.1/poppler/GfxState.cc 2011-09-28 15:42:50.000000000 +0200
+++ new/poppler-0.18.2/poppler/GfxState.cc 2011-11-22 22:33:12.000000000 +0100
@@ -257,8 +257,20 @@
error(-1, "Bad color space");
}
obj1.free();
+ } else if (csObj->isDict()) {
+ csObj->dictLookup("ColorSpace", &obj1);
+ if (obj1.isName("DeviceGray")) {
+ cs = new GfxDeviceGrayColorSpace();
+ } else if (obj1.isName("DeviceRGB")) {
+ cs = new GfxDeviceRGBColorSpace();
+ } else if (obj1.isName("DeviceCMYK")) {
+ cs = new GfxDeviceCMYKColorSpace();
+ } else {
+ error(-1, "Bad color space '%s'", csObj->getName());
+ }
+ obj1.free();
} else {
- error(-1, "Bad color space - expected name or array");
+ error(-1, "Bad color space - expected name, array or dict");
}
return cs;
}
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.18.1/poppler-glib-uninstalled.pc.in new/poppler-0.18.2/poppler-glib-uninstalled.pc.in
--- old/poppler-0.18.1/poppler-glib-uninstalled.pc.in 2011-10-17 13:42:29.000000000 +0200
+++ new/poppler-0.18.2/poppler-glib-uninstalled.pc.in 2011-11-22 22:33:09.000000000 +0100
@@ -1,7 +1,7 @@
Name: poppler-glib
Description: GLib wrapper for poppler - uninstalled
Version: @VERSION@
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/glib
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.18.1/poppler-glib.pc.cmake new/poppler-0.18.2/poppler-glib.pc.cmake
--- old/poppler-0.18.1/poppler-glib.pc.cmake 2011-10-17 13:42:29.000000000 +0200
+++ new/poppler-0.18.2/poppler-glib.pc.cmake 2011-11-22 22:33:09.000000000 +0100
@@ -6,7 +6,7 @@
Name: poppler-glib
Description: GLib wrapper for poppler
Version: @POPPLER_VERSION@
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-glib
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.18.1/poppler-glib.pc.in new/poppler-0.18.2/poppler-glib.pc.in
--- old/poppler-0.18.1/poppler-glib.pc.in 2011-10-17 13:42:29.000000000 +0200
+++ new/poppler-0.18.2/poppler-glib.pc.in 2011-11-22 22:33:09.000000000 +0100
@@ -6,7 +6,7 @@
Name: poppler-glib
Description: GLib wrapper for poppler
Version: @VERSION@
-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION
+Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@
@PC_REQUIRES_PRIVATE@
Libs: -L${libdir} -lpoppler-glib
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.18.1/qt4/src/poppler-document.cc new/poppler-0.18.2/qt4/src/poppler-document.cc
--- old/poppler-0.18.1/qt4/src/poppler-document.cc 2011-10-19 15:41:55.000000000 +0200
+++ new/poppler-0.18.2/qt4/src/poppler-document.cc 2011-11-22 22:33:21.000000000 +0100
@@ -3,7 +3,7 @@
* Copyright (C) 2005, 2008, Brad Hards
* Copyright (C) 2005-2010, Albert Astals Cid
* Copyright (C) 2006-2010, Pino Toscano
- * Copyright (C) 2010 Hib Eris
+ * Copyright (C) 2010, 2011 Hib Eris
*
* 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
@@ -50,7 +50,7 @@
Document *Document::load(const QString &filePath, const QByteArray &ownerPassword,
const QByteArray &userPassword)
{
- DocumentData *doc = new DocumentData(new GooString(QFile::encodeName(filePath)),
+ DocumentData *doc = new DocumentData(filePath,
new GooString(ownerPassword.data()),
new GooString(userPassword.data()));
return DocumentData::checkDocument(doc);
@@ -128,7 +128,7 @@
}
else
{
- doc2 = new DocumentData(new GooString(m_doc->doc->getFileName()),
+ doc2 = new DocumentData(m_doc->m_filePath,
new GooString(ownerPassword.data()),
new GooString(userPassword.data()));
}
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.18.1/qt4/src/poppler-private.h new/poppler-0.18.2/qt4/src/poppler-private.h
--- old/poppler-0.18.1/qt4/src/poppler-private.h 2011-10-19 15:41:55.000000000 +0200
+++ new/poppler-0.18.2/qt4/src/poppler-private.h 2011-11-22 22:33:23.000000000 +0100
@@ -4,6 +4,7 @@
* Copyright (C) 2006-2009, 2011 by Albert Astals Cid
* Copyright (C) 2007-2009, 2011 by Pino Toscano
* Copyright (C) 2011 Andreas Hartmetz
+ * Copyright (C) 2011 Hib Eris
* Inspired on code by
* Copyright (C) 2004 by Albert Astals Cid
* Copyright (C) 2004 by Enrico Ros
@@ -26,6 +27,7 @@
#ifndef _POPPLER_PRIVATE_H_
#define _POPPLER_PRIVATE_H_
+#include
#include
#include
@@ -75,10 +77,21 @@
class DocumentData {
public:
- DocumentData(GooString *filePath, GooString *ownerPassword, GooString *userPassword)
+ DocumentData(const QString &filePath, GooString *ownerPassword, GooString *userPassword)
{
init();
- doc = new PDFDoc(filePath, ownerPassword, userPassword);
+ m_filePath = filePath;
+
+#if defined(_WIN32)
+ wchar_t *fileName = new WCHAR[filePath.length()];
+ int length = filePath.toWCharArray(fileName);
+ doc = new PDFDoc(fileName, length, ownerPassword, userPassword);
+ delete fileName;
+#else
+ GooString *fileName = new GooString(QFile::encodeName(filePath));
+ doc = new PDFDoc(fileName, ownerPassword, userPassword);
+#endif
+
delete ownerPassword;
delete userPassword;
}
@@ -173,6 +186,7 @@
static Document *checkDocument(DocumentData *doc);
PDFDoc *doc;
+ QString m_filePath;
QByteArray fileContents;
bool locked;
FontIterator *m_fontInfoIterator;
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.18.1/qt4/src/poppler-qt4.h new/poppler-0.18.2/qt4/src/poppler-qt4.h
--- old/poppler-0.18.1/qt4/src/poppler-qt4.h 2011-10-01 15:33:11.000000000 +0200
+++ new/poppler-0.18.2/qt4/src/poppler-qt4.h 2011-11-24 19:05:53.000000000 +0100
@@ -618,12 +618,12 @@
QList textList(Rotation rotate = Rotate0) const;
/**
- \return The dimensions (cropbox) of the page, in points (i.e. 1/72th on an inch)
+ \return The dimensions (cropbox) of the page, in points (i.e. 1/72th of an inch)
*/
QSizeF pageSizeF() const;
/**
- \return The dimensions (cropbox) of the page, in points (i.e. 1/72th on an inch)
+ \return The dimensions (cropbox) of the page, in points (i.e. 1/72th of an inch)
*/
QSize pageSize() const;
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.18.1/utils/pdftocairo.cc new/poppler-0.18.2/utils/pdftocairo.cc
--- old/poppler-0.18.1/utils/pdftocairo.cc 2011-10-17 13:42:30.000000000 +0200
+++ new/poppler-0.18.2/utils/pdftocairo.cc 2011-12-04 15:36:13.000000000 +0100
@@ -1,6 +1,6 @@
//========================================================================
//
-// pdftoppm.cc
+// pdftocairo.cc
//
// Copyright 2003 Glyph & Cog, LLC
//
@@ -24,6 +24,7 @@
// Copyright (C) 2010 Jonathan Liu
// Copyright (C) 2010 William Bader
// Copyright (C) 2011 Thomas Freitag
+// Copyright (C) 2011 Carlos Garcia Campos
//
// 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
@@ -903,6 +904,10 @@
lastPage = firstPage;
}
+ // Make sure firstPage is always used so that beginDocument() is called
+ if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1))
+ firstPage++;
+
cairoOut = new CairoOutputDev();
cairoOut->startDoc(doc->getXRef(), doc->getCatalog());
if (sz != 0)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org