Imported Upstream version 0.24.1upstream/0.24.1_1upstream/0.24.1sandbox/pcoval/previous/upstream

Change-Id: Ie73a6244818bc011a430fddd58ebf7b59660fb8d

322 files changed, 51827 insertions, 16101 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b439153d..96fb5da0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,9 +13,11 @@ include(MacroBoolTo01)
 find_package(Threads)
 include(TestBigEndian)
 test_big_endian(WORDS_BIGENDIAN)
+include(CheckFileOffsetBits)
+CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "22")
+set(POPPLER_MINOR_VERSION "24")
 set(POPPLER_MICRO_VERSION "1")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -23,6 +25,7 @@ set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER
 option(ENABLE_XPDF_HEADERS "Install unsupported xpdf headers." OFF)
 option(BUILD_GTK_TESTS "Whether compile the GTK+ test programs." ON)
 option(BUILD_QT4_TESTS "Whether compile the Qt4 test programs." ON)
+option(BUILD_QT5_TESTS "Whether compile the Qt5 test programs." ON)
 option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
 option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
 option(ENABLE_UTILS "Compile poppler command line utils." ON)
@@ -99,6 +102,23 @@ if(JPEG_FOUND)
   set(ENABLE_LIBJPEG ${JPEG_FOUND})
 endif(JPEG_FOUND)
 macro_optional_find_package(Qt4)
+if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+  find_package(Qt5Core)
+  find_package(Qt5Gui)
+  find_package(Qt5Xml)
+  find_package(Qt5Widgets)
+  find_package(Qt5Test)
+  if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
+    set(QT5_FOUND true)
+  else ()
+    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
+    set(QT5_FOUND false)
+  endif()
+else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+  set(QT5_FOUND false)
+  message("-- CMake >= 2.8.8 is needed to enable Qt5")
+endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+
 macro_optional_find_package(Cairo ${CAIRO_VERSION})
 if(CAIRO_FOUND)
   set(HAVE_CAIRO ${CAIRO_FOUND})
@@ -159,6 +179,10 @@ if(ENABLE_LIBCURL)
 endif(ENABLE_LIBCURL)
 
 add_definitions(-DHAVE_CONFIG_H=1)
+if(MINGW)
+  # Use mingw's ansi stdio extensions
+  add_definitions(-D__USE_MINGW_ANSI_STDIO=1)
+endif(MINGW)
 if(FONTCONFIG_FOUND)
   add_definitions(${FONTCONFIG_DEFINITIONS})
   include_directories(${FONTCONFIG_INCLUDE_DIR})
@@ -388,6 +412,9 @@ endif(PNG_FOUND)
 if(TIFF_FOUND)
   set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES})
 endif(TIFF_FOUND)
+if(HAVE_PTHREAD)
+  set(poppler_LIBS ${poppler_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+endif()
 
 if(MSVC)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@@ -396,7 +423,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 34.0.0 SOVERSION 34)
+set_target_properties(poppler PROPERTIES VERSION 43.0.0 SOVERSION 43)
 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})
@@ -570,6 +597,9 @@ add_subdirectory(test)
 if(QT4_FOUND)
   add_subdirectory(qt4)
 endif(QT4_FOUND)
+if(QT5_FOUND)
+  add_subdirectory(qt5)
+endif(QT5_FOUND)
 if(ENABLE_CPP)
   add_subdirectory(cpp)
 endif(ENABLE_CPP)
@@ -594,6 +624,9 @@ endif(ENABLE_SPLASH)
 if(QT4_FOUND)
   poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig)
 endif(QT4_FOUND)
+if(QT5_FOUND)
+  poppler_create_install_pkgconfig(poppler-qt5.pc lib${LIB_SUFFIX}/pkgconfig)
+endif(QT5_FOUND)
 if(ENABLE_GLIB)
   poppler_create_install_pkgconfig(poppler-glib.pc lib${LIB_SUFFIX}/pkgconfig)
 endif(ENABLE_GLIB)
@@ -610,6 +643,7 @@ show_end_message("font configuration" ${font_configuration})
 show_end_message_yesno("splash output" ENABLE_SPLASH)
 show_end_message_yesno("cairo output" CAIRO_FOUND)
 show_end_message_yesno("qt4 wrapper" QT4_FOUND)
+show_end_message_yesno("qt5 wrapper" QT5_FOUND)
 show_end_message_yesno("glib wrapper" ENABLE_GLIB)
 show_end_message_yesno("  introspection" INTROSPECTION_FOUND)
 show_end_message_yesno("cpp wrapper" ENABLE_CPP)
diff --git a/ChangeLog b/ChangeLog
index f0f8974c..cd4344ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,143 +1,3336 @@
+commit 2c73f1ea9116172692d8350cb7adf1b5376f795c
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Aug 26 21:50:51 2013 +0200
+
+    Fix typo
+
+ qt5/src/poppler-qt5.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 16da389c61c495111a5a49f62539a423a0655c28
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Mon Aug 26 07:50:51 2013 +0930
+
+    fix typo in pdfimages.1
+
+ utils/pdfimages.1 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit ed3585efc8b259cb065eac361a6a499f9f26851f
+Author: William Bader <williambader@hotmail.com>
+Date:   Sun Aug 25 19:31:11 2013 +0200
+
+    Fix pdftops -eps -level1sep rendering of a file
+
+    Since 8fb243bf11a979af8bfa36427436940706c9f71d we have
+            case splashModeXBGR8:
+    +         cSrcNonIso[3] = 255;
+    and that means splashModeDeviceN8 and splashModeCMYK8 can't
+    skip their breaks anymore otherwise the cSrcNonIso[3] gets
+    overwritten
+
+    Bug #68321
+
+ splash/Splash.cc | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+commit 70298a021657a72ae80389687a86247144e6d6b6
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Tue Aug 20 19:46:01 2013 +0200
+
+    Don't copy not needed bitmap
+
+    Speeds up rendering of fixes from bug 67105
+    As example one file is down from 130s to 6.5s
+
+ poppler/SplashOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit fc78330072b9771fa39d21896703adb4836e5398
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Aug 20 00:37:56 2013 +0200
+
+    use getRGBLine images if available
+
+    Speeds up greatly files from bug #66928
+
+    E.g. some file went from 21s to 2s in my computer
+
+ poppler/SplashOutputDev.cc | 30 +++++++++++++++++++-----------
+ 1 file changed, 19 insertions(+), 11 deletions(-)
+
+commit 678c767584fa80620cc58a1d8a913cb3473209d4
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Aug 18 16:19:27 2013 +0200
+
+    Fix crash in 1026.asan.0.42.pdf
+
+    We were not checking that bitmapOff was in bounds
+
+ splash/Splash.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit fbea2241cccdde0106d2c34592b6ddda28a8d848
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Aug 17 01:32:51 2013 +0200
+
+    Revert "Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary"
+
+    This reverts commit 402ee8b4e31630a42a0a38db1d39164cc5789f3c.
+
+    No clue how this ended up in the stable branch
+
+ poppler/Catalog.cc | 45 ---------------------------------------------
+ poppler/Catalog.h  | 10 ----------
+ 2 files changed, 55 deletions(-)
+
+commit 6d2771b8a8c0cb0f2288d0900fea3c9edc3dd172
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Aug 17 01:32:38 2013 +0200
+
+    Revert "pdfinfo: Use Catalog::getMarkInfo() to show mark info
+    properties"
+
+    This reverts commit 73cca518c479594e26605196d54b429fbf42dcdc.
+
+    No clue how this ended up in the stable branch
+
+ utils/pdfinfo.cc | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+commit ef6420656c7b88eb22a63ec2cb3e504e0bda0384
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Aug 17 01:11:37 2013 +0200
+
+    Fix jpeg image export
+
+    Use same logic than the one used in ImageOutputDev
+    Bug #48270
+
+ utils/HtmlOutputDev.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 681f52a572b08c068cb376e5b2dc8a31676aad07
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Aug 16 23:58:44 2013 +0200
+
+    Fix exit(1) in 1026.asan.0.42.pdf
+
+    The main crash in discussion with Thomas
+
+ splash/Splash.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 9f4d7796589e4c9c1645fbbcf0cfabd79a71bde9
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Thu Aug 8 20:33:54 2013 +0200
+
+    use copyString where memory is freed with gfree
+
+    Bug #67666
+
+ poppler/Annot.cc | 2 +-
+ poppler/Dict.cc  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 73cca518c479594e26605196d54b429fbf42dcdc
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date:   Thu Apr 25 09:52:56 2013 +0300
+
+    pdfinfo: Use Catalog::getMarkInfo() to show mark info properties
+
+ utils/pdfinfo.cc | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit 402ee8b4e31630a42a0a38db1d39164cc5789f3c
+Author: Adrian Perez de Castro <aperez@igalia.com>
+Date:   Thu Apr 25 09:52:56 2013 +0300
+
+    Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary
+
+ poppler/Catalog.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Catalog.h  | 10 ++++++++++
+ 2 files changed, 55 insertions(+)
+
+commit c3f953dc87f83ac726f99cb8f1f959c486098391
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Sat Aug 10 21:43:57 2013 +0300
+
+    Fix a typo
+
+ qt4/src/poppler-qt4.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 62d079b40a2f816f59cc533b1624ea57458331f3
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Thu Aug 8 20:45:08 2013 +0200
+
+    Fix `pdftotext -bbox in.pdf -`
+
+    Print body text to stdout if invoked as above.
+
+    Bug #45163
+
+ utils/pdftotext.cc | 15 ++++++---------
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+commit 86dbc5f6f850ba3919bed9979386e5a4d0e7dba3
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Thu Aug 8 20:39:30 2013 +0200
+
+    pdfdetach: don't mention xpdfrc
+
+    - drop -cfg command line argument; the old code passed its value to
+      GlobalParams constructor which is the data dir, not a cfg file
+    - remove corresponding lines from pdfdetach.1
+    - fix '-enc' documentation in pdfdetach.1
+
+ utils/pdfdetach.1  | 23 +++--------------------
+ utils/pdfdetach.cc |  6 ++----
+ 2 files changed, 5 insertions(+), 24 deletions(-)
+
+commit 2724a7b9f723789491b4991ce7fe0cfa3e5488c3
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Jul 30 09:36:44 2013 +0200
+
+    glib-demo: Remove GTK_DISABLE_DEPRECATED compilation flag
+
+    Deprecations are now compile warnings, there's no reason to make them
+    fatal.
+
+ glib/demo/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit eac752dc25942439de3e1c7a4ff815500a41dd2a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 29 19:11:55 2013 +0200
+
+    0.24.0
+
+ CMakeLists.txt      | 6 +++---
+ NEWS                | 7 +++++++
+ configure.ac        | 4 ++--
+ cpp/Doxyfile        | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile    | 2 +-
+ qt5/src/Doxyfile    | 2 +-
+ 7 files changed, 16 insertions(+), 9 deletions(-)
+
+commit 892433a068a8a11c09a7c4f57c5fc941747c4453
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 29 19:08:10 2013 +0200
+
+    Update Ed's copyright
+
+ poppler/TextOutputDev.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4637b1581286381c3d1c6963828d9cd8afc5b9e0
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 29 01:08:06 2013 +0200
+
+    Make some pdftops conversions *much* faster
+
+    For example: http://ev.kde.org/resources/expense_report.pdf
+
+    Without this patch it seems "infinite", which this patch it's a
+    few seconds
+
+    The change: Instead of just remembering in xobjStack the set of
+    XObjects (and Patterns,
+    the variable name was 'wrong') we are currently setting up (i.e. the
+    current chain), we
+    remember all of them.
+
+    This has passed the pdf->ps regression test without a single issue
+
+ poppler/PSOutputDev.cc | 42 ++++++++++--------------------------------
+ poppler/PSOutputDev.h  |  6 +++---
+ 2 files changed, 13 insertions(+), 35 deletions(-)
+
+commit e04287f2682e46831c04e0ef8d60411f521a2572
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 29 00:55:43 2013 +0200
+
+    Fallback to 1x1 bitmap If we fail to create the corrent one
+
+ poppler/SplashOutputDev.cc | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit fe5ff20cb93a70fa1650ef5e00b67e35de20f0ca
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 29 00:54:07 2013 +0200
+
+    Initialize t3FillColorOnly
+
+ poppler/PSOutputDev.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 19930d9f104b63070dcd7636758eb8b90a86fc0d
+Author: Ed Catmur <ed@catmur.co.uk>
+Date:   Sun Jul 21 11:07:00 2013 +0200
+
+    TextOutputDev: Do not draw ligatures more than once when selected
+
+    When the selection covers a ligature presentation form where a single
+    character code corresponds to multiple Unicode codepoints, the
+    glyph for
+    the ligature is drawn multiple times, once for each Unicode character.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=9001
+
+ poppler/TextOutputDev.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 6b451b2d3f785c28d98907ae338d58380db518d2
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Jul 19 02:55:29 2013 +0200
+
+    0.23.4
+
+ CMakeLists.txt           |  4 +--
+ NEWS                     |  8 ++++++
+ configure.ac             |  2 +-
+ cpp/Doxyfile             |  2 +-
+ gtk-doc.make             | 70
+ +++++++++++++++++++++++++++++++-----------------
+ m4/gtk-doc.m4            |  6 ++++-
+ poppler/CairoOutputDev.h |  2 +-
+ poppler/Makefile.am      |  2 +-
+ poppler/TextOutputDev.cc |  2 +-
+ qt4/src/Doxyfile         |  2 +-
+ qt5/src/Doxyfile         |  2 +-
+ 11 files changed, 67 insertions(+), 35 deletions(-)
+
+commit 6cf43442e38c501b49293a28f38e06ab143852c6
+Author: Ed Catmur <ed@catmur.co.uk>
+Date:   Thu Jul 18 10:34:29 2013 +0200
+
+    TextOutputDev: clip the selected text rendering to the selection box
+
+    Sometimes with italic text or text containing ligatures, part of the
+    glyph falls outside the selection box. By clipping to the selection
+    box
+    we avoid drawing the whole glyph with the selection color.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=66983
+
+ poppler/TextOutputDev.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 269b3f3d572a15f1007f8cc84f758b1a293ef8af
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Mon Jul 8 20:19:30 2013 +0200
+
+    build: Make -lpthread take preference over -pthread
+
+    This makes libpoppler link to pthreads and fixes runtime error due to
+    unresolved pthread symbols when running some of the utils and tests.
+
+ m4/ax_pthread.m4  | 2 +-
+ test/Makefile.am  | 6 ++++--
+ utils/Makefile.am | 4 +++-
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+commit 40f857d27930aa002a99c96f3892c5e240e7ecb5
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Mon Jul 8 19:55:10 2013 +0200
+
+    m4: Replace old acx_pthread.m4 with new one ax_pthread.m4
+
+ configure.ac      |   2 +-
+ m4/acx_pthread.m4 | 280 -----------------------------------------------
+ m4/ax_pthread.m4  | 317
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 318 insertions(+), 281 deletions(-)
+
+commit 44b7070aa713b2e20eb97b868000d432e2f8504e
+Author: Pino Toscano <pino@kde.org>
+Date:   Mon Jul 8 19:42:15 2013 +0200
+
+    cmake: improve linking with pthreads
+
+    Use the CMake-provided variable instead of hardcoding -lpthread.
+
+ CMakeLists.txt       | 6 +++---
+ utils/CMakeLists.txt | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 69c281fdcf23520151c0eb5471a4259c73fa1273
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jul 7 11:51:27 2013 +0200
+
+    cairo: Fix the bounding box of images saved in CairoImageOutputDev
+
+    We were using the size of the original image instead of the rendered
+    size and asuming the scales were always positive.
+
+ poppler/CairoOutputDev.cc | 145
+ ++++++++++++++++++----------------------------
+ poppler/CairoOutputDev.h  |   5 +-
+ 2 files changed, 59 insertions(+), 91 deletions(-)
+
+commit 759e0266b36c4ea9f66912f1e53ed6392dbfd6da
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jul 2 00:47:13 2013 +0200
+
+    News for 0.23.3
+
+    forgot to add them to the tarball, oh well
+
+ NEWS | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+commit df1fe9dc7ade5228e37c16c6f0c9a2d4890fdc90
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jul 2 00:33:04 2013 +0200
+
+    0.23.3
+
+ CMakeLists.txt      | 4 ++--
+ Makefile.am         | 2 +-
+ configure.ac        | 2 +-
+ cpp/Doxyfile        | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile    | 2 +-
+ qt5/src/Doxyfile    | 2 +-
+ 7 files changed, 8 insertions(+), 8 deletions(-)
+
+commit df9d4fee17adfe003c822175b6921a3cd93675f6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 1 21:04:10 2013 +0200
+
+    Update copyrights
+
+ poppler/Annot.cc              | 2 +-
+ poppler/Annot.h               | 2 +-
+ poppler/Page.cc               | 2 +-
+ poppler/TextOutputDev.cc      | 2 +-
+ poppler/TextOutputDev.h       | 2 +-
+ qt5/src/poppler-annotation.cc | 2 +-
+ qt5/src/poppler-annotation.h  | 2 +-
+ qt5/src/poppler-document.cc   | 2 +-
+ qt5/src/poppler-link.cc       | 2 +-
+ qt5/src/poppler-qt5.h         | 2 +-
+ 10 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 67129e9db88e8332907407f14d3e09ee5c49e274
+Author: Jason Crain <jason@aquaticape.us>
+Date:   Mon Jul 1 02:24:47 2013 -0500
+
+    Check for NULL in Page::getResourceDictCopy
+
+ poppler/Page.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit c376559bc412e90204162bb4b2d20cd586db70c1
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 13:14:07 2013 +0200
+
+    annots: Invalidate the appearance stream when annot properties change
+
+    Make invalidateAppearance() protected and only call it when properties
+    that affect the appearance stream are updated. Remove all calls to
+    invalidateAppearance() from qt frontend, this is now handled by
+    the core
+    and fixes the appearance stream regeneration in the glib frontend too.
+
+ poppler/Annot.cc              | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h               | 10 ++++++----
+ qt4/src/poppler-annotation.cc | 34 ----------------------------------
+ qt5/src/poppler-annotation.cc | 34 ----------------------------------
+ 4 files changed, 42 insertions(+), 72 deletions(-)
+
+commit c746e8b38e821d1ebeaf52c4c816515bc3ddaaf6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 11:44:59 2013 +0200
+
+    annots: Remove unused variable
+
+ poppler/Annot.cc | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 7d9d5d2518f7760e6a4317a358040ddd9164fdef
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 11:40:15 2013 +0200
+
+    annots: Do not update AP and AS entries if they are not present when
+    invaliding the appaearance stream
+
+ poppler/Annot.cc | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+commit 347b53f7fca644564724c230fe6c0dcbffa0d6f9
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun Jun 30 11:23:54 2013 +0200
+
+    annots: do not set the default appearance state when invalidating
+    appearances
+
+    We are setting the default appareance state to Off and then we are
+    updating AS dictionary to NULL in the XRef. The appearance state
+    is only
+    required when there's more than once appearance stream, but when
+    invalidating the apperance we remove all streams.
+
+ poppler/Annot.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit b5e9941c145fc99e03a28d92a50840638895908d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jul 1 00:32:51 2013 +0200
+
+    Fix crash on malformed doc
+
+    Where the Colorants dictionary values are not arrays
+    Document can be found on KDE bug #319925
+
+ poppler/GfxState.cc | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+commit 19f8a88bba6022b8172477e6f52dfd36b2fc5e92
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Thu Mar 7 00:20:15 2013 +0100
+
+    qt5: Free some temporary memory in
+    TextAnnotationPrivate::createNativeAnnot
+
+    There's no need to keep this buffer around after it has been flushed
+
+ qt5/src/poppler-annotation.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 8bac4d1e43ce9a4c66fddc8430d7bed2d9aabba1
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Tue Jun 25 20:09:00 2013 +0200
+
+    qt5: Some documentation about annotations
+
+    * Removed incorrect hint "Use uniqueName to test for Annotation
+      equality": uniqueNames are optional and we don't actually guarantee
+      uniqueness
+    * Added "How to add annotations" and "FixedRotation flag specifics"
+      sections in the Annotation class page
+    * Added links from enum Annotation::SubType items to actual subclasses
+    * Added documentation for annotation flags that are known to work
+    * Added "see also" links between annotation flag and boundary
+      setters/getters
+    * Added warning on Annotation::setPopup to tell that it's currently
+    not
+      implemented
+
+ qt5/src/poppler-annotation.h | 143
+ ++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 135 insertions(+), 8 deletions(-)
+
+commit 1d5fe3f20189fd3928121e954bcc8fa7278b39fb
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 19:06:49 2013 +0100
+
+    qt5: FixedRotation annotations' coordinate conversion
+
+    FixedRotation(=flagNoRotate) annotations use a different coordinate
+    system than regular annotations. This patch implements transparent
+    conversion so that qt5 clients don't notice the difference.
+
+    Important! When dealing with FixedRotation annotations, poppler-qt5
+    clients will need to set geometry-related annotation properties in
+    the following order:
+     1) flags (because we need to know if this is a FixedRotation
+        annotation or not)
+     2) boundary (because we need to know what the topleft corner is,
+        so that we can construct the conversion matrix)
+     3) anything else
+
+    This requirement will be documented in the next patch
+
+ qt5/src/poppler-annotation-private.h |   7 ++-
+ qt5/src/poppler-annotation.cc        | 111
+ +++++++++++++++++++++++++++--------
+ 2 files changed, 92 insertions(+), 26 deletions(-)
+
+commit ab130c91492765f8be29ed112dd2e2e6f665641b
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 00:55:58 2013 +0100
+
+    core: Remove geometry-related arguments from annotation constructors
+
+    Removed arguments from annotation constructors related to the geometry
+    of the annotation. This change will make it easier to support creating
+    annotations with flag NoRotate in the next patch (because no special
+    cases will be needed: coordinate conversion code will be able
+    to always
+    assume that the underlying annotation object already exists).
+
+    Data that used to be taken from these arguments is now replaced
+    by dummy
+    values, which can be modified using appropriate setter methods after
+    the annotation object is created.
+
+    Affected annotation types:
+     - AnnotLine
+     - AnnotTextMarkup
+     - AnnotPolygon
+     - AnnotInk
+
+ qt5/src/poppler-annotation.cc | 34 ++++++++++++++++++----------------
+ 1 file changed, 18 insertions(+), 16 deletions(-)
+
+commit 35cfb6914e1be4c5eda2f355900b1a0a1fa69d19
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Fri Feb 15 12:24:18 2013 +0100
+
+    poppler_qt5viewer: Add combobox to select rotation
+
+ qt5/demos/navigationtoolbar.cpp | 15 +++++++++++++++
+ qt5/demos/navigationtoolbar.h   |  4 ++++
+ qt5/demos/pageview.cpp          | 24 +++++++++++++++++++++++-
+ qt5/demos/pageview.h            |  3 +++
+ qt5/demos/viewer.cpp            |  2 ++
+ 5 files changed, 47 insertions(+), 1 deletion(-)
+
+commit de2a93c0bc6e92a95c687796f59780c998b90ca4
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Thu Mar 7 00:20:15 2013 +0100
+
+    qt4: Free some temporary memory in
+    TextAnnotationPrivate::createNativeAnnot
+
+    There's no need to keep this buffer around after it has been flushed
+
+ qt4/src/poppler-annotation.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 738b0b4fedaa2b2b28ea1c11622dfd880180d1c9
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Thu Mar 7 20:50:52 2013 +0100
+
+    qt4: Some documentation about annotations
+
+    * Removed incorrect hint "Use uniqueName to test for Annotation
+      equality": uniqueNames are optional and we don't actually guarantee
+      uniqueness
+    * Added "How to add annotations" and "FixedRotation flag specifics"
+      sections in the Annotation class page
+    * Added links from enum Annotation::SubType items to actual subclasses
+    * Added documentation for annotation flags that are known to work
+    * Added "see also" links between annotation flag and boundary
+      setters/getters
+    * Added warning on Annotation::setPopup to tell that it's currently
+    not
+      implemented
+
+ qt4/src/poppler-annotation.h | 143
+ ++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 135 insertions(+), 8 deletions(-)
+
+commit cf950a2b7e8278e70719c67b441b0d324ffd0399
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 19:06:49 2013 +0100
+
+    qt4: FixedRotation annotations' coordinate conversion
+
+    FixedRotation(=flagNoRotate) annotations use a different coordinate
+    system than regular annotations. This patch implements transparent
+    conversion so that qt4 clients don't notice the difference.
+
+    Important! When dealing with FixedRotation annotations, poppler-qt4
+    clients will need to set geometry-related annotation properties in
+    the following order:
+     1) flags (because we need to know if this is a FixedRotation
+        annotation or not)
+     2) boundary (because we need to know what the topleft corner is,
+        so that we can construct the conversion matrix)
+     3) anything else
+
+    This requirement will be documented in the next patch
+
+ poppler/Annot.cc                     |   8 +++
+ poppler/Annot.h                      |   2 +
+ qt4/src/poppler-annotation-private.h |   7 ++-
+ qt4/src/poppler-annotation.cc        | 111
+ +++++++++++++++++++++++++++--------
+ 4 files changed, 102 insertions(+), 26 deletions(-)
+
+commit 4b13085568df09d8b75099f6a5438f025a028fd5
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Mar 2 00:55:58 2013 +0100
+
+    core: Remove geometry-related arguments from annotation constructors
+
+    Removed arguments from annotation constructors related to the geometry
+    of the annotation. This change will make it easier to support creating
+    annotations with flag NoRotate in the next patch (because no special
+    cases will be needed: coordinate conversion code will be able
+    to always
+    assume that the underlying annotation object already exists).
+
+    Data that used to be taken from these arguments is now replaced
+    by dummy
+    values, which can be modified using appropriate setter methods after
+    the annotation object is created.
+
+    Affected annotation types:
+     - AnnotLine
+     - AnnotTextMarkup
+     - AnnotPolygon
+     - AnnotInk
+
+ poppler/Annot.cc              | 56
+ +++++++++++++------------------------------
+ poppler/Annot.h               |  9 ++++---
+ qt4/src/poppler-annotation.cc | 34 +++++++++++++-------------
+ 3 files changed, 39 insertions(+), 60 deletions(-)
+
+commit 5923cfb5f7e3a0703de17e21f4952f92a44f3c14
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Fri Feb 15 12:24:18 2013 +0100
+
+    poppler_qt4viewer: Add combobox to select rotation
+
+ qt4/demos/navigationtoolbar.cpp | 15 +++++++++++++++
+ qt4/demos/navigationtoolbar.h   |  4 ++++
+ qt4/demos/pageview.cpp          | 24 +++++++++++++++++++++++-
+ qt4/demos/pageview.h            |  3 +++
+ qt4/demos/viewer.cpp            |  2 ++
+ 5 files changed, 47 insertions(+), 1 deletion(-)
+
+commit 74ea15cc454f31b772e71b3525b71045dbfa5527
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Tue Jun 25 19:56:20 2013 +0200
+
+    core: Support for rendering annotations with flagNoRotate
+
+    Gfx::drawAnnot now makes a counter-rotation if flagNoRotate is set
+
+ poppler/Annot.cc | 55
+ ++++++++++++++++++++++++++++++++++++-------------------
+ poppler/Annot.h  |  3 ++-
+ poppler/Gfx.cc   | 41 +++++++++++++++++++++++++++++++++++++----
+ poppler/Gfx.h    |  3 ++-
+ 4 files changed, 77 insertions(+), 25 deletions(-)
+
+commit 2639957ba78defd2ab6282679375fb7969bad21f
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Wed Jun 26 23:12:40 2013 +0200
+
+    Do not crash in page::removeAnnot if there are non-Ref entries
+    in /Annots
+
+ poppler/Page.cc | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit ae016aa263c218fbfbd607cc92feac1013348c7e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Jun 26 11:33:55 2013 +0200
+
+    Fix qt5 found/not found logic
+
+ CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit e27c1057caf4d878a0dc43c92c9e0b565db8fe40
+Merge: c55b577 ee8cfbc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 25 19:17:13 2013 +0200
+
+    Merge remote-tracking branch 'origin/qt5'
+
+commit c55b577ce69ad4bb69f5261b3e120e92c9fdb3d0
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Jun 25 10:01:38 2013 +0200
+
+    glib: Use TextPage::getSelectionWords to build text layout and
+    attributes
+
+    This way we can make sure that the list of words used in
+    poppler_page_get_text_layout and poppler_page_get_text_attributes
+    is the
+    same that the one used in poppler_page_get_text. This fixes the
+    mismatch
+    between the number of characters in the text returned by
+    poppler_page_get_text and the number of characters returned by
+    poppler_page_get_text_layout in some documents.
+
+ glib/poppler-page.cc | 168
+ +++++++++++++++++++++++++++------------------------
+ 1 file changed, 90 insertions(+), 78 deletions(-)
+
+commit fc534f571315c064005515c19d7d70ad3af1563e
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Jun 25 10:05:01 2013 +0200
+
+    TextOutputDev: add a method to TextPage to get the selection as a
+    list of words
+
+    Returns a list of lines of words.
+
+ poppler/TextOutputDev.cc | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/TextOutputDev.h  |  4 ++++
+ 2 files changed, 40 insertions(+)
+
+commit a924246b7534e86165f8e9ab6c60d56b73a17b94
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Tue Jun 25 09:57:48 2013 +0200
+
+    TextOutputDev: simplify the text selection dumper
+
+    Build a list of lines of words and don't try to format the text when
+    detecting tables, simply add the words and lines in the right order.
+
+ poppler/TextOutputDev.cc | 200
+ ++++++++++++++++++++++-------------------------
+ 1 file changed, 92 insertions(+), 108 deletions(-)
+
+commit c849094a2daf896d085937adff1f7659a09da062
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Mon Jun 24 18:29:11 2013 +0200
+
+    TextOutputDev: Move TextSelection class from TextSelectionPainter
+    to TextSelectionVisitor
+
+    So that it can be used by other TextSelectionVisitor implementations.
+    Also renamed it as TextWordSelection since it contains a word
+    selection.
+
+ poppler/TextOutputDev.cc | 35 ++++++++++++++++++-----------------
+ 1 file changed, 18 insertions(+), 17 deletions(-)
+
+commit b3ff3f2c3e131556d2b27cbe52f0ddbbb4820c19
+Author: Jason Crain <jason@aquaticape.us>
+Date:   Thu Jun 20 21:47:13 2013 -0500
+
+    Draw glyphs after selection background
+
+    When multiple lines of text are selected, TextSelectionPainter will
+    draw selections over each other, hiding the previous line with the
+    selection background of the current line.  This patch changes
+    TextSelectionPainter so that glyphs are drawn only after the entire
+    background is drawn.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=65989
+
+ poppler/TextOutputDev.cc | 109
+ ++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 69 insertions(+), 40 deletions(-)
+
+commit ee8cfbc78fe9de109abbe0727a738870f6027a73
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 23:20:01 2013 +0200
+
+    Fix indent
+
+ qt5/src/poppler-optcontent.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9d0a5b6afb25a1273504383e108bdb95ca82f099
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 23:19:30 2013 +0200
+
+    Bring changes from the qt4 dir
+
+ qt5/src/Doxyfile                 |   2 +-
+ qt5/src/poppler-private.h        |   2 +-
+ qt5/tests/CMakeLists.txt         |   1 +
+ qt5/tests/Makefile.am            |  13 +-
+ qt5/tests/stress-threads-qt5.cpp | 304
+ +++++++++++++++++++++++++++++++++++++++
+ qt5/tests/test-poppler-qt5.cpp   |   2 +-
+ 6 files changed, 320 insertions(+), 4 deletions(-)
+
+commit 1adb1ab7aee026e227d25716a4b7be22b19b5b84
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 20:50:49 2013 +0200
+
+    Make it build with autotools
+
+ poppler/ArthurOutputDev.cc    | 816
+ ------------------------------------------
+ poppler/ArthurOutputDev.h     | 170 ---------
+ poppler/Makefile.am           |  23 +-
+ qt4/src/ArthurOutputDev.cc    | 816
+ ++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/ArthurOutputDev.h     | 170 +++++++++
+ qt4/src/CMakeLists.txt        |   2 +-
+ qt4/src/Makefile.am           |   5 +-
+ qt5/src/ArthurOutputDev.cc    | 816
+ ++++++++++++++++++++++++++++++++++++++++++
+ qt5/src/ArthurOutputDev.h     | 170 +++++++++
+ qt5/src/CMakeLists.txt        |   2 +-
+ qt5/src/Makefile.am           |   5 +-
+ qt5/src/poppler-optcontent.cc |   2 +
+ 12 files changed, 1983 insertions(+), 1014 deletions(-)
+
+commit 93a1c2b768cc419c5bf9b3033bf85fb21326a65a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 18 00:33:38 2013 +0200
+
+    If qmake gives us a Qt5 qmake try with qmake4 and qmake-qt4
+
+ cmake/modules/FindQt4.cmake | 62
+ ++++++++++++++++++++++++++++-----------------
+ 1 file changed, 39 insertions(+), 23 deletions(-)
+
+commit 7cc33a752ef864b595748ce7724ba553a8e3ba8e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 22:57:56 2013 +0200
+
+    We are not compiling an executable
+
+ qt5/src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 87cfcd41e8e970186c6ce753aa660ef86aca8878
+Author: Granger Anthony <grangeranthony@gmail.com>
+Date:   Mon Jun 17 09:17:51 2013 +0200
+
+    Allow to enable Qt5 support only with CMake >= 2.8.8
+
+ CMakeLists.txt           | 26 ++++++++++++++++----------
+ qt5/tests/CMakeLists.txt |  1 -
+ 2 files changed, 16 insertions(+), 11 deletions(-)
+
+commit b44c70f04758000cf0e049b06cc7864287570f7b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 22:10:05 2013 +0200
+
+    Bring PIC back to the toplevel, still have linking errors tohugh :-/
+
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit be49073f5ce79f56b38197758a5cf1253b972306
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 21:50:31 2013 +0200
+
+    Use qtchooser if available
+
+ configure.ac | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+commit b1958228d4bc6793a3606b5e31c61a57b9fac9f5
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 20:21:08 2013 +0200
+
+    No distro ships moc-qt5 but make it work in case someone would
+
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 06f45c7177afc67e02985be1a97cd976c530c4ae
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 20:04:49 2013 +0200
+
+    Build fixes
+
+    Fix moc when moc-qt4 is qt4 moc but moc is qt5 one
+    Do not add -fPIE everywhere, just -fPIC to qt5
+
+ configure.ac        | 10 ++++++----
+ qt5/src/Makefile.am |  2 +-
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+commit cb617c21fba727781f46278f5475b91d528a488b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 18:12:18 2013 +0200
+
+    Files i forgot
+
+ poppler-qt5-uninstalled.pc.in |  7 +++++++
+ poppler-qt5.pc.cmake          | 13 +++++++++++++
+ poppler-qt5.pc.in             | 13 +++++++++++++
+ 3 files changed, 33 insertions(+)
+
+commit 5c521bba427eb163e4b77d936865fbdd0e07faf3
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 18:12:07 2013 +0200
+
+    soversion 1
+
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Makefile.am    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 43786964946b4f4c005a0526e16fead3ffa6ba4a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:23:31 2013 +0200
+
+    harmonize spaces
+
+ CMakeLists.txt | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 2e2ea27fe3dc688c87003d170b82451a6a872b0d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:22:18 2013 +0200
+
+    Remove qt4 mentions
+
+ qt5/src/poppler-converter-private.h    | 6 +++---
+ qt5/src/poppler-embeddedfile-private.h | 2 +-
+ qt5/src/poppler-form.cc                | 2 +-
+ qt5/src/poppler-form.h                 | 6 +++---
+ qt5/src/poppler-pdf-converter.cc       | 2 +-
+ qt5/src/poppler-private.cc             | 4 ++--
+ qt5/src/poppler-private.h              | 2 +-
+ qt5/src/poppler-qt5.h                  | 2 +-
+ 8 files changed, 13 insertions(+), 13 deletions(-)
+
+commit e2264ce82af3e971e34930f5307b7c9b43a1e346
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:19:27 2013 +0200
+
+    remove deprecated stuff
+
+ qt5/src/poppler-annotation.cc |  19 ++------
+ qt5/src/poppler-annotation.h  |  18 -------
+ qt5/src/poppler-document.cc   |  19 --------
+ qt5/src/poppler-link.cc       |   5 --
+ qt5/src/poppler-link.h        |  10 ----
+ qt5/src/poppler-page.cc       |  18 -------
+ qt5/src/poppler-qt5.h         |  41 ----------------
+ qt5/tests/check_fonts.cpp     |  21 ++-------
+ qt5/tests/check_metadata.cpp  |   1 -
+ qt5/tests/check_search.cpp    | 107
+ ++++++++++++++++++++++--------------------
+ 10 files changed, 65 insertions(+), 194 deletions(-)
+
+commit 21808e203eed46e379954b58b7014998b3836573
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:03:45 2013 +0200
+
+    remove commented stuff
+
+ qt5/src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 16e7033f18a8da8e27aaed6f63cce156abf8837a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 17 00:01:27 2013 +0200
+
+    Initial Qt5 port
+
+ CMakeLists.txt                               |   20 +
+ Makefile.am                                  |   18 +-
+ configure.ac                                 |   66 +-
+ qt5/.gitignore                               |    4 +
+ qt5/CMakeLists.txt                           |    3 +
+ qt5/Makefile.am                              |    1 +
+ qt5/demos/.gitignore                         |    4 +
+ qt5/demos/CMakeLists.txt                     |   38 +
+ qt5/demos/Makefile.am                        |   67 +
+ qt5/demos/abstractinfodock.cpp               |   57 +
+ qt5/demos/abstractinfodock.h                 |   48 +
+ qt5/demos/documentobserver.cpp               |   50 +
+ qt5/demos/documentobserver.h                 |   50 +
+ qt5/demos/embeddedfiles.cpp                  |   82 +
+ qt5/demos/embeddedfiles.h                    |   44 +
+ qt5/demos/fonts.cpp                          |   72 +
+ qt5/demos/fonts.h                            |   43 +
+ qt5/demos/info.cpp                           |   72 +
+ qt5/demos/info.h                             |   43 +
+ qt5/demos/main_viewer.cpp                    |   33 +
+ qt5/demos/metadata.cpp                       |   50 +
+ qt5/demos/metadata.h                         |   43 +
+ qt5/demos/navigationtoolbar.cpp              |  129 +
+ qt5/demos/navigationtoolbar.h                |   61 +
+ qt5/demos/optcontent.cpp                     |   69 +
+ qt5/demos/optcontent.h                       |   47 +
+ qt5/demos/pageview.cpp                       |   79 +
+ qt5/demos/pageview.h                         |   50 +
+ qt5/demos/permissions.cpp                    |   66 +
+ qt5/demos/permissions.h                      |   43 +
+ qt5/demos/thumbnails.cpp                     |   84 +
+ qt5/demos/thumbnails.h                       |   48 +
+ qt5/demos/toc.cpp                            |   88 +
+ qt5/demos/toc.h                              |   43 +
+ qt5/demos/viewer.cpp                         |  317 ++
+ qt5/demos/viewer.h                           |   73 +
+ qt5/src/.gitignore                           |    9 +
+ qt5/src/CMakeLists.txt                       |   54 +
+ qt5/src/Doxyfile                             | 1637 ++++++++++
+ qt5/src/Mainpage.dox                         |   85 +
+ qt5/src/Makefile.am                          |   73 +
+ qt5/src/poppler-annotation-helper.h          |  198 ++
+ qt5/src/poppler-annotation-private.h         |  111 +
+ qt5/src/poppler-annotation.cc                | 4394
+ ++++++++++++++++++++++++++
+ qt5/src/poppler-annotation.h                 |  921 ++++++
+ qt5/src/poppler-base-converter.cc            |  105 +
+ qt5/src/poppler-converter-private.h          |   49 +
+ qt5/src/poppler-document.cc                  |  679 ++++
+ qt5/src/poppler-embeddedfile-private.h       |   42 +
+ qt5/src/poppler-embeddedfile.cc              |  135 +
+ qt5/src/poppler-export.h                     |   17 +
+ qt5/src/poppler-fontinfo.cc                  |  149 +
+ qt5/src/poppler-form.cc                      |  416 +++
+ qt5/src/poppler-form.h                       |  343 ++
+ qt5/src/poppler-link-extractor-private.h     |   57 +
+ qt5/src/poppler-link-extractor.cc            |   84 +
+ qt5/src/poppler-link.cc                      |  711 +++++
+ qt5/src/poppler-link.h                       |  612 ++++
+ qt5/src/poppler-media.cc                     |  168 +
+ qt5/src/poppler-media.h                      |  100 +
+ qt5/src/poppler-movie.cc                     |  110 +
+ qt5/src/poppler-optcontent-private.h         |  121 +
+ qt5/src/poppler-optcontent.cc                |  427 +++
+ qt5/src/poppler-optcontent.h                 |   77 +
+ qt5/src/poppler-page-private.h               |   54 +
+ qt5/src/poppler-page-transition-private.h    |   28 +
+ qt5/src/poppler-page-transition.cc           |   95 +
+ qt5/src/poppler-page-transition.h            |  148 +
+ qt5/src/poppler-page.cc                      |  744 +++++
+ qt5/src/poppler-pdf-converter.cc             |  115 +
+ qt5/src/poppler-private.cc                   |  292 ++
+ qt5/src/poppler-private.h                    |  240 ++
+ qt5/src/poppler-ps-converter.cc              |  273 ++
+ qt5/src/poppler-qiodeviceoutstream-private.h |   47 +
+ qt5/src/poppler-qiodeviceoutstream.cc        |   64 +
+ qt5/src/poppler-qt5.h                        | 1812 +++++++++++
+ qt5/src/poppler-sound.cc                     |  132 +
+ qt5/src/poppler-textbox.cc                   |   63 +
+ qt5/tests/.gitignore                         |   30 +
+ qt5/tests/CMakeLists.txt                     |   75 +
+ qt5/tests/Makefile.am                        |  152 +
+ qt5/tests/README.unittest                    |   23 +
+ qt5/tests/check_actualtext.cpp               |   33 +
+ qt5/tests/check_attachments.cpp              |  157 +
+ qt5/tests/check_dateConversion.cpp           |  142 +
+ qt5/tests/check_fonts.cpp                    |  248 ++
+ qt5/tests/check_goostring.cpp                |   61 +
+ qt5/tests/check_lexer.cpp                    |  128 +
+ qt5/tests/check_links.cpp                    |   96 +
+ qt5/tests/check_metadata.cpp                 |  275 ++
+ qt5/tests/check_optcontent.cpp               |  484 +++
+ qt5/tests/check_pagelabelinfo.cpp            |   43 +
+ qt5/tests/check_pagelayout.cpp               |   49 +
+ qt5/tests/check_pagemode.cpp                 |   73 +
+ qt5/tests/check_password.cpp                 |   88 +
+ qt5/tests/check_permissions.cpp              |   44 +
+ qt5/tests/check_search.cpp                   |   91 +
+ qt5/tests/check_strings.cpp                  |  250 ++
+ qt5/tests/poppler-attachments.cpp            |   39 +
+ qt5/tests/poppler-fonts.cpp                  |   89 +
+ qt5/tests/poppler-forms.cpp                  |  166 +
+ qt5/tests/poppler-texts.cpp                  |   40 +
+ qt5/tests/stress-poppler-dir.cpp             |   67 +
+ qt5/tests/stress-poppler-qt5.cpp             |   74 +
+ qt5/tests/test-password-qt5.cpp              |  136 +
+ qt5/tests/test-poppler-qt5.cpp               |  235 ++
+ 106 files changed, 21480 insertions(+), 4 deletions(-)
+
+commit 714ee1e61d853394818dca7155b1b882408ffc6a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jun 16 19:00:01 2013 +0200
+
+    Pass down the recursion param
+
+    Fixes heap smashing in 168.pdf.SIGSEGV.598.462
+
+ poppler/Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 1f3e3828b9a57e044b86640b9bf9ad2437cc5656
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Jun 15 17:21:36 2013 +0200
+
+    Add quotes since use_cairo can have spaces
+
+    BUG #65709
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit fe3ffab19d54326052fd0ff8ee3ee1feb9fa928c
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:   Tue Jun 11 23:08:07 2013 +0200
+
+    Windows compile fixes
+
+ qt4/tests/stress-threads-qt4.cpp | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+commit 99908cb0c8a784791ffa0682c8f105acdef0d5ab
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Tue Jun 11 10:02:01 2013 +0200
+
+    MinGW32 may or may not define __MINGW_PRINTF_FORMAT
+
+    Moreover __USE_MINGW_ANSI_STDIO might be defined as 0
+
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 0673f3d8024554c414f578e0770086f475e6a605
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Jun 11 00:19:19 2013 +0200
+
+    0.23.2
+
+ CMakeLists.txt      |  4 ++--
+ NEWS                | 12 ++++++++++++
+ configure.ac        |  2 +-
+ cpp/Doxyfile        |  2 +-
+ poppler/Makefile.am |  2 +-
+ qt4/src/Doxyfile    |  2 +-
+ 6 files changed, 18 insertions(+), 6 deletions(-)
+
+commit 7f1bf8d94302c15a2ff68debfb6fba49df526d16
+Author: Christoph Duelli <duelli@melosgmbh.de>
+Date:   Thu May 16 16:16:32 2013 +0200
+
+    Do not pollute global namespace with internal classes
+
+    Bug #64680
+
+ fofi/FoFiIdentifier.cc | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+commit 07992075a6d1d29db57f997f67d5a4a6deacbbb4
+Merge: 4a0bd6f 25f453e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jun 9 12:17:53 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+    Conflicts:
+	poppler/Catalog.cc
+	qt4/src/poppler-private.h
+	utils/HtmlOutputDev.cc
+
+commit 25f453ef49004452ac4c201d59d9ce2ef52ffeee
+Author: Julien Nabet <serval2412@yahoo.fr>
+Date:	Sun Jun 9 12:12:06 2013 +0200
+
+    Prefer prefix ++/-- operators for non-primitive types
+
+    Part of bug #80537
+
+ poppler/CachedFile.cc | 3 ++-
+ poppler/Catalog.cc    | 5 +++--
+ utils/HtmlFonts.cc    | 3 ++-
+ utils/HtmlLinks.cc    | 3 ++-
+ 4 files changed, 9 insertions(+), 5 deletions(-)
+
+commit ed01688a899c5e7560a93ca2424ca302ff3452f1
+Author: Julien Nabet <serval2412@yahoo.fr>
+Date:	Sun Jun 9 12:10:01 2013 +0200
+
+    Fix mismatched allocation and deallocation
+
+    Part of bug #65551
+
+ qt4/src/poppler-private.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit a27890ac441fbd613ddfe6fcf404b92be371e554
+Author: Julien Nabet <serval2412@yahoo.fr>
+Date:	Sun Jun 9 12:08:06 2013 +0200
+
+    Fix memory leak
+
+ utils/HtmlOutputDev.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 4a0bd6fdb2e9e3c589e1bdb282e7c2bfca8567b1
+Merge: bbd27c9 17a16a2
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Jun 9 12:06:10 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 17a16a2731b1110a12c7163c139d85bccee04492
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Jun 9 12:04:40 2013 +0200
+
+    Fix mismatched free/delete
+
+    Bug #65553
+
+ poppler/UTF.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit bbd27c92b5e5034dc2899ea26b47fcb983209f82
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Thu Jun 6 23:52:36 2013 +0200
+
+    Speed-up some tiling on a 10x factor
+
+    Bug #64892
+
+ poppler/SplashOutputDev.cc | 15 ++++++++++++++-
+ splash/Splash.cc	    | 15 +++++++++++----
+ splash/Splash.h	    |  3 ++-
+ 3 files changed, 27 insertions(+), 6 deletions(-)
+
+commit 7847769a24bd3ccf863f653bc2215e84157ccfb6
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:	Tue Jun 4 15:31:06 2013 +0200
+
+    Use fseeko64/ftello64 for MinGW32
+
+ goo/gfile.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit 0c3548087b379dd6ffa2291d03f0ea1c7e6a69d1
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:	Tue Jun 4 15:31:05 2013 +0200
+
+    Allow to build without multithreading
+
+ poppler/Annot.cc | 7 +++++++
+ poppler/XRef.cc  | 4 ++++
+ 2 files changed, 11 insertions(+)
+
+commit 1e74ac4589daf80dcac54b094145d32c90069738
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:	Thu Jun 6 01:03:48 2013 +0200
+
+    [qt4] fix autotools
+
+ qt4/tests/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 342cc0d8a101e99199d447d632a1cd5ba7beb5b2
+Author: Li Junling <lijunling@sina.com>
+Date:	Tue Jun 4 22:39:35 2013 +0200
+
+    Fix memory leak
+
+ poppler/SplashOutputDev.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 52945a072b6f864e80485cc4321a27530a76c452
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Jun 4 22:35:32 2013 +0200
+
+    Move the iccColorSpaceCache from Gfx to OutputDev
+
+    This way it's shared when doing tiling. Page 35 of
+    bug-poppler64963.pdf
+    goes down from 150 to 133 seconds
+
+ poppler/Gfx.cc       | 61 ++++++++++++++--------------------
+ poppler/Gfx.h	      | 12 ++-----
+ poppler/GfxState.cc  | 93
+ ++++++++++++++++++++++++++--------------------------
+ poppler/GfxState.h   | 33 ++++++++++---------
+ poppler/OutputDev.cc |  8 ++++-
+ poppler/OutputDev.h  | 19 +++++++++--
+ 6 files changed, 114 insertions(+), 112 deletions(-)
+
+commit 7d4bda198b8ac767bdf4e0a4fdcaae5541113f92
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Jun 3 23:34:11 2013 +0200
+
+    Compile
+
+ qt4/tests/stress-threads-qt4.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 395b3fa021850225e1fea66736f3a3f00571571f
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Jun 3 23:31:52 2013 +0200
+
+    Fix #end -> #endif
+
+ poppler/poppler-config.h.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 425d1b4835389e2031631ce54cee157af39f1cb6
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:	Mon Jun 3 20:04:21 2013 +0200
+
+    Check for the correct number of arguments
+
+ qt4/tests/stress-threads-qt4.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9d3eb07a1ea01b98aabe4f32481dd4a83bc8f2a5
+Author: Hib Eris <hib@hiberis.nl>
+Date:	Mon Jun 3 08:49:37 2013 +0200
+
+    Fix cmake build to use ansi stdio extensions when using a mingw
+    compiler
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=65238
+
+ poppler/poppler-config.h.cmake | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 287afe2290d64ca63cdb75fef8f3fbdc20997970
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:	Sun Jun 2 23:29:00 2013 +0200
+
+    Add a thread stresser in qt4
+
+ qt4/tests/CMakeLists.txt	  |   1 +
+ qt4/tests/Makefile.am		  |   9 +-
+ qt4/tests/stress-threads-qt4.cpp | 298
+ +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 307 insertions(+), 1 deletion(-)
+
+commit 77ecb3823c2db4a6cca5af5889c07c73f90de7f0
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:	Sat Jun 1 19:04:10 2013 +0200
+
+    Add a pthread option to pdftoppm
+
+    It's mostly a developer tool only to test thread support
+    Not end user oriented (hence no buildsystem)
+
+    Parts also by Thomas
+
+ utils/pdftoppm.cc | 130
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 126 insertions(+), 4 deletions(-)
+
+commit caa19f4961146915f51be6c72f60c3aa43037235
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Jun 1 17:22:54 2013 +0200
+
+    qt4: Fix test binary name in help
+
+ qt4/tests/test-poppler-qt4.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a0b48b1d05f08605bca5e1a2e2518e16578f6055
+Author: Hib Eris <hib@hiberis.nl>
+Date:	Sat Jun 1 14:42:42 2013 +0200
+
+    Fix printf format warning for size_t
+
+    Fixes:
+
+      CXX    pdfunite.o
+    pdfunite.cc: In function ‘int main(int, char**)’:
+    pdfunite.cc:142:59: warning: format ‘%d’ expects argument of type
+    ‘int’, but argument 3 has type ‘std::vector<Object>::size_type
+    {aka long unsigned int}’ [-Wformat]
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=65242
+
+ utils/pdfunite.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 860737c2a19c734a0c5b65ad506ba229ba439985
+Author: Hib Eris <hib@hiberis.nl>
+Date:	Sat Jun 1 12:05:17 2013 +0200
+
+    Use ansi stdio extensions when using a mingw compiler
+
+    In the C runtime used by mingw compilers (msvcrt.dll) the printf
+    function does not support the C99 format-width specifier "%ll".
+
+    Defining __USE_MINGW_ANSI_STDIO enables mingw's ansi stdio extensions
+    that implement a C99 compliant printf function.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=65238
+
+ CMakeLists.txt		     | 4 ++++
+ configure.ac		     | 3 +++
+ poppler/poppler-config.h.in | 5 +++++
+ 3 files changed, 12 insertions(+)
+
+commit dd30ce39252a3820254b43f90699849ab5a1ca58
+Author: Hib Eris <hib@hiberis.nl>
+Date:	Fri May 31 12:24:55 2013 +0200
+
+    Fix warning on narrowing conversion from int to DWORD
+
+    Fixes warning when compiling for Windows:
+
+    gfile.cc: In member function 'Goffset GooFile::size() const':
+    gfile.cc:609:30: warning: narrowing conversion of '-1' from 'int'
+    to 'DWORD {aka long unsigned int}' inside { } is ill-formed in C++11
+    [-Wnarrowing]
+    LARGE_INTEGER size = {-1,-1};
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=65239
+
+ goo/gfile.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 01a825f3f9f5dcf686fc123d2cf80b9c525d0d89
+Merge: a57f937 b4b1310
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Jun 1 13:47:29 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit b4b13102716cd33636a94fd99c49487924761670
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Jun 1 13:45:53 2013 +0200
+
+    Fix crash on malformed file
+
+    Also remove outdated comment
+
+    Bug #65221
+
+ poppler/Stream.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit a57f93780de12732875e0195127a92bff835ff61
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue May 28 00:11:10 2013 +0200
+
+    0.23.1
+
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 11 +++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
+ 6 files changed, 17 insertions(+), 6 deletions(-)
+
+commit 299a1447e3d9a845b5e964f29e698046abdb63f2
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue May 28 00:10:43 2013 +0200
+
+    Build poppler-forms in the autotools buildsystem
+
+ qt4/tests/Makefile.am | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit dcfaf20503868d0956ee81208265a975b480fb52
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 27 23:40:49 2013 +0200
+
+    Dist these two files too
+
+ Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit de7a3fb715811be6be9ed51b1c5ab1a63c523403
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 27 23:40:07 2013 +0200
+
+    Add missing copyright
+
+ poppler/Hints.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 30282d3fdbbb3029d9a0f838b2cd979bb962235c
+Merge: 61f6658 56044ef
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 27 00:20:12 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 56044ef482c26f10a8a1371dace049c144659dc7
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 27 00:18:22 2013 +0200
+
+    Fix infinite loop while feeding wrong data in stdin
+
+    Take into account that CachedFile::read might not always return
+    the number of elems we asked it to read
+
+    Bug #64967
+
+ poppler/Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 61f665885daeb0009ecac2cc85188f23d6addb60
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 27 00:01:24 2013 +0200
+
+    Fix big file support in cmake
+
+    Tested by Fabio
+
+ CMakeLists.txt				 |  2 ++
+ cmake/modules/CheckFileOffsetBits.c	 | 14 +++++++++++
+ cmake/modules/CheckFileOffsetBits.cmake | 44
+ +++++++++++++++++++++++++++++++++
+ config.h.cmake				 |  6 ++---
+ 4 files changed, 63 insertions(+), 3 deletions(-)
+
+commit f536a4ec37246e10f03fe4de309bd31deb6a4727
+Author: Hib Eris <hib@hiberis.nl>
+Date:	Thu May 16 21:06:56 2013 +0200
+
+    Do not use deprecated gtk_scrolled_window_add_with_viewport()
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=64683
+
+ glib/demo/find.c	| 4 ++++
+ glib/demo/images.c	| 4 ++++
+ glib/demo/layers.c	| 4 ++++
+ glib/demo/render.c	| 4 ++++
+ glib/demo/selections.c | 4 ++++
+ test/gtk-test.cc	| 4 ++++
+ 6 files changed, 24 insertions(+)
+
+commit c10f2f8777927d8cfe547941ea2f70fcce14da7a
+Author: Pino Toscano <pino@kde.org>
+Date:	Mon May 20 00:09:45 2013 +0200
+
+    fix typo in error message
+
+ poppler/Hints.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 71d327194293cb3d1a0e274eaf4451c7afe81e8a
+Merge: 7b2df1f 6a98b56
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri May 17 23:04:12 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 6a98b56f6ded957477ddcccd4ff849a870020395
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri May 17 23:01:20 2013 +0200
+
+    Make an invalid nSharedGroupsFirst a real error
+
+    Instead trying to recover
+    Fixes bug #46703
+
+ poppler/Hints.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 7b2df1f935192c89eacddd98c4bf92f38013c8e0
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri May 17 20:56:51 2013 +0200
+
+    A simple form dumper
+
+ qt4/tests/CMakeLists.txt    |	 1 +
+ qt4/tests/poppler-forms.cpp | 166
+ ++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 167 insertions(+)
+
+commit 54f539b4436a1a3e0eab2ef0904c302865082982
+Merge: b3d8f51 3a6e2de
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu May 16 21:27:47 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 3a6e2de1d35e3ee4fd86f71713c49bec8e09e41d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu May 16 21:27:02 2013 +0200
+
+    Make sure that Title: doesn't contain \n or \n
+
+    Bug #63862
+
+ poppler/PSOutputDev.cc | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+commit b3d8f510e30fb4d8da9069390d5e9bd8a283fbd6
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Thu May 16 20:52:09 2013 +0200
+
+    Fix splashModeBGR8 rendering
+
+    Also make SplashBitmap able to write splashModeBGR8 images
+
+    Bug #64381
+
+ splash/Splash.cc	|  4 ++--
+ splash/SplashBitmap.cc | 24 ++++++++++++++++++++++--
+ 2 files changed, 24 insertions(+), 4 deletions(-)
+
+commit 8640933a3aa7dbafa21765d029e97b4bba76716c
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:	Thu Apr 25 19:18:30 2013 +0200
+
+    Fix printf format specifiers (Goffset is a long long, not a int)
+
+ poppler/PDFDoc.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit f8e8805bbce3e94b16b77fece0072645c66f6a31
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:	Thu Apr 25 19:06:09 2013 +0200
+
+    Re-enable commented-out printf-format attribute on OutStream::printf
+
+    The answer to the question "2,3 because the first arg is class
+    instance ?" is yes. It's documented behavior:
+     Since non-static C++ methods have an implicit this argument, the
+     arguments of such methods should be counted from two, not one.
+    from
+    http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Function-Attributes.html
+
+ poppler/Stream.h | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+commit 013b2b247268f9b8dcd8e0461580e0bbcf7554c1
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:	Thu Apr 25 17:58:25 2013 +0200
+
+    XRef stream writing: Write 32-bit offsets when possible
+
+    For compatibility reasons: some pdf readers don't support 64-bit
+    offsets
+    yet (for example, poppler 0.22 doesn't)
+
+ poppler/XRef.cc | 38 ++++++++++++++++++++++++++++----------
+ poppler/XRef.h  | 17 +++++++++++++++--
+ 2 files changed, 43 insertions(+), 12 deletions(-)
+
+commit ea61a9dc012fbffd9bc9fe8a09264ba8744635fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 23:15:55 2013 +0200
+
+    0.23.0
+
+    Includes news, soversions, updated copyrights, etc
+
+ CMakeLists.txt		  |  6 +++---
+ NEWS			  | 12 ++++++++++++
+ configure.ac		  |  4 ++--
+ cpp/Doxyfile		  |  2 +-
+ goo/gfile.cc		  |  1 +
+ goo/gfile.h		  |  1 +
+ poppler/CairoOutputDev.h |  2 +-
+ poppler/Makefile.am	  |  2 +-
+ poppler/Stream.cc	  |  1 +
+ poppler/Stream.h	  |  1 +
+ poppler/XRef.cc	  |  1 +
+ qt4/src/CMakeLists.txt   |  2 +-
+ qt4/src/Doxyfile	  |  2 +-
+ qt4/src/Makefile.am	  |  2 +-
+ 14 files changed, 28 insertions(+), 11 deletions(-)
+
+commit 7a5eee1cbebe241b8bd44027fc07682944686910
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 23:00:40 2013 +0200
+
+    Add check_pagelabelinfo test
+
+ qt4/tests/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 30a519f21dd5df8d41a43a58b2cbd95fe657df73
+Merge: 998a9e7 0c0aef2
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 20:40:04 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 0c0aef20d9cecaee1de0badc6cd56dd6e5b5bf12
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 19:57:02 2013 +0200
+
+    0.22.4 version
+
+    Also increase soversion since Gfx.h got a new member
+
+ CMakeLists.txt      | 4 ++--
+ configure.ac	     | 2 +-
+ cpp/Doxyfile	     | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile    | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+commit 4d6662d05f6b652af97ac6e0eb1f1c1dca8e9550
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 19:55:21 2013 +0200
+
+    0.22.4 NEWS
+
+ NEWS | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+commit 93e08d96867d636a70ab04ee4ad22c2214ae4b6a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 19:51:52 2013 +0200
+
+    Update copyright years
+
+ poppler/CairoOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 998a9e7c982a72b0e931304b719de40f30094d12
+Merge: 5e73cb0 73d09cd
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 19:30:26 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+    Conflicts:
+	splash/Splash.cc
+
+commit 73d09cd55f3bd307450c2dd095e039ea39c69cea
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon May 13 19:28:40 2013 +0200
+
+    Fix compilation with fixed point mode enabled
+
+    Thanks to Andreas Müller for the tip
+
+ splash/Splash.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 5e73cb059e27f68b329513de609d52e84d73f8af
+Merge: 5e9654a b3e44fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue May 7 22:00:02 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit b3e44fc59a9258ad701bc67132dea0646fd8b61a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue May 7 21:53:31 2013 +0200
+
+    We need UnicodeParsedString here too
+
+    Fixes KDE bug #307786
+
+ qt4/src/poppler-embeddedfile.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 5e9654a3eb28b2c8b0985545778dd0e45829f8e1
+Merge: eeecd97 a107428
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 25 20:45:34 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+    Conflicts:
+	poppler/Gfx.h
+
+commit a107428e7db0c420b60418a33b9f815909ac9a33
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 25 20:44:36 2013 +0200
+
+    Update my C of the last two previous commits
+
+ poppler/Gfx.cc		| 2 +-
+ poppler/Gfx.h		| 2 +-
+ utils/HtmlOutputDev.cc | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+commit eeecd9718f201dc795b2cb8469c43860aec6e07d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 25 20:29:24 2013 +0200
+
+    Do not start drawing a form we are already drawing
+
+    Bug #63190
+
+ poppler/Gfx.cc | 23 +++++++++++++++++++----
+ poppler/Gfx.h	|  2 ++
+ 2 files changed, 21 insertions(+), 4 deletions(-)
+
+commit 43d66e11aa9e692c1c6b3a237e7e972d317e5c4d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 25 20:27:43 2013 +0200
+
+    Make sure getKids returns != 0 before using it
+
+    Fixes crash in bug #63909
+
+ utils/HtmlOutputDev.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit ec298b3b780f885464aa00880150eaa2b9b50b08
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 25 20:29:24 2013 +0200
+
+    Do not start drawing a form we are already drawing
+
+    Bug #63190
+
+ poppler/Gfx.cc | 23 +++++++++++++++++++----
+ poppler/Gfx.h	|  2 ++
+ 2 files changed, 21 insertions(+), 4 deletions(-)
+
+commit 11ab42e7e90099d0cebf8f02197413fd5dee044b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 25 20:27:43 2013 +0200
+
+    Make sure getKids returns != 0 before using it
+
+    Fixes crash in bug #63909
+
+ utils/HtmlOutputDev.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 4ee78e77f7d6cadc8e150ceff96b546ddca329d4
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:	Sat Apr 20 16:41:56 2013 +0200
+
+    cairo: Always use the trasnfer function if present in setSoftMask
+
+    "If the subtype is Alpha, the transparency group XObject G shall be
+    evaluated to compute a group alpha only. The colours of the
+    constituent
+    objects shall be ignored and the colour compositing computations shall
+    not be performed. The transfer function TR shall then be applied
+    to the
+    computed group alpha to produce the mask values."
+
+    We were using the transfer function only for luminosity soft masks.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=63587
+
+ poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+
+commit 3c2a92b06a6541071bd1e555606bb2096de17ef6
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:	Sat Apr 20 16:41:56 2013 +0200
+
+    cairo: Always use the trasnfer function if present in setSoftMask
+
+    "If the subtype is Alpha, the transparency group XObject G shall be
+    evaluated to compute a group alpha only. The colours of the
+    constituent
+    objects shall be ignored and the colour compositing computations shall
+    not be performed. The transfer function TR shall then be applied
+    to the
+    computed group alpha to produce the mask values."
+
+    We were using the transfer function only for luminosity soft masks.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=63587
+
+ poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+
+commit fd648e83e60db7157b7273ffddc02308b0c5813b
+Merge: 970e9f6 53b9cec
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Apr 21 23:30:16 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 53b9cec6c1334020f90b885cff6fc30293437e5f
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sun Apr 21 23:28:40 2013 +0200
+
+    Splash: Always consider a softmask transfer function
+
+    Fixes bug 63587 in splash
+
+ poppler/SplashOutputDev.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+commit 970e9f6304c3b59ac3e44495b90a5cfe7c7ceb8b
+Author: Hib Eris <hib@hiberis.nl>
+Date:	Fri Apr 12 13:26:55 2013 +0200
+
+    Remove unused variables from Lexer::getObj()
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=63467
+
+ poppler/Lexer.cc | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+commit f8bf602620b3c7570f483ac66fc4d6a76a81a882
+Merge: bbd27dc 62a5b4d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Apr 14 16:40:51 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 62a5b4d5c6d5c368d190b86eab63ccb07d642c01
+Author: Hib Eris <hib@hiberis.nl>
+Date:	Sun Apr 14 16:37:14 2013 +0200
+
+    Check for strcpy_s() and strcat_s() at configure time
+
+    It is better to test for functions than to hardcode exceptions for
+    specific compilers.
+
+    This fixes compiling poppler with the latest mingw-w64 compiler which
+    has strcpy_s() and strcat_s() build in.
+
+    Bug #63459
+
+ ConfigureChecks.cmake | 2 ++
+ configure.ac	       | 1 +
+ test/perf-test.cc     | 6 ++++--
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+commit bbd27dc4ce7b24af890d80f597f74e5d7ee0215a
+Merge: ea3698c 5bc0080
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri Apr 12 00:10:27 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+    Conflicts:
+	poppler/TextOutputDev.h
+
+commit 5bc00809ebe560a180d5df93eb50bdf0ff0e97e6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 11 23:29:00 2013 +0200
+
+    Increase poppler core soname
+
+ CMakeLists.txt      | 2 +-
+ poppler/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 115d4c1465291adde86c3c905f265ac03374441f
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 11 23:28:17 2013 +0200
+
+    Increase version number to 0.22.3
+
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit ae1a3553b85e2616a339aacb6efecd15db373858
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 11 23:26:44 2013 +0200
+
+    News file
+
+ NEWS | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+commit 1fefe98fc86cf8449346bdc230dff5758b1bb7a3
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Apr 11 23:22:20 2013 +0200
+
+    Update copyrgihts
+
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/PDFDoc.cc	   | 2 +-
+ poppler/TextOutputDev.cc  | 2 +-
+ poppler/TextOutputDev.h   | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit ea3698cfffc9c132081f5691287ef1fd17911b2a
+Merge: fcc1468 aaaea5d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Wed Apr 10 20:42:01 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit aaaea5d0f2f427e82625a04f90c178e24892e539
+Author: Marek Kasik <mkasik@redhat.com>
+Date:	Wed Apr 10 16:41:48 2013 +0200
+
+    man pages: Fix typos
+
+    Fix several typos in manual pages of pdftops and pdfseparate.
+
+ utils/pdfseparate.1 | 2 +-
+ utils/pdftops.1     | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit fcc14682899ff4981bfece74dbc8c290a625b05c
+Merge: f11e216 e6559a0
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Apr 7 17:44:12 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit e6559a0d836df127ed5061794dc737d435ef534c
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Apr 7 17:42:23 2013 +0200
+
+    Fix crash in KDE bug #317710
+
+    It is not guaranteed that the ::LinkAction passed to
+    PageData::convertLinkActionToLink
+    will be always around (e.g. Page::action deletes it) so make a copy
+    of the ::MediaRendition object
+
+ qt4/src/poppler-link.h   | 6 +++---
+ qt4/src/poppler-media.cc | 6 ++++++
+ qt4/src/poppler-media.h  | 5 ++++-
+ qt4/src/poppler-page.cc  | 4 ++--
+ 4 files changed, 15 insertions(+), 6 deletions(-)
+
+commit f11e21627121c3ff81c0ec7f4d71936a2dd590c3
+Merge: e1ffa91 b9fdb0c
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Apr 6 23:26:54 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit e1ffa9100cf6b4a444be7ed76b11698a5c5bb441
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sat Apr 6 23:21:58 2013 +0200
+
+    Fix endstream detection
+
+    Part 1 of bug #62985
+
+    the endstream search, and at least with bug-poppler16579.pdf this
+    doesn't work correctly: the shift(-1) with the used token mechanism
+    in Lexer isn't correct for a binary data stream. If there is i.e. a
+    "(" without corresponding ")" in the binary data, which of course can
+    happen and happens in that pdf, shift(-1) skips the searched endstream
+    and can therefore in worst case reach the end-of-file. Therefore I
+    implemented a shift("endstream") in Java, which I now port back to
+    C++, or in other words "There and Back Again" :-)
+
+    You can test it with bug-poppler16579.pdf if You just change temporary
+
+	      if (longNumber <= INT_MAX && longNumber >= INT_MIN &&
+	      *end_ptr == '\0') {
+
+    in XRef.cc to
+
+	      if (gFalse && longNumber <= INT_MAX && longNumber >=
+	      INT_MIN && *end_ptr == '\0') {
+
+ poppler/Lexer.cc  | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Lexer.h   |  2 ++
+ poppler/Parser.cc | 28 ++++++++++++++++++++++++++--
+ poppler/Parser.h  |  2 ++
+ 4 files changed, 75 insertions(+), 2 deletions(-)
+
+commit b9fdb0cb767a228c56f3f0635a7f78e3e0a8c7b6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Apr 6 23:20:48 2013 +0200
+
+    Last commit was Thomas' forgot his (C)
+
+ poppler/XRef.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 94bee4601cbbda0e7c6205a04650e0510f198aee
+Merge: 42368fb b312210
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Apr 6 23:19:25 2013 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit b312210b630f96baeb8b2f3b49b0b79779609d98
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Apr 6 23:18:18 2013 +0200
+
+    Fix for complete rewrites in repaired files
+
+    Part 2 of bug #62985
+    if You save a PDF with defect xref offsets, the
+
+    readXRefUntil(-1 /* read all xref sections */, &xrefStreamObjNums)
+
+    in XRef::scanSpecialFlags() will destroy the already reconstructed
+    entries table, but this means that any modification which the user did
+    in the meantime get lost. This can be tested i.e. with bug168518.pdf.
+
+ poppler/XRef.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 42368fb9452c3719a7bbd159f1c1421068f40653
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Apr 6 18:28:35 2013 +0200
+
+    Add missing free()
+
+ poppler/PDFDoc.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2264e7a95e5dc252de1b5736a1edd6bf5de3ad1f
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sat Apr 6 18:27:57 2013 +0200
+
+    implement Crypt filter
+
+    Bug #62800
+
+ poppler/Decrypt.h |  3 ++-
+ poppler/PDFDoc.cc | 37 ++++++++++++++++++++++++++++++++++---
+ poppler/Stream.cc |  6 ++++++
+ poppler/Stream.h  |  3 ++-
+ 4 files changed, 44 insertions(+), 5 deletions(-)
+
+commit a65a4e6f878ff033b780b2f1e3362f2918c93b6b
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:	Sat Apr 6 18:25:21 2013 +0200
+
+    No need to keep the mutex attributes around all the time
+
+ goo/GooMutex.h | 27 ++++++++++-----------------
+ 1 file changed, 10 insertions(+), 17 deletions(-)
+
+commit 73ff5ad58cfe7ec9415cc1459b6ca083fee608f4
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Apr 6 18:19:28 2013 +0200
+
+    Pass the recursion flag
+
+ poppler/DCTStream.cc | 6 +++---
+ poppler/DCTStream.h  | 2 +-
+ poppler/Stream.cc    | 4 ++--
+ poppler/Stream.h     | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+commit 837e3704e76ea857b3de45503840e9b855096fef
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Apr 6 17:01:08 2013 +0200
+
+    Make our mutexes recursive
+
+    Fixes a deadlock problem found with a pdf i can't share
+    (411klaralv.pdf)
+    Reviewed by Thomas and Adam on the mailing list
+
+ CMakeLists.txt       |  3 +++
+ glib/CMakeLists.txt  |  3 +++
+ goo/GooMutex.h       | 36 ++++++++++++++++++++++--------------
+ poppler/Annot.cc     | 34 +++++++++++++++++-----------------
+ poppler/Annot.h      |  4 ++--
+ poppler/Catalog.cc   | 24 +++++++++++-------------
+ poppler/Catalog.h    |  8 ++++----
+ poppler/XRef.cc      |  2 +-
+ utils/CMakeLists.txt |  3 +++
+ 9 files changed, 66 insertions(+), 51 deletions(-)
+
+commit 0a243c8c14d09a40f25338999c3ca06273277b45
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:	Fri Apr 5 00:00:07 2013 +0200
+
+    Add a GooFile class to encapsulate file read access using offsets
+
+    Bug #62735
+
+ ConfigureChecks.cmake	    |  2 ++
+ config.h.cmake		    |  6 ++++
+ configure.ac		    |  1 +
+ goo/gfile.cc		    | 80
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ goo/gfile.h		    | 30 +++++++++++++++++
+ poppler/GlobalParamsWin.cc | 19 ++++-------
+ poppler/PDFDoc.cc	    | 37 ++++++---------------
+ poppler/PDFDoc.h	    |  4 ++-
+ poppler/Stream.cc	    | 46 +++++++++-----------------
+ poppler/Stream.h	    | 17 +++-------
+ 10 files changed, 158 insertions(+), 84 deletions(-)
+
+commit 70e6af4739d2eea58e6f3200a8c9467597a12ae5
+Author: Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
+Date:	Thu Apr 4 23:10:09 2013 +0200
+
+    Be pedantic about setjmp use
+
+    Bug #63067
+
+ poppler/DCTStream.cc | 57
+ +++++++++++++++++++++++++++-------------------------
+ 1 file changed, 30 insertions(+), 27 deletions(-)
+
+commit c7e28e3d672654f31f1a0f95245a1fba3bc9c28f
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Mar 25 22:55:58 2013 +0100
+
+    Only write the file once when saving
+
+    Bug #62739
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 09ddb34f202be2111c70901724d64d3b61483c7a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Mar 25 22:55:58 2013 +0100
+
+    Only write the file once when saving
+
+    Bug #62739
+
+ poppler/PDFDoc.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 75378557f409a5a2305ea0fb42c56184c74ba887
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:	Sun Mar 24 12:53:29 2013 +0100
+
+    glib: Always start from the beginning when starting a new search on
+    a page
+
+    And start from previous match when searching the next one on the same
+    page. This allows to search for the same string multiple times on the
+    same page.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=59972
+
+ glib/poppler-page.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 4ee6757dd7de9211faf8601531342a199225a06d
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:	Sun Mar 24 12:53:29 2013 +0100
+
+    glib: Always start from the beginning when starting a new search on
+    a page
+
+    And start from previous match when searching the next one on the same
+    page. This allows to search for the same string multiple times on the
+    same page.
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=59972
+
+ glib/poppler-page.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 83cf2d3d3ecce6340d858a2ee037cd5120ac1db5
+Author: Jason Crain <jason@aquaticape.us>
+Date:	Sat Mar 9 08:44:36 2013 -0600
+
+    TextOutputDev: Set text matrix when painting selection
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=61042
+
+ poppler/TextOutputDev.cc | 30 +++++++++++++++++++++++-------
+ poppler/TextOutputDev.h  |  3 ++-
+ 2 files changed, 25 insertions(+), 8 deletions(-)
+
+commit a3bc584fdd7f74a7dab701c743df0bb0bf74a03e
+Author: Jason Crain <jason@aquaticape.us>
+Date:	Sat Mar 9 08:44:36 2013 -0600
+
+    TextOutputDev: Set text matrix when painting selection
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=61042
+
+ poppler/TextOutputDev.cc | 30 +++++++++++++++++++++++-------
+ poppler/TextOutputDev.h  |  3 ++-
+ 2 files changed, 25 insertions(+), 8 deletions(-)
+
+commit 8cbdbc64897a34beb226d4dc4c58095f10013f29
+Merge: 2bce2cf a01e2d4
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Wed Mar 20 22:37:06 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit a01e2d41fcb638fe340bd3d4d22bd13db245e0fd
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Wed Mar 20 22:35:08 2013 +0100
+
+    check order bounding box values in tiling pattern
+
+    Bug #62369
+
+ poppler/Gfx.cc | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+commit 2bce2cf2a523f9b8db7f5e255384044b8dfe1a24
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Mar 19 22:53:47 2013 +0100
+
+    Avoid blackboxes on weird files using the thin line mode
+
+    Bug #61719
+
+ splash/Splash.cc | 35 +++++++++++++++++++++++++++++++++++
+ splash/Splash.h  |  1 +
+ 2 files changed, 36 insertions(+)
+
+commit b2d07cbf0c2f94bd25e1422e366ff78031815867
+Merge: 80cf78f 3206950
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Mar 18 21:06:59 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 3206950658521009b52f638cc5e712e0cef42706
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Mar 18 21:06:09 2013 +0100
+
+    Spec says Zoom -> 0 means no zoom change
+
+ poppler/Link.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 13ee9f8b7d42ed7d7bc0f9dbf190ff66e6ab5a81
+Author: Pino Toscano <pino@kde.org>
+Date:	Mon Mar 18 18:15:57 2013 +0100
+
+    cmake: drop search of gthread-2.0 and gio-2.0 from GTK
+
+    this matches what is done in the autoconf counterpart
+
+ cmake/modules/FindGTK.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 47e869e60fb147caca825380eeaa2a0851d502b9
+Author: Michael Weiser <michael@weiser.dinsnail.net>
+Date:	Mon Mar 18 18:15:14 2013 +0100
+
+    cmake: search also for gio-2.0 as GLIB library
+
+ cmake/modules/FindGLIB.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 80cf78f2020e2f4cf33ed49fe522c6861d710588
+Merge: b21780e 72c8312
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Mon Mar 18 20:02:08 2013 +1030
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 72c8312d77704211f55c8de35b47bd811c792878
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Sun Mar 17 19:39:14 2013 +1030
+
+    cairo: Don't change image interpolation when printing
+
+    Bug 62418
+
+ poppler/CairoOutputDev.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit b21780e69dd92f3f2bcb7851608d3e0557dc81f8
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sat Mar 16 23:20:35 2013 +0100
+
+    Fix typo
+
+ poppler/XRef.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 75849a0d7c205c048714b90883695b6bebd2298c
+Merge: ec7140b 5a51812
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Mar 12 20:27:59 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+    Conflicts:
+	poppler/Stream.h
+
+commit 5a51812b7c1457feb8acaa106f43d7d5252b3980
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:	Tue Mar 12 20:25:50 2013 +0100
+
+    Fix compile when not using libjpeg
+
+ poppler/Stream.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 341e863d65fdd5619a071e4fd903fa82bf33c757
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Mar 11 19:20:06 2013 +0100
+
+    0.22.2
+
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 16 ++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
+ 6 files changed, 22 insertions(+), 6 deletions(-)
+
+commit ec7140b3f56b034fbbc53cb8066ba01fe9f60f47
+Merge: c86062f 5db6585
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri Mar 8 16:41:21 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+    Conflicts:
+	poppler/Stream.cc
+	poppler/Stream.h
+
+commit 5db6585c2b02dd4071f1adabd53509506333dcf8
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri Mar 8 16:38:49 2013 +0100
+
+    Make the non jpeglib based DCTStream compile
+
+ poppler/Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6402e291e1f9374fbaf4de3b97b21f43d38d6ab8
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Fri Mar 8 16:37:11 2013 +0100
+
+    Workaround broken jpeg stream definitions
+
+    Bug #61994
+
+ poppler/DCTStream.cc | 22 +++++++++++++++++++---
+ poppler/DCTStream.h  |  6 +++++-
+ poppler/Stream.cc    |  8 ++++----
+ poppler/Stream.h     |  4 ++--
+ 4 files changed, 30 insertions(+), 10 deletions(-)
+
+commit c86062f982d6eb08cb27b654b6317c71ab77c692
+Merge: 677e5b2 4e142b6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Mar 4 20:13:36 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 4e142b60790638e4495b4fd6551702470cf4c38f
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Mar 4 20:12:01 2013 +0100
+
+    Make sure we don't try to paint in x < 0
+
+    Fixes crash in KDE bug #315432
+
+ splash/Splash.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 677e5b265a0d39a988f65d642a4f964a279fad28
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Mar 3 19:07:32 2013 +0100
+
+    Small improvements over locker class
+
+     * Remove the namespace (we don't use much/any namespaces in
+     poppler core)
+     * Rename the class and defines from lock to locker since lock and be
+     either the action "to lock" or the "thing that locks", with locker
+     it is more clear (i think) that is "the thing" than "the action"
+     * Make Annot::decRefCnt use gLockMutex since we the object itself
+     is being deleted in the if and not sure the locker would be happy
+     with that
+     * change the getNumPages() param to be DoNotLockMutex since
+     previously it was a gFalse (i guess Thomas made a c&p typo here)
+     * Have only one constructor like Adam suggested.
+
+ goo/GooMutex.h		    | 33 +++++++++--------
+ poppler/Annot.cc	    | 92
+ +++++++++++++++++++++++-----------------------
+ poppler/Annot.h	    |  6 +--
+ poppler/Array.cc	    | 15 ++++----
+ poppler/CairoFontEngine.cc |  8 ++--
+ poppler/Catalog.cc	    | 52 +++++++++++++-------------
+ poppler/Catalog.h	    | 10 ++---
+ poppler/Dict.cc	    | 20 +++++-----
+ poppler/PDFDoc.cc	    | 12 +++---
+ poppler/Page.cc	    | 16 ++++----
+ poppler/Stream.cc	    |  8 ++--
+ poppler/XRef.cc	    | 18 ++++-----
+ 12 files changed, 147 insertions(+), 143 deletions(-)
+
+commit d5c929fc253c2748bb8fa3642d9b5383c5fe96f8
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sun Mar 3 18:00:11 2013 +0100
+
+    Add a locker helper and a bool -> enum changes
+
+    Bug #59933
+
+ goo/GooMutex.h		    |  16 +++++++
+ poppler/Annot.cc	    | 114
+ +++++++++++++++++----------------------------
+ poppler/Annot.h	    |	4 +-
+ poppler/Array.cc	    |  22 +++------
+ poppler/CairoFontEngine.cc |  10 ++--
+ poppler/Catalog.cc	    |  79 ++++++++++---------------------
+ poppler/Catalog.h	    |	9 ++--
+ poppler/Dict.cc	    |  29 ++++--------
+ poppler/FontInfo.cc	    |	2 +-
+ poppler/PDFDoc.cc	    |  21 ++-------
+ poppler/Page.cc	    |  32 ++++++-------
+ poppler/Page.h		    |	3 +-
+ poppler/Stream.cc	    |  12 ++---
+ poppler/XRef.cc	    |  29 ++++--------
+ 14 files changed, 145 insertions(+), 237 deletions(-)
+
+commit 1f4a012f7570ffd2120e3e8c2236de5408f3dda3
+Merge: 15d4039 a766740
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri Mar 1 19:16:52 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit a766740cf5a5a7580935a026bf15fbd668aa0fdf
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Fri Mar 1 19:12:22 2013 +0100
+
+    Restore CTM on early exits
+
+    Bug #61413
+
+ poppler/SplashOutputDev.cc | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+commit 15d40392a29dded8a29c2dc9d7c15b402515e033
+Merge: be5d9af 39882df
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Thu Feb 28 19:46:59 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 39882dfecdccc00db353946a31d395582ee37022
+Author: José Aliste <jaliste@src.gnome.org>
+Date:	Wed Feb 27 01:33:38 2013 +0100
+
+    Correct rendering of underline and strike out annotations
+
+    Current code assumes that the text to underline or strike out is
+    horizontal.
+    Fixes bug #61518
+
+ poppler/Annot.cc | 27 ++++++++++++++++-----------
+ 1 file changed, 16 insertions(+), 11 deletions(-)
+
+commit be5d9af38655496a2eaa4eb12cea84461c5aeb3f
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sat Feb 23 23:41:46 2013 +0100
+
+    expose thin line modes in qt frontend
+
+ qt4/src/poppler-page.cc | 5 ++++-
+ qt4/src/poppler-qt4.h	 | 6 ++++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+commit f96cbacfdbc97ace35f843854992f06e9322f485
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sat Feb 23 23:39:52 2013 +0100
+
+    Refine splashThinLineShape support
+
+ splash/Splash.cc | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+commit 47453a78e52aa43edd148aef53b67306603161f5
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Wed Feb 20 23:12:17 2013 +0100
+
+    More threading safety
+
+ poppler/Annot.cc		 | 97
+ +++++++++++++++++++++++++++++++++++------
+ poppler/Annot.h		 |  8 +++-
+ poppler/FontInfo.cc		 | 29 ++++++------
+ poppler/FontInfo.h		 |  5 ++-
+ poppler/Page.cc		 | 11 ++++-
+ poppler/Page.h			 |  6 +--
+ poppler/SplashOutputDev.cc	 |  7 ++-
+ poppler/SplashOutputDev.h	 |  5 ++-
+ poppler/XRef.cc		 |  4 +-
+ qt4/src/poppler-page.cc	 |  9 ++--
+ qt4/src/poppler-ps-converter.cc |  3 +-
+ 11 files changed, 139 insertions(+), 45 deletions(-)
+
+commit 60c5e072d4b930507469e6e8c234971725a4aa26
+Merge: 0d42a6d 8d62625
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Wed Feb 20 21:08:53 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 8d62625610746ad70ffb88d845791fa03f5e35cc
+Author: Thomas Fischer <fischer@unix-ag.uni-kl.de>
+Date:	Wed Feb 20 21:07:10 2013 +0100
+
+    height -> maskHeight
+
+    Bug #61168
+
+ utils/ImageOutputDev.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 0d42a6dab479d27de1ecb2b47ad3f7568b1ee638
+Merge: 7eb7880 8fb243b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Wed Feb 20 00:00:09 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 8fb243bf11a979af8bfa36427436940706c9f71d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 19 23:59:17 2013 +0100
+
+    Initialize cSrcNonIso[3] in splashModeXBGR8
+
+    Fixes valgrind warning
+
+ splash/Splash.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 8a0199a0247c1a03a4d64375ca8bc900570d1817
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 19 23:11:46 2013 +0100
+
+    Fix indent
+
+ splash/Splash.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7eb7880907cb7b6bd1032013d6ce4c49aa3525c4
+Merge: 2c84acb 1389aa4
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 19 22:26:37 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 1389aa41b2984de9da7bb66c11485f6c6aeaea41
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 19 22:25:56 2013 +0100
+
+    fix indent
+
+ splash/Splash.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 2c84acbfd02eeeaf0d20542798e907cb011c1e57
+Merge: 401c35b ffd33e7
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 19 11:32:11 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit ffd33e7b5aea44bc54a74f433f6bfff859b913dd
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 19 11:31:22 2013 +0100
+
+    Fix missing ) here too
+
+ README.contributors | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 14466ecc320387c9b6568280614a96e6f56309b4
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 19 11:31:02 2013 +0100
+
+    Forgot my C here
+
+ poppler/PageLabelInfo.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 401c35b797d3c25c734fbfb5b95be16a666a6012
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Feb 18 22:33:07 2013 +0100
+
+    Fix closing ) as suggested by William Bader
+
+ README.contributors | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 94364adade4dc27e5d80bc14511d4f2b7ea4ab0d
+Merge: 164805b 47f30fa
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Feb 18 20:34:34 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 47f30fa96e62fc215c0e80f42517908760ef8065
+Author: Brad Hards <bradh@frogmouth.net>
+Date:	Mon Feb 18 20:38:10 2013 +1100
+
+    Minor rewording of contributor README
+
+ README.contributors | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+commit 164805b4471256d3915c5e49fff28c9cdcbf89e6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Feb 18 20:05:12 2013 +0100
+
+    Move the commented test to a proper one
+
+ poppler/Makefile.am		   |   3 +-
+ poppler/PageLabelInfo.cc	   | 160
+ +-------------------------------------
+ poppler/PageLabelInfo_p.h	   | 147
+ ++++++++++++++++++++++++++++++++++
+ qt4/tests/CMakeLists.txt	   |   1 +
+ qt4/tests/Makefile.am		   |   4 +
+ qt4/tests/check_pagelabelinfo.cpp |  43 ++++++++++
+ 6 files changed, 198 insertions(+), 160 deletions(-)
+
+commit 527b91a0ef97906041ffe57e88f0d26e1c407af0
+Merge: df35562 95609be
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Feb 18 19:49:14 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 95609be551fc4413874b8980010be70fbbab112a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Mon Feb 18 19:47:19 2013 +0100
+
+    Use the toLatin function in PageLabelInfo::indexToLabel
+
+    Wonder why Kristian never enabled it?
+    Fixes bug #61034
+
+ poppler/PageLabelInfo.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit df3556240d5e4b4546b3c42b29be6d2be83a2802
+Merge: 4dacd7c 5c7057c
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 12 23:55:24 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 5c7057c61ed6e270e001c1f86632f265bebb6890
+Author: Nuno Araujo <nuno.araujo@russo79.com>
+Date:	Tue Feb 12 23:54:47 2013 +0100
+
+    Fix the build with automake-1.13
+
+ autogen.sh   | 17 +++++++++--------
+ configure.ac |  3 +--
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 4dacd7cdeb19d16fe7737c71e34904c7363c6b63
+Merge: 7f2c255 9fc4b9f
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Tue Feb 12 22:59:56 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+commit 9fc4b9f7a7e6105a6fd85aed9c21b78742e89ddd
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:	Tue Feb 12 22:58:17 2013 +0100
+
+    true->TRUE
+
+    Fixes compilation with jpeglib9
+
+ goo/JpegWriter.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 7f2c255ff28386ba992717f729f25a979f240375
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Tue Feb 12 22:48:40 2013 +0100
+
+    Introduce option SplashThinLineMode
+
+    More info at bug #37347
+
+ poppler/SplashOutputDev.cc   |  9 ++++++++-
+ poppler/SplashOutputDev.h    |  3 ++-
+ splash/Splash.cc	      | 37 ++++++++++++++++++++++++++++++-------
+ splash/Splash.h	      |  9 +++++++--
+ splash/SplashClip.cc	      |  7 ++++---
+ splash/SplashClip.h	      |  4 +++-
+ splash/SplashTypes.h	      |  8 +++++++-
+ splash/SplashXPath.cc	      | 14 ++++++++++++--
+ splash/SplashXPath.h	      | 17 ++++++++++++++++-
+ splash/SplashXPathScanner.cc |  9 +++++----
+ splash/SplashXPathScanner.h  | 17 ++++++++++++++++-
+ 11 files changed, 110 insertions(+), 24 deletions(-)
+
+commit c2ebcbea2267f861c491c0cd6c1fbf2dc2aff7d2
+Merge: 48ed05d dca21f8
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sun Feb 10 12:01:13 2013 +0100
+
+    Merge remote-tracking branch 'origin/poppler-0.22'
+
+    Conflicts:
+	poppler/Parser.cc
+
 commit dca21f86359b6b2a925f7b05a2f36ab854cefbce
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sun Feb 10 11:47:21 2013 +0100
+Date:	Sun Feb 10 11:47:21 2013 +0100
 
     0.22.1
 
- CMakeLists.txt   |    2 +-
- NEWS             |    9 +++++++++
- configure.ac     |    2 +-
- cpp/Doxyfile     |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ NEWS		  | 9 +++++++++
+ configure.ac	  | 2 +-
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
  5 files changed, 13 insertions(+), 4 deletions(-)
 
 commit e8e9245f6a4884da3940fc281b7ff1a42d7f5964
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sun Feb 10 11:43:14 2013 +0100
+Date:	Sun Feb 10 11:43:14 2013 +0100
 
     Update C year here too
 
- poppler/poppler-config.h.cmake |    2 +-
- poppler/poppler-config.h.in    |    2 +-
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit ebbacd897e2b529d1c3637b6af438b8dcc1d7ce8
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sun Feb 10 11:42:21 2013 +0100
+Date:	Sun Feb 10 11:42:21 2013 +0100
 
     Update C
 
- poppler/Parser.cc |    1 +
+ poppler/Parser.cc | 1 +
  1 file changed, 1 insertion(+)
 
+commit 48ed05d95598b642a57456a843baf9f246502bb6
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Wed Feb 6 21:56:01 2013 +1030
+
+    Make Goffset long long and factor out all fseek/ftell into gfile.cc
+
+    This fixes build problems on 32-bit machines due to off_t being
+    defined differently depending on whether source files included
+    condig.h.
+
+    Bug 60095
+
+ goo/gfile.cc			| 38 ++++++++++++++++++++++++
+ goo/gfile.h			|  7 +++++
+ goo/gtypes.h			| 19 +-----------
+ poppler/Stream.cc		| 67
+ ++++++------------------------------------
+ poppler/XRef.cc		|  4 +--
+ poppler/poppler-config.h.cmake |  6 ----
+ poppler/poppler-config.h.in	|  6 ----
+ utils/pdfinfo.cc		| 16 ++--------
+ 8 files changed, 60 insertions(+), 103 deletions(-)
+
+commit fbcd64386c1b189db6e06234577261973bdc88cc
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Fri Jan 25 22:24:50 2013 +1030
+
+    cairo: support uncolored tiling patterns
+
+    Bug 59179
+
+ poppler/CairoOutputDev.cc | 20 ++++++++++++++++++++
+ poppler/CairoOutputDev.h  |  1 +
+ 2 files changed, 21 insertions(+)
+
+commit c60ad119363c65d097dff56a68c1ab3fb2933f0b
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Sun Jan 27 15:50:26 2013 +1030
+
+    A few more missing Goffsets
+
+ glib/poppler-input-stream.h |	2 +-
+ poppler/PDFDoc.cc	     | 16 ++++++++--------
+ poppler/PDFDoc.h	     |	6 +++---
+ poppler/Stream.cc	     |	4 ++--
+ poppler/Stream.h	     |	4 ++--
+ 5 files changed, 16 insertions(+), 16 deletions(-)
+
+commit 9b113dc86a27085693ac4bcad061780c881ea7f9
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Sun Jan 27 11:32:34 2013 +1030
+
+    Use sys/types.h instead of stdio.h for the off_t type
+
+    Bug 44085
+
+ goo/gtypes.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit f3aa5236361dca3db64f110520ebe721ba1c9464
+Author: Pino Toscano <pino@kde.org>
+Date:	Sun Jan 27 18:50:10 2013 +0100
+
+    use Goffset also for length in MemStream ctor
+
+ poppler/Stream.cc | 2 +-
+ poppler/Stream.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit eb5ce6990522bac91d8f5d0d3636c46178386d25
+Author: Pino Toscano <pino@kde.org>
+Date:	Sun Jan 27 15:20:42 2013 +0100
+
+    avoid max() macro expansion
+
+    protect against compilers defining max as macro
+
+ poppler/XRef.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6b716b1ab60b573b5770d8636992247387bc3513
+Author: Pino Toscano <pino@kde.org>
+Date:	Sun Jan 27 15:18:04 2013 +0100
+
+    cmake: provide HAVE_FSEEK64 and HAVE_FSEEKO in poppler-config
+
+    followup of a3cee0e7e9dd292c70fe1fa19a92e70bbc1e1b41 also for the
+    cmake-generated poppler-config.h
+
+ poppler/poppler-config.h.cmake | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit fe59ac914230b80aa82b314398a8a038ef083e06
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Sat Jan 26 16:44:49 2013 +1030
+
+    Read 8 byte xref offsets when sizeof(Goffset) < 8
+
+    and print an error if the offset read is too large for Goffset.
+
+    Bug 56318
+
+ poppler/XRef.cc | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit 098d98dfc3846150098f5b20f3f5a07cb565c465
+Author: Lu Wang <coolwanglu@gmail.com>
+Date:	Sat Jan 26 19:31:20 2013 +0100
+
+    Rename function
+
+    Makes it say more what it does
+
+ poppler/GfxState.cc	    | 3 ++-
+ poppler/GfxState.h	    | 3 ++-
+ poppler/SplashOutputDev.cc | 5 +++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+commit 97e93d7583f2a6a5b1c8b51474744ca05277dc28
+Author: Lu Wang <coolwanglu@gmail.com>
+Date:	Sat Jan 26 16:56:00 2013 +0100
+
+    Remove unused deviceHasTextClip
+
+ poppler/CairoOutputDev.h  | 1 -
+ poppler/OutputDev.h	   | 1 -
+ poppler/PSOutputDev.h	   | 1 -
+ poppler/SplashOutputDev.h | 1 -
+ utils/pdftohtml.cc	   | 1 -
+ 5 files changed, 5 deletions(-)
+
+commit 1bb3ddc2264cb65dffd553a952ee4518344df0de
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri Jan 25 19:37:24 2013 +0100
+
+    A few Goffsets we missed
+
+    charactersRead is returned in BaseCryptStream::getPos thus should
+    be a Goffset
+    Gfx::getPos returns Parser::getPos and thus should be a Goffset too
+
+ poppler/Decrypt.h | 3 ++-
+ poppler/Gfx.cc    | 4 ++--
+ poppler/Gfx.h	   | 4 ++--
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+commit 5f8b1275a19b2036c6e9323a744d8bc64af31c36
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri Jan 25 19:32:58 2013 +0100
+
+    New year!
+
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in	| 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 574907e6a74e62a5ee6d7f17c43fdd9bcb07e069
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Fri Jan 25 19:31:59 2013 +0100
+
+    Adrian C for 2013 because of the big files support
+
+ cpp/poppler-private.cpp		      | 1 +
+ cpp/poppler-private.h			      | 1 +
+ goo/gtypes.h				      | 1 +
+ poppler/Decrypt.cc			      | 1 +
+ poppler/Decrypt.h			      | 1 +
+ poppler/Error.cc			      | 1 +
+ poppler/Error.h			      | 1 +
+ poppler/Hints.cc			      | 1 +
+ poppler/Hints.h			      | 1 +
+ poppler/JBIG2Stream.cc			      | 1 +
+ poppler/JBIG2Stream.h			      | 1 +
+ poppler/JPEG2000Stream.cc		      | 1 +
+ poppler/JPEG2000Stream.h		      | 1 +
+ poppler/Lexer.cc			      | 2 +-
+ poppler/Lexer.h			      | 1 +
+ poppler/Object.cc			      | 1 +
+ poppler/Object.h			      | 1 +
+ poppler/PDFDoc.cc			      | 1 +
+ poppler/PDFDoc.h			      | 1 +
+ poppler/PageTransition.cc		      | 1 +
+ poppler/Parser.cc			      | 1 +
+ poppler/Parser.h			      | 1 +
+ poppler/SecurityHandler.cc		      | 1 +
+ poppler/Stream.cc			      | 1 +
+ poppler/Stream.h			      | 1 +
+ poppler/XRef.cc			      | 1 +
+ poppler/XRef.h				      | 1 +
+ qt4/src/poppler-private.cc		      | 1 +
+ qt4/src/poppler-qiodeviceoutstream-private.h | 1 +
+ qt4/src/poppler-qiodeviceoutstream.cc	      | 1 +
+ utils/pdfinfo.cc			      | 2 +-
+ utils/pdfunite.cc			      | 1 +
+ 32 files changed, 32 insertions(+), 2 deletions(-)
+
+commit 95b81ae9b5a345c9caa3d658b9b543d1937c6c02
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Fri Jan 25 21:37:51 2013 +1030
+
+    gitignore
+
+ qt4/tests/.gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 576dc53c857d99bb5d81fe7c9c52fe314a6e58ee
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Fri Jan 25 21:27:13 2013 +1030
+
+    splash: fix uninitialized memory
+
+    Bug 44085
+
+ poppler/SplashOutputDev.cc | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+commit a9768588cd6086f4ca4e6906db038cfdbfd551d5
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Fri Jan 25 21:24:29 2013 +1030
+
+    win32 large file support
+
+    Bug 44085
+
+ goo/gtypes.h	   |  2 ++
+ poppler/Stream.cc | 13 +++++++++++++
+ utils/pdfinfo.cc  |  3 +++
+ 3 files changed, 18 insertions(+)
+
+commit a3cee0e7e9dd292c70fe1fa19a92e70bbc1e1b41
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Fri Jan 25 21:23:43 2013 +1030
+
+    Large file support
+
+    Create a Goffset type and use this type for all file offsets and file
+    sizes.
+
+    Bug 44085
+
+ cpp/poppler-private.cpp		      |   2 +-
+ cpp/poppler-private.h			      |   2 +-
+ glib/poppler-input-stream.cc		      |  10 +-
+ glib/poppler-input-stream.h		      |  16 +--
+ goo/gtypes.h				      |  15 +++
+ poppler/Decrypt.cc			      |   2 +-
+ poppler/Decrypt.h			      |   2 +-
+ poppler/Error.cc			      |  10 +-
+ poppler/Error.h			      |   5 +-
+ poppler/Hints.cc			      |   4 +-
+ poppler/Hints.h			      |   6 +-
+ poppler/JBIG2Stream.cc			      |   8 +-
+ poppler/JBIG2Stream.h			      |   2 +-
+ poppler/JPEG2000Stream.cc		      |   2 +-
+ poppler/JPEG2000Stream.h		      |   2 +-
+ poppler/Lexer.h			      |   8 +-
+ poppler/Object.h			      |   8 +-
+ poppler/PDFDoc.cc			      |  54 +++++-----
+ poppler/PDFDoc.h			      |  14 +--
+ poppler/Parser.cc			      |  10 +-
+ poppler/Parser.h			      |   2 +-
+ poppler/Stream.cc			      |  88 ++++++++---------
+ poppler/Stream.h			      | 102 +++++++++----------
+ poppler/XRef.cc			      | 141
+ +++++++++++++++++----------
+ poppler/XRef.h				      |  34 +++----
+ poppler/poppler-config.h.in		      |   6 ++
+ qt4/src/poppler-private.cc		      |   2 +-
+ qt4/src/poppler-qiodeviceoutstream-private.h |   2 +-
+ qt4/src/poppler-qiodeviceoutstream.cc	      |   4 +-
+ test/perf-test.cc			      |   6 +-
+ utils/pdfinfo.cc			      |   6 +-
+ utils/pdfunite.cc			      |   2 +-
+ 32 files changed, 320 insertions(+), 257 deletions(-)
+
+commit 6eebbb9c015f98b713205e56ab2f1d4d430e9206
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Fri Jan 25 21:22:51 2013 +1030
+
+    Add Int64 object type
+
+    Bug 44085
+
+ poppler/Lexer.cc	    | 46
+ ++++++++++++++++++++--------------------------
+ poppler/Object.cc	    |  6 +++---
+ poppler/Object.h	    | 26 +++++++++++++++-----------
+ poppler/PDFDoc.cc	    |  4 ++--
+ poppler/SecurityHandler.cc |  4 ++--
+ qt4/tests/check_lexer.cpp  | 24 +++++++++++++++++-------
+ test/pdf-fullrewrite.cc    |  9 +--------
+ 7 files changed, 60 insertions(+), 59 deletions(-)
+
+commit be495d73ce7324963a979cffc149330f5512288b
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:	Fri Jan 25 21:14:21 2013 +1030
+
+    use getNum instead of getReal
+
+ poppler/PageTransition.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit a5adb6738e1e191c64457e0c07ee2e3422a042dd
+Author: Albert Astals Cid <aacid@kde.org>
+Date:	Sat Jan 19 18:13:33 2013 +0100
+
+    Don't use config.h but poppler-config.h
+
+    That was already included but i forgot to kill the other one
+
+ poppler/XRef.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 8eb489c355d734a72e140ce7e32470d048362499
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:	Sat Jan 19 17:43:08 2013 +0100
+
+    Make rendering thread-safe
+
+    Bug #50992
+
+ glib/poppler-input-stream.cc |   4 ++
+ glib/poppler-input-stream.h  |   1 +
+ poppler/Annot.cc	      |  52 +++++++++----------
+ poppler/Array.cc	      |  48 +++++++++++++++++-
+ poppler/Array.h	      |  15 ++++--
+ poppler/ArthurOutputDev.cc   |   3 +-
+ poppler/ArthurOutputDev.h    |   3 +-
+ poppler/CairoFontEngine.cc   |  33 +++++++++---
+ poppler/CairoFontEngine.h    |  11 ++--
+ poppler/CairoOutputDev.cc    |  15 ++++--
+ poppler/CairoOutputDev.h     |   5 +-
+ poppler/Catalog.cc	      |  84 +++++++++++++++++++++++++++----
+ poppler/Catalog.h	      |  15 ++++--
+ poppler/Dict.cc	      |  67 ++++++++++++++++++++++++-
+ poppler/Dict.h		      |  11 +++-
+ poppler/Gfx.cc		      |  18 ++++---
+ poppler/Gfx.h		      |   8 +--
+ poppler/GlobalParamsWin.cc   |   4 +-
+ poppler/Object.h	      |   7 +--
+ poppler/OutputDev.h	      |   4 +-
+ poppler/PDFDoc.cc	      |  66 ++++++++++++++++++------
+ poppler/PDFDoc.h	      |  11 ++--
+ poppler/PSOutputDev.cc       |  12 ++---
+ poppler/PSOutputDev.h	      |   4 +-
+ poppler/Page.cc	      |  75 ++++++++++++++++++++++++---
+ poppler/Page.h		      |  18 +++++--
+ poppler/Parser.cc	      |   3 +-
+ poppler/PreScanOutputDev.cc  |   4 +-
+ poppler/PreScanOutputDev.h   |   4 +-
+ poppler/SplashOutputDev.cc   |  16 +++---
+ poppler/SplashOutputDev.h    |   5 +-
+ poppler/Stream.cc	      | 117
+ ++++++++++++++++++++++++++++++++-----------
+ poppler/Stream.h	      |  35 +++++++++----
+ poppler/TextOutputDev.cc     |   5 +-
+ poppler/TextOutputDev.h      |   3 +-
+ poppler/XRef.cc	      |  99 +++++++++++++++++++++++++++++++++---
+ poppler/XRef.h		      |  16 +++++-
+ qt4/src/poppler-document.cc  |  23 ++++-----
+ qt4/src/poppler-page.cc      |  64 ++++++++++++++++++++---
+ qt4/src/poppler-private.cc   |   3 +-
+ qt4/src/poppler-private.h    |  74 +--------------------------
+ test/gtk-test.cc	      |   2 +-
+ utils/HtmlOutputDev.cc       |   3 +-
+ utils/HtmlOutputDev.h	      |   3 +-
+ utils/ImageOutputDev.h       |   3 +-
+ 45 files changed, 793 insertions(+), 283 deletions(-)
+
 commit 3db9472e2b016f1b411174273f27848193ab18e5
 Author: José Aliste <jaliste@src.gnome.org>
-Date:   Fri Jan 18 15:22:03 2013 +0100
+Date:	Fri Jan 18 15:22:03 2013 +0100
 
     Add a null check for gfxFont
 
     Bug #59561
 
- poppler/TextOutputDev.cc |    3 ++-
+ poppler/TextOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 4b69217f72f3fd313f73df059eb1e6294878a95e
 Author: Peter Dyballa <Peter_Dyballa@Freenet.DE>
-Date:   Fri Jan 11 00:32:46 2013 +0100
+Date:	Fri Jan 11 00:32:46 2013 +0100
 
     Use CPPFLAGS for CPPFLAGS not CFLAGS
 
     Bug #59186
 
- m4/libjpeg.m4 |    2 +-
+ m4/libjpeg.m4 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8b6dc55e530b2f5ede6b9dfb64aafdd1d5836492
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Jan 10 22:31:52 2013 +0100
+Date:	Thu Jan 10 22:31:52 2013 +0100
 
     Fix invalid memory access in 1150.pdf.asan.8.69
 
- splash/Splash.cc |    5 ++++-
+ splash/Splash.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit e14b6e9c13d35c9bd1e0c50906ace8e707816888
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Jan 10 20:52:02 2013 +0100
+Date:	Thu Jan 10 20:52:02 2013 +0100
 
     Fix invalid memory access in 2030.pdf.asan.69.463
 
- poppler/Function.cc |    6 +++++-
+ poppler/Function.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 0388837f01bc467045164f9ddaff787000a8caaa
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Jan 10 20:29:06 2013 +0100
+Date:	Thu Jan 10 20:29:06 2013 +0100
 
     Fix another invalid memory access in 1091.pdf.asan.72.42
 
- poppler/Stream.cc |   10 ++++++++--
+ poppler/Stream.cc | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 957aa252912cde85d76c41e9710b33425a82b696
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Jan 10 19:16:19 2013 +0100
+Date:	Thu Jan 10 19:16:19 2013 +0100
 
     Fix invalid memory accesses in 1091.pdf.asan.72.42
 
- splash/Splash.cc |    7 ++++++-
+ splash/Splash.cc | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit bbc2d8918fe234b7ef2c480eb148943922cc0959
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Jan 10 19:07:48 2013 +0100
+Date:	Thu Jan 10 19:07:48 2013 +0100
 
     Fix invalid memory accesses in 1036.pdf.asan.23.17
 
- splash/Splash.cc |   14 ++++++++++++--
+ splash/Splash.cc | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit a9b8ab4657dec65b8b86c225d12c533ad7e984e2
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Wed Jan 9 22:56:45 2013 +0100
+Date:	Wed Jan 9 22:56:45 2013 +0100
 
     Fix crash in broken file 1031.pdf.asan.48.15
 
- splash/Splash.cc |    9 ++++++---
+ splash/Splash.cc | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 7266a634e01e20648cc877371edc95651d30d4fc
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Wed Jan 9 22:52:45 2013 +0100
+Date:	Wed Jan 9 22:52:45 2013 +0100
 
     Forgot the C of the last commit
 
- splash/Splash.cc |    2 +-
+ splash/Splash.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a205e71a2dbe0c8d4f4905a76a3f79ec522eacec
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Wed Jan 9 22:47:28 2013 +0100
+Date:	Wed Jan 9 22:47:28 2013 +0100
 
     Do not crash in broken documents like 1007.pdf.asan.48.4
 
- splash/Splash.cc |   12 +++++++++++-
+ splash/Splash.cc | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit b1026b5978c385328f2a15a2185c599a563edf91
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Wed Jan 9 22:17:09 2013 +0100
+Date:	Wed Jan 9 22:17:09 2013 +0100
 
     Initialize refLine totally
 
     Fixes uninitialized memory read in 1004.pdf.asan.7.3
 
- poppler/Stream.cc |    7 ++++---
+ poppler/Stream.cc | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit bef2c42f381c74fdb8bbb43babe1a93a0e229fb0
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Thu Jan 3 15:27:36 2013 +1030
+Date:	Thu Jan 3 15:27:36 2013 +1030
 
     Parser: return error if stream encountered when allowStreams = false
 
@@ -154,50 +3347,50 @@ Date:   Thu Jan 3 15:27:36 2013 +1030
 
     Bug 58966
 
- poppler/Parser.cc |   14 +++++++-------
+ poppler/Parser.cc | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 801f7feea79e5bc3b5417566552e4df1e6b8a51c
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 29 19:22:54 2012 +0100
+Date:	Sat Dec 29 19:22:54 2012 +0100
 
     0.22.0
 
- CMakeLists.txt      |    6 +++---
- NEWS                |   14 ++++++++++++++
- configure.ac        |    4 ++--
- cpp/Doxyfile        |    2 +-
- poppler/Makefile.am |    2 +-
- qt4/src/Doxyfile    |    2 +-
+ CMakeLists.txt      |	6 +++---
+ NEWS		     | 14 ++++++++++++++
+ configure.ac	     |	4 ++--
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 22 insertions(+), 8 deletions(-)
 
 commit bf5ef68c89d4189b18458b764f807cfc6599bad7
 Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date:   Sat Dec 29 19:43:11 2012 +0100
+Date:	Sat Dec 29 19:43:11 2012 +0100
 
     regtest: Print test results when the test has finished
 
     To make sure the result corresponds to the test now that we are using
     multiple threads.
 
- regtest/Printer.py |   25 +++++++++++++++++++------
- regtest/TestRun.py |   18 +++++++++---------
+ regtest/Printer.py | 25 +++++++++++++++++++------
+ regtest/TestRun.py | 18 +++++++++---------
  2 files changed, 28 insertions(+), 15 deletions(-)
 
 commit 80c7f6aa3fa83175fafc71fa8c834350d513a48f
 Author: Jason Crain <jason@aquaticape.us>
-Date:   Fri Nov 23 23:31:01 2012 -0600
+Date:	Fri Nov 23 23:31:01 2012 -0600
 
     TextOutputDev: Use page size for max value in TextPage::visitSelection
 
     https://bugs.freedesktop.org/show_bug.cgi?id=50138
 
- poppler/TextOutputDev.cc |    3 ++-
+ poppler/TextOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 0d31edfa5617f4fecb04d5476de54a63b6146686
 Author: Ross Lagerwall <rosslagerwall@gmail.com>
-Date:   Fri Nov 30 09:23:55 2012 +0000
+Date:	Fri Nov 30 09:23:55 2012 +0000
 
     pdf-inspector Change from the deprecated GtkTable to GtkGrid
 
@@ -206,34 +3399,34 @@ Date:   Fri Nov 30 09:23:55 2012 +0000
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57727
 
- test/pdf-inspector.ui |   39 +++++++++++++++------------------------
+ test/pdf-inspector.ui | 39 +++++++++++++++------------------------
  1 file changed, 15 insertions(+), 24 deletions(-)
 
 commit 9977a4f26b5698b0b85ca911e7392013941944e0
 Author: Ross Lagerwall <rosslagerwall@gmail.com>
-Date:   Tue Nov 13 15:49:44 2012 +0000
+Date:	Tue Nov 13 15:49:44 2012 +0000
 
     pdf-inspector: Remove deprectated has-separator property
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57727
 
- test/pdf-inspector.ui |    1 -
+ test/pdf-inspector.ui | 1 -
  1 file changed, 1 deletion(-)
 
 commit 806d116a38c2a6552c9bcee2c6f753d7059c17aa
 Author: Ross Lagerwall <rosslagerwall@gmail.com>
-Date:   Tue Nov 13 15:44:15 2012 +0000
+Date:	Tue Nov 13 15:44:15 2012 +0000
 
     pdf-inspector: Add correct title and copyright
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57727
 
- test/pdf-inspector.cc |    5 ++---
+ test/pdf-inspector.cc | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 7d5bf74c19768fa3447819a4debff06d5d83900a
 Author: Ross Lagerwall <rosslagerwall@gmail.com>
-Date:   Tue Nov 13 15:23:36 2012 +0000
+Date:	Tue Nov 13 15:23:36 2012 +0000
 
     pdf-inspector: Fix crash by not freeing filename_g
 
@@ -242,12 +3435,12 @@ Date:   Tue Nov 13 15:23:36 2012 +0000
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57727
 
- test/pdf-inspector.cc |    1 -
+ test/pdf-inspector.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit d61c6d4944d6f7c9e8b517dd28958124f4923d08
 Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date:   Fri Dec 28 01:18:48 2012 +0100
+Date:	Fri Dec 28 01:18:48 2012 +0100
 
     Repair pdfunite
 
@@ -266,147 +3459,147 @@ Date:   Fri Dec 28 01:18:48 2012 +0100
 
     Bug #58569
 
- poppler/PDFDoc.cc |    6 ++++--
- poppler/PDFDoc.h  |    4 ++--
- utils/pdfunite.cc |    4 ++--
+ poppler/PDFDoc.cc | 6 ++++--
+ poppler/PDFDoc.h  | 4 ++--
+ utils/pdfunite.cc | 4 ++--
  3 files changed, 8 insertions(+), 6 deletions(-)
 
 commit be4804bff2b722ceac180da52ad436fee548f9ee
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Fri Dec 28 01:17:14 2012 +0100
+Date:	Fri Dec 28 01:17:14 2012 +0100
 
     dos2unix
 
- poppler/PDFDoc.cc |   36 ++++++++++++++++++------------------
+ poppler/PDFDoc.cc | 36 ++++++++++++++++++------------------
  1 file changed, 18 insertions(+), 18 deletions(-)
 
 commit 703c77eb59aa22ab6372d56a20ee81dc7dfa6e4a
 Author: Even Rouault <even.rouault@mines-paris.org>
-Date:   Fri Dec 28 00:57:17 2012 +0100
+Date:	Fri Dec 28 00:57:17 2012 +0100
 
     Fix very long loop in JPXStream::getImageParams()
 
- poppler/JPXStream.cc |   14 ++++++++++----
+ poppler/JPXStream.cc | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 commit 7e0be7854adc49e4e00c0badb0dc470fbdf6d612
 Author: Even Rouault <even.rouault@mines-paris.org>
-Date:   Fri Dec 28 00:44:29 2012 +0100
+Date:	Fri Dec 28 00:44:29 2012 +0100
 
     Avoid DoS due to huge number of JPX tiles in a stream
 
- poppler/JPXStream.cc |    3 ++-
+ poppler/JPXStream.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 2017dbebd9afd4f172242ff8462fce739d911e64
 Author: Even Rouault <even.rouault@mines-paris.org>
-Date:   Fri Dec 28 00:30:13 2012 +0100
+Date:	Fri Dec 28 00:30:13 2012 +0100
 
     Do not crash on 0 or negative nBits values
 
- poppler/Stream.cc |    5 +++--
+ poppler/Stream.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 858df0dc04e2f306e806fe0fc4fb5c8ec804e263
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Dec 27 23:30:27 2012 +0100
+Date:	Thu Dec 27 23:30:27 2012 +0100
 
     Fix arg typo
 
- poppler/PDFDoc.cc |    2 +-
+ poppler/PDFDoc.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1dd6280d79ad22461208702b3c929377887c99ff
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 15 16:39:23 2012 +0100
+Date:	Sat Dec 15 16:39:23 2012 +0100
 
     0.21.4 soversion increases
 
- CMakeLists.txt      |    2 +-
- glib/CMakeLists.txt |    2 +-
- glib/Makefile.am    |    2 +-
- poppler/Makefile.am |    2 +-
+ CMakeLists.txt      | 2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am    | 2 +-
+ poppler/Makefile.am | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 99d0288bb0b6879ae5414d174939bbd9c1e90bd3
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 15 16:37:19 2012 +0100
+Date:	Sat Dec 15 16:37:19 2012 +0100
 
     0.21.4 version increase
 
- CMakeLists.txt   |    2 +-
- configure.ac     |    2 +-
- cpp/Doxyfile     |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 2bc48d5369f1dbecfc4db2878f33bdeb80d8d90f
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 15 16:36:38 2012 +0100
+Date:	Sat Dec 15 16:36:38 2012 +0100
 
     0.21.4 NEWS
 
- NEWS |   18 ++++++++++++++++++
+ NEWS | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit b3423d54b1254597d7ca953872211fa3aa83e29c
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 15 16:29:54 2012 +0100
+Date:	Sat Dec 15 16:29:54 2012 +0100
 
     Updated copyrights
 
- goo/JpegWriter.h         |    2 +-
- goo/PNGWriter.cc         |    1 +
- goo/PNGWriter.h          |    1 +
- goo/TiffWriter.cc        |    1 +
- goo/TiffWriter.h         |    1 +
- poppler/GlobalParams.cc  |    2 +-
- poppler/TextOutputDev.cc |    1 +
- splash/Splash.cc         |    1 +
- utils/HtmlOutputDev.cc   |    1 +
+ goo/JpegWriter.h	  | 2 +-
+ goo/PNGWriter.cc	  | 1 +
+ goo/PNGWriter.h	  | 1 +
+ goo/TiffWriter.cc	  | 1 +
+ goo/TiffWriter.h	  | 1 +
+ poppler/GlobalParams.cc  | 2 +-
+ poppler/TextOutputDev.cc | 1 +
+ splash/Splash.cc	  | 1 +
+ utils/HtmlOutputDev.cc   | 1 +
  9 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 487f20d24830a97cad4773ae27f0c2cc58df2ed0
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Dec 13 20:40:39 2012 +0100
+Date:	Thu Dec 13 20:40:39 2012 +0100
 
     Check obj1 is a dict before using it
 
     Fixes bug #58257
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 03045469206adbd797e3a38fee3a16cdd1716812
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Dec 13 19:24:54 2012 +0100
+Date:	Thu Dec 13 19:24:54 2012 +0100
 
     Fix crop on EPS conversion
 
     Bug #30692
     Patch is half William Bader's and half mine
 
- poppler/OutputDev.h   |    5 +++++
- poppler/PSOutputDev.h |    4 +++-
- poppler/Page.cc       |    3 +++
- poppler/Page.h        |    2 ++
+ poppler/OutputDev.h   | 5 +++++
+ poppler/PSOutputDev.h | 4 +++-
+ poppler/Page.cc       | 3 +++
+ poppler/Page.h        | 2 ++
  4 files changed, 13 insertions(+), 1 deletion(-)
 
 commit 5d50b2765428e5a417967be2f41452ab05917db7
 Author: Peter Breitenlohner <peb@mppmu.mpg.de>
-Date:   Tue Dec 11 18:54:30 2012 +0100
+Date:	Tue Dec 11 18:54:30 2012 +0100
 
     Correct bad semantics
 
     Negation has higher precedence than comparison
     Confirmed by Marek Kasik that wrote the code originally
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e306bad391a3ff49593f1f3bac0717d62599bd13
 Author: Pino Toscano <pino@kde.org>
-Date:   Sun Dec 9 22:40:27 2012 +0100
+Date:	Sun Dec 9 22:40:27 2012 +0100
 
     pngwriter: move #include <png.h> into .cc file
 
@@ -416,75 +3609,75 @@ Date:   Sun Dec 9 22:40:27 2012 +0100
     This requires HtmlOutputDev.cc to include <png.h> on its own (which
     is correct, since it uses the libpng API directly).
 
- goo/PNGWriter.cc       |   98
- ++++++++++++++++++++++++++++--------------------
- goo/PNGWriter.h        |   12 ++----
- utils/HtmlOutputDev.cc |    4 ++
+ goo/PNGWriter.cc	| 98
+ +++++++++++++++++++++++++++++---------------------
+ goo/PNGWriter.h	| 12 ++-----
+ utils/HtmlOutputDev.cc |  4 +++
  3 files changed, 64 insertions(+), 50 deletions(-)
 
 commit cf338551e9d031cc00d56cea0d258ec5fd96e79a
 Author: Pino Toscano <pino@kde.org>
-Date:   Sun Dec 9 22:22:03 2012 +0100
+Date:	Sun Dec 9 22:22:03 2012 +0100
 
     tiffwriter: move #include <tiffio.h> into .cc file
 
     Move all the private data (including the libtiff types) to a private
     class.
 
- goo/TiffWriter.cc |   94
- ++++++++++++++++++++++++++++++-----------------------
- goo/TiffWriter.h  |   12 ++-----
+ goo/TiffWriter.cc | 94
+ ++++++++++++++++++++++++++++++++-----------------------
+ goo/TiffWriter.h  | 12 ++-----
  2 files changed, 56 insertions(+), 50 deletions(-)
 
 commit 0dfa51f0bfa787ee9c865fd4f05e4bd964c260fc
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sun Dec 9 22:31:50 2012 +0100
+Date:	Sun Dec 9 22:31:50 2012 +0100
 
     Having a look at the log Marek has (C) in this file
 
- poppler/TextOutputDev.cc |    1 +
+ poppler/TextOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit f1b2e29e1d5f420903085318f06c4dc83ebb24f3
 Author: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date:   Sun Dec 9 20:59:26 2012 +0100
+Date:	Sun Dec 9 20:59:26 2012 +0100
 
     Fix crash when rendering on mono1
 
- poppler/SplashOutputDev.cc |    2 +-
+ poppler/SplashOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 71bad47ed6a36d825b0d08992c8db56845c71e40
 Author: Marek Kasik <mkasik@redhat.com>
-Date:   Sun Dec 9 20:20:00 2012 +0100
+Date:	Sun Dec 9 20:20:00 2012 +0100
 
     Filter stuff that might end up in the shell
 
     Since it seems shells don't know how to filter stuff and might
     causing bad things to happen
 
- poppler/Error.cc |   21 +++++++++++++++++----
+ poppler/Error.cc | 21 +++++++++++++++++----
  1 file changed, 17 insertions(+), 4 deletions(-)
 
 commit c35d030472e6cb140c3dff30b91541772c992eb0
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 8 23:51:59 2012 +0100
+Date:	Sat Dec 8 23:51:59 2012 +0100
 
     Add private copy constructor and operator= to make sure we don't
     use the default ones
 
     Since using them would results in bad things happening
 
- goo/GooHash.h    |   16 ++++++++++++++++
- goo/GooList.h    |   16 ++++++++++++++++
- goo/PNGWriter.h  |    5 ++++-
- goo/TiffWriter.h |    5 ++++-
- goo/gfile.h      |    4 ++++
+ goo/GooHash.h	  | 16 ++++++++++++++++
+ goo/GooList.h	  | 16 ++++++++++++++++
+ goo/PNGWriter.h  |  5 ++++-
+ goo/TiffWriter.h |  5 ++++-
+ goo/gfile.h	  |  4 ++++
  5 files changed, 44 insertions(+), 2 deletions(-)
 
 commit f6741d9242bf2d9c13c8d534c50c8e4d404afc7f
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Sun Dec 2 09:34:35 2012 +1030
+Date:	Sun Dec 2 09:34:35 2012 +1030
 
     jpegwriter: move #include "jpeglib.h" into .cc file
 
@@ -496,32 +3689,32 @@ Date:   Sun Dec 2 09:34:35 2012 +1030
 
     Bug 57687
 
- goo/JpegWriter.cc      |  120
- +++++++++++++++++++++++++++++++-----------------
- goo/JpegWriter.h       |   25 +++++-----
- splash/SplashBitmap.cc |    2 +-
- utils/pdftocairo.cc    |    4 +-
+ goo/JpegWriter.cc	| 120
+ ++++++++++++++++++++++++++++++++-----------------
+ goo/JpegWriter.h	|  25 ++++++-----
+ splash/SplashBitmap.cc |   2 +-
+ utils/pdftocairo.cc	|   4 +-
  4 files changed, 95 insertions(+), 56 deletions(-)
 
 commit e78dbb1b7dbd20c3ae547b02270ab0648c1bfc61
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Sun Dec 2 09:10:32 2012 +1030
+Date:	Sun Dec 2 09:10:32 2012 +1030
 
     Reformat goo/*Writer files to poppler style
 
- goo/ImgWriter.h   |   20 ++---
- goo/JpegWriter.cc |  184 +++++++++++++++++++++----------------------
- goo/JpegWriter.h  |   38 ++++-----
- goo/PNGWriter.cc  |  224
- ++++++++++++++++++++++++++---------------------------
- goo/PNGWriter.h   |   62 +++++++--------
- goo/TiffWriter.cc |   40 +++++-----
- goo/TiffWriter.h  |   58 +++++++-------
+ goo/ImgWriter.h   |  20 ++---
+ goo/JpegWriter.cc | 184 ++++++++++++++++++++++----------------------
+ goo/JpegWriter.h  |  38 ++++-----
+ goo/PNGWriter.cc  | 224
+ +++++++++++++++++++++++++++---------------------------
+ goo/PNGWriter.h   |  62 +++++++--------
+ goo/TiffWriter.cc |  40 +++++-----
+ goo/TiffWriter.h  |  58 +++++++-------
  7 files changed, 313 insertions(+), 313 deletions(-)
 
 commit 1bfe4b22cf893dd498d6f306ee9cf942c72fe3ed
 Author: Matthias Kramm <kramm@quiss.org>
-Date:   Mon Nov 19 12:39:56 2012 -0800
+Date:	Mon Nov 19 12:39:56 2012 -0800
 
     Fix linewidths in monochrome mode.
 
@@ -529,44 +3722,44 @@ Date:   Mon Nov 19 12:39:56 2012 -0800
     resolution, monochrome line widths were wrong (snapped back to 1 pixel
     wide.) This patch fixes that issue.
 
- splash/Splash.cc |    2 +-
+ splash/Splash.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e5008bdb26df0135edfbd30a811df2332f4e036c
 Author: José Aliste <jaliste@src.gnome.org>
-Date:   Sat Dec 8 10:33:21 2012 -0300
+Date:	Sat Dec 8 10:33:21 2012 -0300
 
     glib-demo: Update the demo to modify flags of annotations
 
     https://bugs.freedesktop.org/show_bug.cgi?id=58015
 
- glib/demo/annots.c |   65
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/annots.c | 65
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 65 insertions(+)
 
 commit 8cd5cae953de374276c11711dc106de15c8dcad0
 Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date:   Sat Dec 8 18:57:07 2012 +0100
+Date:	Sat Dec 8 18:57:07 2012 +0100
 
     regtest: Use the number of cpus as default number of worker threads
 
- regtest/main.py |    8 +++++---
+ regtest/main.py | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 605c363b04ba3853883010c0a413054fe246d9aa
 Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date:   Sat Dec 8 18:45:22 2012 +0100
+Date:	Sat Dec 8 18:45:22 2012 +0100
 
     regtest: Remove trailing whitespaces
 
- regtest/TestReferences.py |   10 +++++-----
- regtest/TestRun.py        |   10 +++++-----
- regtest/main.py           |    6 +++---
+ regtest/TestReferences.py | 10 +++++-----
+ regtest/TestRun.py	   | 10 +++++-----
+ regtest/main.py	   |  6 +++---
  3 files changed, 13 insertions(+), 13 deletions(-)
 
 commit 787a8438708397f0a1bf26e93726f544c91533e6
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sun Dec 2 08:03:10 2012 +0100
+Date:	Sun Dec 2 08:03:10 2012 +0100
 
     Fix compile warning on deprecated conversion from string constant
 
@@ -577,48 +3770,48 @@ Date:   Sun Dec 2 08:03:10 2012 +0100
     GlobalParams.cc:181:12: warning: deprecated conversion from string
     constant to 'char*' [-Wwrite-strings]
 
- poppler/GlobalParams.cc |    2 +-
+ poppler/GlobalParams.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cb3a10417ae659fdb7b77132c569c93ec00bc95e
 Author: Fabio D'Urso <fabiodurso@hotmail.it>
-Date:   Sun Dec 2 01:41:05 2012 +0100
+Date:	Sun Dec 2 01:41:05 2012 +0100
 
     Fixed check_lexer on 32-bit systems
 
- qt4/tests/check_lexer.cpp |    4 ++--
+ qt4/tests/check_lexer.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8550576bdf74180b62f54f9fd59213fbcd0a1be1
 Author: José Aliste <jaliste@src.gnome.org>
-Date:   Sat Dec 8 10:33:04 2012 -0300
+Date:	Sat Dec 8 10:33:04 2012 -0300
 
     glib: Add poppler_annot_set_flags
 
     https://bugs.freedesktop.org/show_bug.cgi?id=58015
 
- glib/poppler-annot.cc |   22 ++++++++++++++++++++++
- glib/poppler-annot.h  |    2 ++
+ glib/poppler-annot.cc | 22 ++++++++++++++++++++++
+ glib/poppler-annot.h  |  2 ++
  2 files changed, 24 insertions(+)
 
 commit 15dcc5426ce319429e1a2c518902effb2ddf06cf
 Author: Adam Reichold <adamreichold@myopera.com>
-Date:   Thu Dec 6 18:45:46 2012 +0100
+Date:	Thu Dec 6 18:45:46 2012 +0100
 
     implement parallel testing using Python's Queue class
 
- regtest/Printer.py         |   36 ++++++++++++++++-----------
- regtest/TestReferences.py  |   23 +++++++++++++++++-
- regtest/TestRun.py         |   58
- +++++++++++++++++++++++++++++++++++---------
- regtest/backends/cairo.py  |    5 ++--
- regtest/backends/splash.py |    5 ++--
- regtest/main.py            |   11 ++++++++-
+ regtest/Printer.py	    | 36 +++++++++++++++++-----------
+ regtest/TestReferences.py  | 23 +++++++++++++++++-
+ regtest/TestRun.py	    | 58
+ ++++++++++++++++++++++++++++++++++++----------
+ regtest/backends/cairo.py  |  5 ++--
+ regtest/backends/splash.py |  5 ++--
+ regtest/main.py	    | 11 ++++++++-
  6 files changed, 104 insertions(+), 34 deletions(-)
 
 commit c46646020826136b403e9aae8e2ded24c7165522
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sun Dec 2 10:04:28 2012 +0100
+Date:	Sun Dec 2 10:04:28 2012 +0100
 
     glib-demo: Do not use deprecated gtk_color_button_{get,set}_rgba()
 
@@ -627,144 +3820,144 @@ Date:   Sun Dec 2 10:04:28 2012 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57798
 
- glib/demo/selections.c |   16 ++++++++++++++++
+ glib/demo/selections.c | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
 commit f8c1b55e764a6e79b0530fb1be9ee11917f4237e
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 1 22:19:17 2012 +0100
+Date:	Sat Dec 1 22:19:17 2012 +0100
 
     0.21.3
 
- CMakeLists.txt      |    4 ++--
- NEWS                |   17 +++++++++++++++++
- configure.ac        |    2 +-
- cpp/Doxyfile        |    2 +-
- poppler/Makefile.am |    2 +-
- qt4/src/Doxyfile    |    2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 17 +++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 23 insertions(+), 6 deletions(-)
 
 commit e3716d9d735a1093399a3c5c33ea5471a6adc405
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 1 22:34:00 2012 +0100
+Date:	Sat Dec 1 22:34:00 2012 +0100
 
     Build on make check correctly
 
- qt4/tests/check_goostring.cpp |    2 +-
+ qt4/tests/check_goostring.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c7ae96b162e8a05269a54c31f8e7c411edc84553
 Merge: 1f279c3 b1dacd1
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 1 21:26:24 2012 +0100
+Date:	Sat Dec 1 21:26:24 2012 +0100
 
     Merge commit 'b1dacd1e6ab00eb1976491eb2b45c76671011b38'
 
 commit 1f279c32dcdc899b509fc00aaa57382bc8af90f3
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 1 20:37:52 2012 +0100
+Date:	Sat Dec 1 20:37:52 2012 +0100
 
     Update copyrights
 
- poppler/CairoOutputDev.cc |    1 +
+ poppler/CairoOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 5daa17c013be8ebe180ff48207e189bd9bd50a84
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 1 20:06:17 2012 +0100
+Date:	Sat Dec 1 20:06:17 2012 +0100
 
     Initialize to NULL, fixes crash
 
     Since the TextStringToUCS4 not always assigns to second param,
     initialize uni to NULL
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f673be852e6564e039b5ec24e5bf583149b1d5a4
 Author: Jason Crain <jason@aquaticape.us>
-Date:   Sat Dec 1 20:03:00 2012 +0100
+Date:	Sat Dec 1 20:03:00 2012 +0100
 
     Allow large chars in TextPage
 
- poppler/TextOutputDev.cc |    1 -
+ poppler/TextOutputDev.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit aca122432951c4c0a2a5dbaba046d848f2153b84
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 18:27:55 2012 +0200
+Date:	Sat Jun 23 18:27:55 2012 +0200
 
     Fix compile warning on unused variable filename_g
 
- glib/poppler-document.cc |    2 +-
+ glib/poppler-document.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c702066961b1cc2a9c0fb16546e9db93c312813b
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 18:23:59 2012 +0200
+Date:	Sat Jun 23 18:23:59 2012 +0200
 
     Do not use 'size' uninitialized
 
- poppler/PDFDoc.cc |    6 +++---
+ poppler/PDFDoc.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 14bdeacb0eb8e4a1d3995f310a1b526e4dcc96dc
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 18:09:01 2012 +0200
+Date:	Sat Jun 23 18:09:01 2012 +0200
 
     Fix compile warnings on deprecated conversion from string constant to
     'char*'
 
- poppler/FileSpec.cc        |    3 ++-
- poppler/GlobalParamsWin.cc |    4 ++--
+ poppler/FileSpec.cc	    | 3 ++-
+ poppler/GlobalParamsWin.cc | 4 ++--
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit 72d4a1ba998218de876e2a0e939bbec4b7795299
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 17:52:13 2012 +0200
+Date:	Sat Jun 23 17:52:13 2012 +0200
 
     Fix compile warning on signed/unsigned comparison
 
- goo/gfile.cc |    2 +-
+ goo/gfile.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1262111e70ff161e495505bd6a262cc0357a943c
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 17:46:54 2012 +0200
+Date:	Sat Jun 23 17:46:54 2012 +0200
 
     Remove unused variable
 
- goo/gfile.cc |    3 +--
+ goo/gfile.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 85572b85950ed4e4421f1e61e704e5c250ca27d9
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Sat Dec 1 01:50:25 2012 +0100
+Date:	Sat Dec 1 01:50:25 2012 +0100
 
     Silence gcc warning
 
     Bug #57572
 
- goo/TiffWriter.cc |    4 ++--
+ goo/TiffWriter.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a97aead193a927b91a4e33d7b5d2ba7179e664df
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Fri Nov 30 21:30:19 2012 +0100
+Date:	Fri Nov 30 21:30:19 2012 +0100
 
     Splash: Implement bilinear image scaling
 
     Bug #22138
 
- poppler/SplashOutputDev.cc |   10 +--
- splash/Splash.cc           |  183
- +++++++++++++++++++++++++++++++++++++++++---
- splash/Splash.h            |   13 +++-
+ poppler/SplashOutputDev.cc |  10 +--
+ splash/Splash.cc	    | 183
+ ++++++++++++++++++++++++++++++++++++++++++---
+ splash/Splash.h	    |  13 +++-
  3 files changed, 188 insertions(+), 18 deletions(-)
 
 commit e6806d893a9a104e3f23d69d0245ad0e4948a409
 Author: Pino Toscano <pino@kde.org>
-Date:   Wed Nov 28 17:59:36 2012 +0100
+Date:	Wed Nov 28 17:59:36 2012 +0100
 
     cmake: Enable compiler warnings for C code
 
@@ -773,12 +3966,12 @@ Date:   Wed Nov 28 17:59:36 2012 +0100
 
     followup of 5c5945d163fe406960ccc2e3a71882722b9e69d1
 
- CMakeLists.txt |    2 ++
+ CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 commit bdb17da35de49b9fd1a549c3afd5e36004552080
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Mon Nov 26 20:38:03 2012 +0100
+Date:	Mon Nov 26 20:38:03 2012 +0100
 
     cairo: Fix uninitaliazed warning in CairoOutputDev
 
@@ -792,12 +3985,12 @@ Date:   Mon Nov 26 20:38:03 2012 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57571
 
- poppler/CairoOutputDev.cc |    2 +-
+ poppler/CairoOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit beff044e4fdf44e80ad7c75255cb71a83e70a293
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Tue Nov 27 22:19:01 2012 +0100
+Date:	Tue Nov 27 22:19:01 2012 +0100
 
     glib-demo: Fix warning on signedness
 
@@ -814,12 +4007,12 @@ Date:   Tue Nov 27 22:19:01 2012 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/attachments.c |    2 +-
+ glib/demo/attachments.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b484749ffa58315e4b61738d652347d7a77da982
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Tue Nov 27 19:38:59 2012 +0100
+Date:	Tue Nov 27 19:38:59 2012 +0100
 
     glib-demo: Fix set but unused warning
 
@@ -833,113 +4026,113 @@ Date:   Tue Nov 27 19:38:59 2012 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/print.c |    9 ++++++---
+ glib/demo/print.c | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 8438daf7bf7ab1b96c6899baab7e47d9c634cb3d
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sun Jun 24 14:54:31 2012 +0200
+Date:	Sun Jun 24 14:54:31 2012 +0200
 
     glib-demo: pgd_text_view_query_tooltip(): return a gboolean
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/text.c |    4 +++-
+ glib/demo/text.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit ff9e211cfb60eb820b9b046da546352fa59d7df9
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 22:56:02 2012 +0200
+Date:	Sat Jun 23 22:56:02 2012 +0200
 
     glib-demo: Remove set but unused variable textinfo
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/text.c |    2 --
+ glib/demo/text.c | 2 --
  1 file changed, 2 deletions(-)
 
 commit 8e5ae33bc63eca5297dea12fc281ba223f5be09a
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 22:44:22 2012 +0200
+Date:	Sat Jun 23 22:44:22 2012 +0200
 
     glib-demo: Fix warning "operation on 'page' may be undefined
     [-Wsequence-point]"
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/text.c |    2 +-
+ glib/demo/text.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c6f98d62b885e1d7f6ce1f265d4a87dca36494de
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 22:38:35 2012 +0200
+Date:	Sat Jun 23 22:38:35 2012 +0200
 
     glib-demo: Remove unused variable slice_selector
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/render.c |    2 +-
+ glib/demo/render.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit da56d280e2a51229c93117d8b537897ba63296cf
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 22:36:29 2012 +0200
+Date:	Sat Jun 23 22:36:29 2012 +0200
 
     glib-demo: Remove unused variable region
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/selections.c |    1 -
+ glib/demo/selections.c | 1 -
  1 file changed, 1 deletion(-)
 
 commit c792e59064018e0fd899f32080489419517f2bbe
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 22:34:44 2012 +0200
+Date:	Sat Jun 23 22:34:44 2012 +0200
 
     glib-demo: Do not use 'text' uninitialized
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/utils.c |    2 +-
+ glib/demo/utils.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c5a8f7eda14030436e6905dd826e72cabbcf0e5f
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 22:26:53 2012 +0200
+Date:	Sat Jun 23 22:26:53 2012 +0200
 
     glib-demo: Fix warning on unused variable selection
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/layers.c |    1 -
+ glib/demo/layers.c | 1 -
  1 file changed, 1 deletion(-)
 
 commit 4ceb3f4f4ca0092e79bb36723a7332b071491666
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Jun 23 18:36:12 2012 +0200
+Date:	Sat Jun 23 18:36:12 2012 +0200
 
     glib-demo: Fix warnings on unused variables
 
     https://bugs.freedesktop.org/show_bug.cgi?id=57620
 
- glib/demo/annots.c |    4 +---
+ glib/demo/annots.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 5c5945d163fe406960ccc2e3a71882722b9e69d1
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Tue Nov 27 19:21:34 2012 +0100
+Date:	Tue Nov 27 19:21:34 2012 +0100
 
     Enable compiler warnings for C code
 
     Compilation of glib/demo uses a C compiler, thus compiler warnings
     should be enabled in the CFLAGS variable.
 
- configure.ac |    3 ++-
+ configure.ac | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 55940e989701eb9118015e30f4f48eb654fa34c4
 Author: Pino Toscano <pino@kde.org>
-Date:   Tue Nov 27 16:05:15 2012 +0100
+Date:	Tue Nov 27 16:05:15 2012 +0100
 
     fix my previous GooString::insert fix
 
@@ -949,14 +4142,14 @@ Date:   Tue Nov 27 16:05:15 2012 +0100
     extend qt4's check_goostring with few more checks covering this
     (and the previous) fix
 
- goo/GooString.cc              |    2 +-
- qt4/tests/check_goostring.cpp |   39
+ goo/GooString.cc	       |  2 +-
+ qt4/tests/check_goostring.cpp | 39
  +++++++++++++++++++++++++++++++++++++++
  2 files changed, 40 insertions(+), 1 deletion(-)
 
 commit dcbc9686d97f4f6596c43d1f701207278c25f8eb
 Author: Pino Toscano <pino@kde.org>
-Date:   Mon Nov 26 14:44:21 2012 +0100
+Date:	Mon Nov 26 14:44:21 2012 +0100
 
     glib/cmake: Include Gio-2.0 for introspection
 
@@ -978,12 +4171,12 @@ Date:   Mon Nov 26 14:44:21 2012 +0100
 
     folloup of c84753e12029fcc6113f80dedc9a943ce1deb214
 
- glib/CMakeLists.txt |    2 +-
+ glib/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 169e4cb001fa235ca608d3d0b42ea4214161fc2d
 Author: Pino Toscano <pino@kde.org>
-Date:   Mon Nov 26 14:42:59 2012 +0100
+Date:	Mon Nov 26 14:42:59 2012 +0100
 
     glib/cmake: Show all suppressed introspection scanner warnings
 
@@ -991,36 +4184,36 @@ Date:   Mon Nov 26 14:42:59 2012 +0100
 
     followup of 11a1f6f512a7d7b86defeb5963fa16bc08e3ba1c
 
- glib/CMakeLists.txt |    2 +-
+ glib/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 62c0dbbe9f1987c78eeb87f248d35e7fd73e968a
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Mon Nov 26 00:40:57 2012 +0100
+Date:	Mon Nov 26 00:40:57 2012 +0100
 
     Check GooString::insert
 
     Checks we don't break what we just fixed with Pino's patch
 
- qt4/tests/CMakeLists.txt      |    1 +
- qt4/tests/Makefile.am         |    7 ++++++-
- qt4/tests/check_goostring.cpp |   22 ++++++++++++++++++++++
+ qt4/tests/CMakeLists.txt      |  1 +
+ qt4/tests/Makefile.am	       |  7 ++++++-
+ qt4/tests/check_goostring.cpp | 22 ++++++++++++++++++++++
  3 files changed, 29 insertions(+), 1 deletion(-)
 
 commit 01e438ca47776075c8171bda090e7d859fd9f620
 Author: Adam Reichold <adamreichold@myopera.com>
-Date:   Mon Nov 26 00:39:05 2012 +0100
+Date:	Mon Nov 26 00:39:05 2012 +0100
 
     Don't use memcpy to copy classes
 
- poppler/Function.cc |   63
- ++++++++++++++++++++++++++++++++++++++++++---------
- poppler/Function.h  |   11 +++++----
+ poppler/Function.cc | 63
+ +++++++++++++++++++++++++++++++++++++++++++----------
+ poppler/Function.h  | 11 ++++++----
  2 files changed, 59 insertions(+), 15 deletions(-)
 
 commit 7ba15d11e56175601104d125d5e4a47619c224bf
 Author: Pino Toscano <pino@kde.org>
-Date:   Mon Nov 26 00:29:35 2012 +0100
+Date:	Mon Nov 26 00:29:35 2012 +0100
 
     fix GooString::insert()
 
@@ -1038,21 +4231,21 @@ Date:   Mon Nov 26 00:29:35 2012 +0100
 
     [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693817
 
- goo/GooString.cc |    5 ++---
+ goo/GooString.cc | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 703f85a10cf7ad61d2f2d3a5faf347fdddcb4738
 Author: Carlos Garcia Campos <carlosgc@gnome.org>
-Date:   Sun Nov 25 12:36:33 2012 +0100
+Date:	Sun Nov 25 12:36:33 2012 +0100
 
     glib: Fix returns tag in PopplerAttachmentSaveFunc api doc
 
- glib/poppler-attachment.h |    2 +-
+ glib/poppler-attachment.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 52896031783b28cee350ea92c8736e2c2e4e9d33
 Author: José Aliste <jaliste@src.gnome.org>
-Date:   Mon Nov 19 23:47:19 2012 +0100
+Date:	Mon Nov 19 23:47:19 2012 +0100
 
     glib: Add missing ":" at the end of some functions documentation
 
@@ -1061,14 +4254,14 @@ Date:   Mon Nov 19 23:47:19 2012 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=56218
 
- glib/poppler-annot.cc      |    2 +-
- glib/poppler-form-field.cc |   10 +++++-----
- glib/poppler-layer.cc      |   12 ++++++------
+ glib/poppler-annot.cc	    |  2 +-
+ glib/poppler-form-field.cc | 10 +++++-----
+ glib/poppler-layer.cc	    | 12 ++++++------
  3 files changed, 12 insertions(+), 12 deletions(-)
 
 commit 60dfc1a3471f824f40b0bef5b97a7b04bd78e72b
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Oct 20 10:17:01 2012 +0200
+Date:	Sat Oct 20 10:17:01 2012 +0200
 
     glib: Exclude poppler-input-stream.h from introspection files
 
@@ -1080,12 +4273,12 @@ Date:   Sat Oct 20 10:17:01 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=56218
 
- glib/Makefile.am |    2 +-
+ glib/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c84753e12029fcc6113f80dedc9a943ce1deb214
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Oct 20 09:40:09 2012 +0200
+Date:	Sat Oct 20 09:40:09 2012 +0200
 
     glib: Include Gio-2.0 for introspection
 
@@ -1105,23 +4298,23 @@ Date:   Sat Oct 20 09:40:09 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=56218
 
- glib/Makefile.am |    2 +-
+ glib/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 11a1f6f512a7d7b86defeb5963fa16bc08e3ba1c
 Author: Hib Eris <hib@hiberis.nl>
-Date:   Sat Oct 20 09:30:05 2012 +0200
+Date:	Sat Oct 20 09:30:05 2012 +0200
 
     glib: Show all suppressed introspection scanner warnings
 
     https://bugs.freedesktop.org/show_bug.cgi?id=56218
 
- glib/Makefile.am |    2 +-
+ glib/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 16812829a7d4816717731318b1aa1bc3ab5e3935
 Author: Jason Crain <jason@aquaticape.us>
-Date:   Mon Aug 27 22:42:11 2012 -0500
+Date:	Mon Aug 27 22:42:11 2012 -0500
 
     Update fill and stroke color in CairoOutputDev::startPage
 
@@ -1130,13 +4323,13 @@ Date:   Mon Aug 27 22:42:11 2012 -0500
 
     https://bugs.freedesktop.org/show_bug.cgi?id=54526
 
- glib/poppler-page.cc      |    2 +-
- poppler/CairoOutputDev.cc |    2 ++
+ glib/poppler-page.cc	   | 2 +-
+ poppler/CairoOutputDev.cc | 2 ++
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit c93702bea0718d67660f2255344dcf9b0f502d57
 Author: José Aliste <jaliste@src.gnome.org>
-Date:   Tue Nov 20 11:25:41 2012 +0100
+Date:	Tue Nov 20 11:25:41 2012 +0100
 
     glib: Ensure text is only computed on first render
 
@@ -1145,12 +4338,12 @@ Date:   Tue Nov 20 11:25:41 2012 +0100
     poppler_page_render would reprocess the text each time
     is called.
 
- glib/poppler-page.cc |    9 ++++-----
+ glib/poppler-page.cc | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 commit b0297110c455eb18096268b59d6095d428380de5
 Author: Jason Crain <jason@aquaticape.us>
-Date:   Wed Nov 21 14:15:59 2012 -0600
+Date:	Wed Nov 21 14:15:59 2012 -0600
 
     glib: check if words end with spaces
 
@@ -1161,53 +4354,53 @@ Date:   Wed Nov 21 14:15:59 2012 -0600
 
     https://bugs.freedesktop.org/show_bug.cgi?id=54504
 
- glib/poppler-page.cc |   62
- ++++++++++++++++++++++++++++----------------------
+ glib/poppler-page.cc | 62
+ +++++++++++++++++++++++++++++-----------------------
  1 file changed, 35 insertions(+), 27 deletions(-)
 
 commit b1dacd1e6ab00eb1976491eb2b45c76671011b38
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Fri Nov 23 00:12:24 2012 +0100
+Date:	Fri Nov 23 00:12:24 2012 +0100
 
     0.21.2
 
- CMakeLists.txt      |    4 ++--
- NEWS                |   13 +++++++++++++
- configure.ac        |    2 +-
- cpp/Doxyfile        |    2 +-
- poppler/Makefile.am |    2 +-
- qt4/src/Doxyfile    |    2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 13 +++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 19 insertions(+), 6 deletions(-)
 
 commit 2d2a3af7159945c3fd54f22878e2eb09e019bbc6
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Fri Nov 23 00:06:39 2012 +0100
+Date:	Fri Nov 23 00:06:39 2012 +0100
 
     Update copyrights
 
- goo/TiffWriter.cc          |    1 +
- goo/TiffWriter.h           |    1 +
- poppler/CairoRescaleBox.cc |    1 +
- poppler/CairoRescaleBox.h  |   38 ++++++++++++++++++++++++++++++++++++++
- splash/SplashBitmap.cc     |    2 +-
+ goo/TiffWriter.cc	    |  1 +
+ goo/TiffWriter.h	    |  1 +
+ poppler/CairoRescaleBox.cc |  1 +
+ poppler/CairoRescaleBox.h  | 38 ++++++++++++++++++++++++++++++++++++++
+ splash/SplashBitmap.cc     |  2 +-
  5 files changed, 42 insertions(+), 1 deletion(-)
 
 commit e0d0177562ff546b59b3bc8eb68a08dc740d6f6c
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Wed Nov 14 22:44:20 2012 +1030
+Date:	Wed Nov 14 22:44:20 2012 +1030
 
     cairo: Fix crash in CairoImageOutputDev with setSoftMaskFromImageMask
 
     Bug 57067
 
- poppler/CairoOutputDev.cc |   46
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |    5 +++++
+ poppler/CairoOutputDev.cc | 46
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  |  5 +++++
  2 files changed, 51 insertions(+)
 
 commit f050717f986a6c2833876d14083363a540fa849a
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Wed Nov 14 23:50:10 2012 +1030
+Date:	Wed Nov 14 23:50:10 2012 +1030
 
     cairo: fix soft mask when image resolution != smask resolution
 
@@ -1216,12 +4409,12 @@ Date:   Wed Nov 14 23:50:10 2012 +1030
 
     Bug 57070
 
- poppler/CairoOutputDev.cc |   12 +++---------
+ poppler/CairoOutputDev.cc | 12 +++---------
  1 file changed, 3 insertions(+), 9 deletions(-)
 
 commit 87fd5275514b63f13622b79a8fcfe443ccc4f45d
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Sun Nov 11 18:53:12 2012 +1030
+Date:	Sun Nov 11 18:53:12 2012 +1030
 
     cairo: make drawImage work with images > 32767 in width/height
 
@@ -1241,158 +4434,158 @@ Date:   Sun Nov 11 18:53:12 2012 +1030
 
     Bug 56858
 
- poppler/CairoOutputDev.cc  |  278
- +++++++++++++++++++++++---------------------
- poppler/CairoRescaleBox.cc |  177 +++++++++++++++-------------
- poppler/CairoRescaleBox.h  |   21 +++-
+ poppler/CairoOutputDev.cc  | 278
+ ++++++++++++++++++++++++---------------------
+ poppler/CairoRescaleBox.cc | 177 +++++++++++++++--------------
+ poppler/CairoRescaleBox.h  |  21 +++-
  3 files changed, 258 insertions(+), 218 deletions(-)
 
 commit d1c509c48fc422649d0c2c2d70af5e13e3472874
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Sat Nov 17 10:04:55 2012 +1030
+Date:	Sat Nov 17 10:04:55 2012 +1030
 
     pdftocairo: add tiff support
 
     Bug 57006
 
- utils/pdftocairo.1  |   23 ++++++++------
- utils/pdftocairo.cc |   88
- ++++++++++++++++++++++++++++++++++++++++-----------
+ utils/pdftocairo.1  | 23 ++++++++------
+ utils/pdftocairo.cc | 88
+ +++++++++++++++++++++++++++++++++++++++++------------
  2 files changed, 83 insertions(+), 28 deletions(-)
 
 commit 6d3fe48cf30b298b4436462904d781ea441c1f3d
 Author: Adrian Johnson <ajohnson@redneon.com>
-Date:   Sat Nov 17 10:03:22 2012 +1030
+Date:	Sat Nov 17 10:03:22 2012 +1030
 
     tiff: remove splash dependency and add RGBA support
 
     Bug 57006
 
- goo/TiffWriter.cc      |   47
+ goo/TiffWriter.cc	| 47
  +++++++++++++++++++----------------------------
- goo/TiffWriter.h       |   13 ++++++++++---
- splash/SplashBitmap.cc |   23 +++++++++++++++++++++--
+ goo/TiffWriter.h	| 13 ++++++++++---
+ splash/SplashBitmap.cc | 23 +++++++++++++++++++++--
  3 files changed, 50 insertions(+), 33 deletions(-)
 
 commit 15f600a5702788f7e5b91cd67bc2438179921939
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Thu Nov 15 22:17:27 2012 +0100
+Date:	Thu Nov 15 22:17:27 2012 +0100
 
     Don't do a check for sanity that then we don't use
 
     Fixes bugs 56753 and 51684
 
- fofi/FoFiTrueType.cc |   26 --------------------------
+ fofi/FoFiTrueType.cc | 26 --------------------------
  1 file changed, 26 deletions(-)
 
 commit c7e3c2d7087e4fc36564ba7bd55e27e100e0a5e5
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Wed Nov 14 14:58:45 2012 +0100
+Date:	Wed Nov 14 14:58:45 2012 +0100
 
     Remove unused code
 
- fofi/FoFiTrueType.cc         |  658
- ------------------------------------------
- fofi/FoFiTrueType.h          |   11 +-
- splash/SplashFTFontEngine.cc |   42 +--
+ fofi/FoFiTrueType.cc	      | 658
+ -------------------------------------------
+ fofi/FoFiTrueType.h	      |  11 +-
+ splash/SplashFTFontEngine.cc |  42 +--
  3 files changed, 2 insertions(+), 709 deletions(-)
 
 commit 06951f529e6514a0c26d6d821ab5fab0920a7cf3
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Tue Nov 13 23:37:22 2012 +0100
+Date:	Tue Nov 13 23:37:22 2012 +0100
 
     Simplify >= 0 ifs for unsigned
 
- cpp/poppler-global.cpp |    8 ++------
+ cpp/poppler-global.cpp | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 commit fa813adc3f7b7ee3cc819f1e0cb85e01f13c2c01
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Tue Nov 13 23:37:01 2012 +0100
+Date:	Tue Nov 13 23:37:01 2012 +0100
 
     Remove < 0 ifs for unsigned
 
- splash/SplashFTFont.cc |    8 --------
+ splash/SplashFTFont.cc | 8 --------
  1 file changed, 8 deletions(-)
 
 commit 1969bcd693289eba1138fcaa74a684cb3ff2aefc
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Tue Nov 13 23:36:40 2012 +0100
+Date:	Tue Nov 13 23:36:40 2012 +0100
 
     Remove unused members
 
- poppler/Gfx.cc |    3 ---
- poppler/Gfx.h  |    5 +----
+ poppler/Gfx.cc | 3 ---
+ poppler/Gfx.h	| 5 +----
  2 files changed, 1 insertion(+), 7 deletions(-)
 
 commit 3a6e5ed5e28b6113696a7ae60b0b85d7097eb731
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Tue Nov 13 23:35:53 2012 +0100
+Date:	Tue Nov 13 23:35:53 2012 +0100
 
     Remove >= 0 checks for unsigned variables
 
- utils/HtmlFonts.cc |    6 +++---
- utils/HtmlFonts.h  |    4 ++--
+ utils/HtmlFonts.cc | 6 +++---
+ utils/HtmlFonts.h  | 4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 0dcc2d711810dd64aa8d8721ce53a6b72e12c47c
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Tue Nov 13 23:35:10 2012 +0100
+Date:	Tue Nov 13 23:35:10 2012 +0100
 
     Remove unused var
 
- utils/pdfinfo.cc |    2 +-
+ utils/pdfinfo.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1fc97862d30bf723135310bfc8701e6788bfd284
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Tue Nov 13 23:24:19 2012 +0100
+Date:	Tue Nov 13 23:24:19 2012 +0100
 
     size can't be smaller than 0 because it's a size_t
 
- goo/gmem.cc |   22 +---------------------
+ goo/gmem.cc | 22 +---------------------
  1 file changed, 1 insertion(+), 21 deletions(-)
 
 commit bb801a9b889bc0e62cf8b853c26cc6636b4af9a1
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Tue Nov 13 22:51:17 2012 +0100
+Date:	Tue Nov 13 22:51:17 2012 +0100
 
     Removed unused var
 
- utils/pdfinfo.cc |    1 -
+ utils/pdfinfo.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit fd651fb49653e89d96b032e010a7d8e891536bb0
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Mon Nov 12 00:42:49 2012 +0100
+Date:	Mon Nov 12 00:42:49 2012 +0100
 
     Parse the args (so that -v says vesion only)
 
     Fixes bug #56817
 
- utils/pdfunite.cc |    4 +++-
+ utils/pdfunite.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 7e2e9567f51d01be9a88848e1141c6d4f0f768a1
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Fri Nov 9 20:02:25 2012 +0100
+Date:	Fri Nov 9 20:02:25 2012 +0100
 
     0.21.1
 
- CMakeLists.txt         |    4 ++--
- NEWS                   |   14 ++++++++++++++
- configure.ac           |    2 +-
- cpp/Doxyfile           |    2 +-
- poppler/Makefile.am    |    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Doxyfile       |    2 +-
- qt4/src/Makefile.am    |    2 +-
+ CMakeLists.txt		|  4 ++--
+ NEWS			| 14 ++++++++++++++
+ configure.ac		|  2 +-
+ cpp/Doxyfile		|  2 +-
+ poppler/Makefile.am	|  2 +-
+ qt4/src/CMakeLists.txt |  2 +-
+ qt4/src/Doxyfile	|  2 +-
+ qt4/src/Makefile.am	|  2 +-
  8 files changed, 22 insertions(+), 8 deletions(-)
 
 commit 98b7cfd289abb53a745a88d6ec99e95df477fc8f
 Merge: 40efa72 d254174
 Author: Albert Astals Cid <aacid@kde.org>
-Date:   Fri Nov 9 00:38:19 2012 +0100
+Date:	Fri Nov 9 00:38:19 2012 +0100
 
     Merge remote-tracking branch 'origin/poppler-0.20'
 
@@ -1422,8 +4615,8 @@ Date:	Sun Nov 4 11:20:29 2012 +0100
     I've also added a #include in XRef.h because it references enum
     CryptAlgorithm too. Also in this case, it expands to nothing.
 
- poppler/PDFDoc.h |    2 +-
- poppler/XRef.h   |    1 +
+ poppler/PDFDoc.h | 2 +-
+ poppler/XRef.h   | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 0f7c17d7f92d4cdfbd8816dba666aeed924d8bc2
@@ -1435,11 +4628,11 @@ Date:	Fri Nov 2 10:54:17 2012 +0100
     This patch also wraps the code that checks the form type and moves it
     from pdfinfo to the Catalog class.
 
- poppler/Catalog.cc	     |	 19 +++++++++++++++++++
- poppler/Catalog.h	     |	  9 +++++++++
- qt4/src/poppler-document.cc |	 16 ++++++++++++++++
- qt4/src/poppler-qt4.h	     |	 18 ++++++++++++++++++
- utils/pdfinfo.cc	     |	 19 ++++++++++---------
+ poppler/Catalog.cc	     | 19 +++++++++++++++++++
+ poppler/Catalog.h	     |	9 +++++++++
+ qt4/src/poppler-document.cc | 16 ++++++++++++++++
+ qt4/src/poppler-qt4.h	     | 18 ++++++++++++++++++
+ utils/pdfinfo.cc	     | 19 ++++++++++---------
  5 files changed, 72 insertions(+), 9 deletions(-)
 
 commit f3f5a166bcd16b6f2cb516cceb2b3f41b6faf0b4
@@ -1452,7 +4645,7 @@ Date:	Fri Nov 2 01:53:24 2012 +0100
     This patch clears the user-entered text when the user interacts with
     predefined options.
 
- poppler/Form.cc |   10 ++++++++++
+ poppler/Form.cc | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit ddcd5dc0ceecc02f0d4f740cb6c9b557dfd33c74
@@ -1465,7 +4658,7 @@ Date:	Thu Nov 1 00:58:51 2012 +0100
     Fixes
     http://lists.freedesktop.org/archives/poppler/2012-October/009688.html
 
- poppler/Form.cc |    5 +++++
+ poppler/Form.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 1302bf52bba7e6446f01358240a4b5b583e196a9
@@ -1475,7 +4668,7 @@ Date:	Wed Oct 31 19:56:37 2012 +0100
     FormFieldChoice ctor: Stop scanning if /V is a string and the
     corresponding option has been identified
 
- poppler/Form.cc |   11 +++++++++--
+ poppler/Form.cc | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 commit d254174e08146115ad04ac1f1bf82bb26e56c684
@@ -1484,7 +4677,7 @@ Date:	Wed Oct 31 16:57:56 2012 +0100
 
     FormFieldChoice::updateSelection: Fixed wrong loop condition
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 401de95f5ab42ab0f5d8fd92d76b5def50f84a2b
@@ -1498,8 +4691,8 @@ Date:	Wed Oct 31 19:43:51 2012 +0100
     distinguish
     duplicate option (i.e. options with the same name/export value).
 
- poppler/Form.cc |   71
- ++++++++++++++++++++++++++++++++-----------------------
+ poppler/Form.cc | 71
+ ++++++++++++++++++++++++++++++++++-----------------------
  1 file changed, 42 insertions(+), 29 deletions(-)
 
 commit cfd3a46a857100cb634e18192b762e7342165348
@@ -1517,7 +4710,7 @@ Date:	Wed Oct 31 15:44:32 2012 +0100
     instead of the option name.
     With this patch, we mimic this behavior.
 
- poppler/Form.cc |   49 ++++++++++++++++++++++++++++++++++---------------
+ poppler/Form.cc | 49 ++++++++++++++++++++++++++++++++++---------------
  1 file changed, 34 insertions(+), 15 deletions(-)
 
 commit ce99940bcac0447f32ee2ad46efb09af93989c12
@@ -1531,7 +4724,7 @@ Date:	Sat Oct 13 00:13:33 2012 +0200
     gets updated (failing to update it results in acroread still showing
     the old selection).
 
- poppler/Form.cc |   50 ++++++++++++++++++++++++++++++++++++--------------
+ poppler/Form.cc | 50 ++++++++++++++++++++++++++++++++++++--------------
  1 file changed, 36 insertions(+), 14 deletions(-)
 
 commit 102553e2104a1b223c8ac924aa6702829adebbdb
@@ -1540,7 +4733,7 @@ Date:	Wed Oct 31 16:57:56 2012 +0100
 
     FormFieldChoice::updateSelection: Fixed wrong loop condition
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d7522ea1d2e66beef64f705e8986142f15fcf613
@@ -1565,7 +4758,7 @@ Date:	Wed Oct 31 15:26:37 2012 +0100
     Now the /V value is always binary-equal to the corresponding /Opt
     entry.
 
- poppler/Form.cc |   16 +---------------
+ poppler/Form.cc | 16 +---------------
  1 file changed, 1 insertion(+), 15 deletions(-)
 
 commit da08ebeee241198907378c6461721fddb5106875
@@ -1574,9 +4767,9 @@ Date:	Sun Oct 28 12:13:22 2012 +1030
 
     Don't allow invalid unicode to be passed to backends
 
- poppler/CharCodeToUnicode.cc |   11 +++++++++--
- poppler/UTF.cc		      |   11 +++++++++++
- poppler/UTF.h		      |    4 ++++
+ poppler/CharCodeToUnicode.cc | 11 +++++++++--
+ poppler/UTF.cc		      | 11 +++++++++++
+ poppler/UTF.h		      |  4 ++++
  3 files changed, 24 insertions(+), 2 deletions(-)
 
 commit 9f92feda5eff9b2542c64349f33ae3cf250e7f4b
@@ -1587,7 +4780,7 @@ Date:	Fri Nov 2 23:05:55 2012 +0100
 
     Bug #54702
 
- poppler/CharCodeToUnicode.cc |    2 ++
+ poppler/CharCodeToUnicode.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit ef11b4f0e642dff0be02bf3327eb56bf0b364847
@@ -1598,14 +4791,14 @@ Date:	Fri Nov 2 22:44:27 2012 +0100
 
     With minor api fixes by me (Albert Astals Cid)
 
- qt4/src/poppler-document.cc |	 23 +++++++++++---
- qt4/src/poppler-page.cc     |	 38 ++++++++++++-----------
- qt4/src/poppler-private.h   |	 69
- +++++++++++++++++++++++++++---------------
- qt4/src/poppler-qt4.h	     |	 11 ++++++-
- splash/SplashBitmap.cc      |	 70
- +++++++++++++++++++++++++++++++++++++++++++
- splash/SplashBitmap.h	     |	  5 +++-
+ qt4/src/poppler-document.cc | 23 ++++++++++++---
+ qt4/src/poppler-page.cc     | 38 +++++++++++++-----------
+ qt4/src/poppler-private.h   | 69
+ ++++++++++++++++++++++++++++----------------
+ qt4/src/poppler-qt4.h	     | 11 ++++++-
+ splash/SplashBitmap.cc      | 70
+ +++++++++++++++++++++++++++++++++++++++++++++
+ splash/SplashBitmap.h	     |	5 +++-
  6 files changed, 169 insertions(+), 47 deletions(-)
 
 commit ae8fc0cbfc6123189e17b3cf1286e0540f181646
@@ -1616,7 +4809,7 @@ Date:	Tue Oct 30 21:22:04 2012 +1030
 
     Bug 56463
 
- poppler/CairoOutputDev.cc |   19 +++++++++++++++----
+ poppler/CairoOutputDev.cc | 19 +++++++++++++++----
  1 file changed, 15 insertions(+), 4 deletions(-)
 
 commit 3be4e835d765f2f060e2a2e07dd23905c3212cdd
@@ -1625,8 +4818,8 @@ Date:	Wed Oct 24 18:37:06 2012 +0200
 
     dos2unix
 
- utils/pdftoppm.cc |  876
- ++++++++++++++++++++++++++---------------------------
+ utils/pdftoppm.cc | 876
+ +++++++++++++++++++++++++++---------------------------
  1 file changed, 438 insertions(+), 438 deletions(-)
 
 commit 77a980472e76b568346a49057b0217111a14a4cd
@@ -1642,7 +4835,7 @@ Date:	Tue Oct 23 00:22:55 2012 +0200
 
     Fix the or-ing of flags
 
- qt4/src/poppler-document.cc |	  4 ++--
+ qt4/src/poppler-document.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 74d6217ba164fdfe263b4edac8047b60506e39a6
@@ -1654,8 +4847,8 @@ Date:	Sun Oct 21 17:48:57 2012 +0200
 
     To make sure they are always shown.
 
- regtest/Printer.py |	 3 +++
- regtest/TestRun.py |	10 +++++-----
+ regtest/Printer.py |  3 +++
+ regtest/TestRun.py | 10 +++++-----
  2 files changed, 8 insertions(+), 5 deletions(-)
 
 commit 4e9b8d2cca44241a501bb8095b3980d17fcda6c5
@@ -1664,7 +4857,7 @@ Date:	Sun Oct 21 17:48:22 2012 +0200
 
     regtest: Do not rewrite lines in verbose mode
 
- regtest/Printer.py |	 2 +-
+ regtest/Printer.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2a25264afe3c59931f6a3638e2d6c6c2e0e5dfba
@@ -1675,7 +4868,7 @@ Date:	Fri Oct 19 17:22:56 2012 +0200
 
     because i can
 
- qt4/tests/check_fonts.cpp |	4 ++--
+ qt4/tests/check_fonts.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit bc4a54c0a4430216c9aeaf2c3bddbaeef5a004e4
@@ -1684,7 +4877,7 @@ Date:	Fri Oct 19 17:22:13 2012 +0200
 
     Compile with clang
 
- qt4/tests/check_fonts.cpp |	6 ++++--
+ qt4/tests/check_fonts.cpp | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit f38194cfae8f8690bc3767cbdcf140519564366c
@@ -1700,7 +4893,7 @@ Date:	Fri Oct 19 00:00:53 2012 +0200
 
     Define the numbers a bit better so gcc in i386 understands them better
 
- qt4/tests/check_lexer.cpp |	4 ++--
+ qt4/tests/check_lexer.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 80cf43472e5913f5f64bf73cb4a8ac5a53063f2e
@@ -1710,8 +4903,8 @@ Date:	Wed Oct 17 08:27:13 2012 +0200
     added accessors for FormWidgetChoice::editChoice property to qt4
     frontend
 
- qt4/src/poppler-form.cc |   23 +++++++++++++++++++++++
- qt4/src/poppler-form.h  |   15 +++++++++++++++
+ qt4/src/poppler-form.cc | 23 +++++++++++++++++++++++
+ qt4/src/poppler-form.h  | 15 +++++++++++++++
  2 files changed, 38 insertions(+)
 
 commit 0b3ff2dc4e1ba37dd66f5913b10a9d69e31c40ce
@@ -1741,7 +4934,7 @@ Date:	Tue Sep 4 23:10:17 2012 +0200
     unitialized and resulted in "-000000001 00000 f" being written in the
     XRef table.
 
- poppler/XRef.cc |    1 +
+ poppler/XRef.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit fb5cb0fbdfcd06556661b38b0c598922fff2d759
@@ -1751,7 +4944,7 @@ Date:	Thu Oct 4 11:20:42 2012 +0200
     Create the 24x24 rectangle for text annotation icons from the top-left
     corner instead of bottom-left
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 35c07fe40d7b18e19f6ef0f5615f9f5ac8195cf7
@@ -1773,8 +4966,8 @@ Date:	Tue Oct 9 15:24:02 2012 +0200
     stream in
     case of repeated modifications.
 
- poppler/Annot.cc |   40 ++++++++++++++++++++++++++++------------
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 40 ++++++++++++++++++++++++++++------------
+ poppler/Annot.h  |  1 +
  2 files changed, 29 insertions(+), 12 deletions(-)
 
 commit 2127a977bbe9985aa58561116508ad4f08430a2c
@@ -1788,7 +4981,7 @@ Date:	Tue Oct 9 12:49:26 2012 +0200
     entry is
     created every time AnnotWidget::updateWidgetApperance() is called.
 
- poppler/Annot.cc |   30 +++++++++++++++++++++++++-----
+ poppler/Annot.cc | 30 +++++++++++++++++++++++++-----
  1 file changed, 25 insertions(+), 5 deletions(-)
 
 commit 0446e2cc1073f4579a90284d28bc5872e46e0536
@@ -1801,11 +4994,11 @@ Date:	Tue Oct 9 10:47:40 2012 +0200
     widget's appearance needs to be rebuilt, now AnnotWidget gets notified
     of changes via the new AnnotWidget::updateAppearanceStream() callback.
 
- poppler/Annot.cc |   16 ++++++++++------
- poppler/Annot.h  |    1 +
- poppler/Form.cc  |   52
+ poppler/Annot.cc | 16 ++++++++++------
+ poppler/Annot.h  |  1 +
+ poppler/Form.cc  | 52
  ++++++++++++++++++++++++++++++++++++++--------------
- poppler/Form.h   |   12 +++++++++---
+ poppler/Form.h   | 12 +++++++++---
  4 files changed, 58 insertions(+), 23 deletions(-)
 
 commit 68d732ab2d55ae15e194ececfffa753977fae84c
@@ -1827,8 +5020,8 @@ Date:	Tue Oct 9 15:24:02 2012 +0200
     stream in
     case of repeated modifications.
 
- poppler/Annot.cc |   40 ++++++++++++++++++++++++++++------------
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 40 ++++++++++++++++++++++++++++------------
+ poppler/Annot.h  |  1 +
  2 files changed, 29 insertions(+), 12 deletions(-)
 
 commit e2993cc9551dc7521528904646f941c9747473f7
@@ -1842,7 +5035,7 @@ Date:	Tue Oct 9 12:49:26 2012 +0200
     entry is
     created every time AnnotWidget::updateWidgetApperance() is called.
 
- poppler/Annot.cc |   30 +++++++++++++++++++++++++-----
+ poppler/Annot.cc | 30 +++++++++++++++++++++++++-----
  1 file changed, 25 insertions(+), 5 deletions(-)
 
 commit df924493922e8c0f7b1e19c2847d33b28a098913
@@ -1855,11 +5048,11 @@ Date:	Tue Oct 9 10:47:40 2012 +0200
     widget's appearance needs to be rebuilt, now AnnotWidget gets notified
     of changes via the new AnnotWidget::updateAppearanceStream() callback.
 
- poppler/Annot.cc |   16 ++++++++++------
- poppler/Annot.h  |    1 +
- poppler/Form.cc  |   52
+ poppler/Annot.cc | 16 ++++++++++------
+ poppler/Annot.h  |  1 +
+ poppler/Form.cc  | 52
  ++++++++++++++++++++++++++++++++++++++--------------
- poppler/Form.h   |   12 +++++++++---
+ poppler/Form.h   | 12 +++++++++---
  4 files changed, 58 insertions(+), 23 deletions(-)
 
 commit 0a5bda01ace9f8576d687c5a28feb5cf09b48a92
@@ -1868,7 +5061,7 @@ Date:	Sun Oct 14 23:05:27 2012 +0200
 
     New/old header for cmake buildsystem
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6d46f0b477143eb0df09f718e96dd2ff2a7dd61b
@@ -1877,12 +5070,12 @@ Date:	Sat Sep 22 20:50:07 2012 +0200
 
     Split our UTF.h into xpdf based UTF8.h and a poppler specific UTF.h
 
- poppler/GlobalParams.cc |    2 +-
- poppler/Makefile.am	 |    1 +
- poppler/UTF.h		 |   79
- +-------------------------------------------
- poppler/UTF8.h		 |   84
- +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/GlobalParams.cc |  2 +-
+ poppler/Makefile.am	 |  1 +
+ poppler/UTF.h		 | 79
+ +---------------------------------------------
+ poppler/UTF8.h		 | 84
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 87 insertions(+), 79 deletions(-)
 
 commit 03cbba935c90ce9a6d9ad44f7cda4901c2f81f2e
@@ -1891,7 +5084,7 @@ Date:	Sat Sep 22 19:58:40 2012 +0200
 
     Do not use mapUTF8() directly in CairoOutputDev
 
- poppler/CairoOutputDev.cc |	8 +++++---
+ poppler/CairoOutputDev.cc | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit f219bdbcadcb0334d595bbd9afd01f00c37d1978
@@ -1905,7 +5098,7 @@ Date:	Sun Oct 14 22:59:55 2012 +0200
     UTF.cc:99:33: warning: array subscript has type 'char'
     [-Wchar-subscripts]
 
- poppler/UTF.cc |    3 ++-
+ poppler/UTF.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 65a2555607e03c94d77ae9ebdb34ab6d4f8844b6
@@ -1916,7 +5109,7 @@ Date:	Fri Oct 12 23:54:57 2012 +0200
 
     It caused a crash if multiple items are initially selected.
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 710bb3383306a9aa6debbfe1364029ee12a15576
@@ -1927,7 +5120,7 @@ Date:	Fri Oct 12 23:54:57 2012 +0200
 
     It caused a crash if multiple items are initially selected.
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ce18c9b3d5251305eb76d294fdf4b4de9382b3a4
@@ -1936,11 +5129,11 @@ Date:	Wed Oct 10 19:54:57 2012 +0200
 
     0.20.5
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   15 +++++++++++++++
- configure.ac	  |    2 +-
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 15 +++++++++++++++
+ configure.ac	  |  2 +-
+ cpp/Doxyfile	  |  2 +-
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 19 insertions(+), 4 deletions(-)
 
 commit b112602334a5de84ae30c2e90d9bc6d4609f7f96
@@ -1951,15 +5144,15 @@ Date:	Mon Oct 8 22:32:34 2012 +0200
 
     Bug #55378
 
- poppler/Link.cc	       |   34 ++++++++++++++++++-----
- poppler/Link.h		       |   17 +++++++++---
- qt4/src/poppler-annotation.cc |    2 --
- qt4/src/poppler-annotation.h  |    1 +
- qt4/src/poppler-link.cc       |   60
- ++++++++++++++++++++++++++++++++++++++---
- qt4/src/poppler-link.h        |   57
- ++++++++++++++++++++++++++++++++++++---
- qt4/src/poppler-page.cc       |    8 +++++-
+ poppler/Link.cc	       | 34 +++++++++++++++++++-----
+ poppler/Link.h		       | 17 +++++++++---
+ qt4/src/poppler-annotation.cc |  2 --
+ qt4/src/poppler-annotation.h  |  1 +
+ qt4/src/poppler-link.cc       | 60
+ ++++++++++++++++++++++++++++++++++++++++---
+ qt4/src/poppler-link.h        | 57
+ +++++++++++++++++++++++++++++++++++++---
+ qt4/src/poppler-page.cc       |  8 +++++-
  7 files changed, 158 insertions(+), 21 deletions(-)
 
 commit 6d6bd660dbb652f2f3e87c81c55a87d1fc11ec70
@@ -1972,8 +5165,8 @@ Date:	Sat Oct 6 10:26:55 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=55521
 
- glib/poppler-document.cc |    6 ++++++
- glib/poppler-page.cc	  |    2 ++
+ glib/poppler-document.cc | 6 ++++++
+ glib/poppler-page.cc	  | 2 ++
  2 files changed, 8 insertions(+)
 
 commit ac3875a9e7f2f4f31881d3d1b3081f2adaef65a1
@@ -1986,8 +5179,8 @@ Date:	Sat Oct 6 10:26:55 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=55521
 
- glib/poppler-document.cc |    6 ++++++
- glib/poppler-page.cc	  |    2 ++
+ glib/poppler-document.cc | 6 ++++++
+ glib/poppler-page.cc	  | 2 ++
  2 files changed, 8 insertions(+)
 
 commit 042d332c1c9f628e3bfaabf3da9e04436a8677b5
@@ -2005,7 +5198,7 @@ Date:	Thu Oct 4 00:51:04 2012 +0200
 
     Bug #55573
 
- splash/SplashFTFont.cc |    4 ++++
+ splash/SplashFTFont.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 7b9a9f809d07303fe5adff9210731613df8b2adf
@@ -2023,7 +5216,7 @@ Date:	Wed Oct 3 01:21:45 2012 +0200
 
     Can't do csObj->getName if csObj is a dict
 
- poppler/GfxState.cc |	  2 +-
+ poppler/GfxState.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3b0962cd14b15ce92c0916f58ed5ba00aebe80b0
@@ -2041,7 +5234,7 @@ Date:	Tue Oct 2 19:31:04 2012 +0200
 
     Bug #55541
 
- autogen.sh |	15 ++++++++-------
+ autogen.sh | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit a9d7ea2eb549acbf6ca7e2a299ffed46ff3d8758
@@ -2062,7 +5255,7 @@ Date:	Wed Sep 26 15:13:47 2012 +0200
 
     Fixes valgrind warnings about uninitialized uses
 
- poppler/XRef.cc |    1 +
+ poppler/XRef.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 397d7b4597ad4bc8ab41fd7a99078473a3c93eb0
@@ -2078,8 +5271,8 @@ Date:	Wed Sep 26 14:58:05 2012 +0200
 
     More crash fixes for broken documents
 
- poppler/JPXStream.cc |   97
- ++++++++++++++++++++++++++++++++++++++++++--------
+ poppler/JPXStream.cc | 97
+ ++++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 82 insertions(+), 15 deletions(-)
 
 commit 78558d24692c68212da35a88deb68069c5a06d81
@@ -2091,7 +5284,7 @@ Date:	Wed Sep 26 14:32:05 2012 +0200
     solves 1258.pdf.SIGSEGV.dee.288 and 1255.pdf.asan.38.285, extends
     1043.pdf.asan.47.50 and 557.pdf.asan.47.894
 
- poppler/GfxState.cc |	 26 +++++++++++++++++++++++---
+ poppler/GfxState.cc | 26 +++++++++++++++++++++++---
  1 file changed, 23 insertions(+), 3 deletions(-)
 
 commit e8822c0f3a46195ec7c6e55c556dd0c5716be742
@@ -2100,7 +5293,7 @@ Date:	Wed Sep 26 14:21:46 2012 +0200
 
     Add unlikelys
 
- poppler/Stream.cc |   32 ++++++++++++++++----------------
+ poppler/Stream.cc | 32 ++++++++++++++++----------------
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 commit 31874f2e065b0d68f726ef404de98f42489c80c7
@@ -2112,8 +5305,8 @@ Date:	Wed Sep 26 14:17:00 2012 +0200
     rebased patch for 1001.pdf.asan.2a.4, extends patch for
     100.pdf.asan.38.2
 
- poppler/Stream.cc |  100
- +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/Stream.cc | 100
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 98 insertions(+), 2 deletions(-)
 
 commit 81b1d9207840ec1e66eef469b29a36a8556b7265
@@ -2122,7 +5315,7 @@ Date:	Wed Sep 26 13:38:54 2012 +0200
 
     Add some unlikelys
 
- poppler/JBIG2Stream.cc |   28 ++++++++++++++--------------
+ poppler/JBIG2Stream.cc | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
 
 commit 9ae1184e3049cabc695c8645a10eaef748b6e641
@@ -2135,8 +5328,8 @@ Date:	Wed Sep 26 12:32:26 2012 +0200
     569.pdf.SIGSEGV.c1.907, extends Patch for 829. and 839. asan and
     sigsegv series
 
- poppler/JBIG2Stream.cc |  105
- ++++++++++++++++++++++++++++++++++++++++++------
+ poppler/JBIG2Stream.cc | 105
+ +++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 93 insertions(+), 12 deletions(-)
 
 commit 1d72c14b3877ae730ac0aa92f36923269e8a2004
@@ -2145,7 +5338,7 @@ Date:	Wed Sep 26 11:48:14 2012 +0200
 
     Fix crash in 158.pdf.asan.d.451
 
- poppler/SplashOutputDev.cc |	 8 ++++++++
+ poppler/SplashOutputDev.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 6013d49d852c58c4c23f787fd7dd64731c0918f1
@@ -2161,7 +5354,7 @@ Date:	Wed Sep 26 00:52:32 2012 +0200
 
     Don't close the stream if it's not a stream
 
- poppler/PSOutputDev.cc |    4 +++-
+ poppler/PSOutputDev.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit b97c28c42a18d1c2a8fabea52c092d948811d582
@@ -2183,7 +5376,7 @@ Date:	Tue Sep 25 23:07:55 2012 +0200
     Fixes compilation when lcms is on non standard locations
     Bug #55326
 
- qt4/src/Makefile.am |	  3 ++-
+ qt4/src/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 32bb87419c360a3b14c717c0f385198b70a1b2e7
@@ -2197,15 +5390,15 @@ Date:	Sun Sep 23 18:15:13 2012 +0200
     about the failing pages. Previous verbose output is available passing
     --verbose command line output.
 
- regtest/Printer.py		     |	 96
- +++++++++++++++++++++++++++++++++++
- regtest/TestReferences.py	     |	  8 +--
- regtest/TestRun.py		     |	 35 ++++++-------
- regtest/backends/__init__.py	     |	 13 +++--
- regtest/commands/create-refs.py     |	  3 +-
- regtest/commands/find-regression.py |	  5 +-
- regtest/commands/run-tests.py	     |	  3 +-
- regtest/main.py		     |	  3 ++
+ regtest/Printer.py		     | 96
+ +++++++++++++++++++++++++++++++++++++
+ regtest/TestReferences.py	     |	8 ++--
+ regtest/TestRun.py		     | 35 +++++++-------
+ regtest/backends/__init__.py	     | 13 +++--
+ regtest/commands/create-refs.py     |	3 +-
+ regtest/commands/find-regression.py |	5 +-
+ regtest/commands/run-tests.py	     |	3 +-
+ regtest/main.py		     |	3 ++
  8 files changed, 137 insertions(+), 29 deletions(-)
 
 commit ca6afce24aac2ef9d88e215177b11760f7468a6d
@@ -2216,7 +5409,7 @@ Date:	Fri Sep 21 21:33:05 2012 +0200
 
     Bug #54617
 
- poppler/Gfx.cc |    5 +++--
+ poppler/Gfx.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 70030b91ce2280f23c3e5adf863f1d336c9c5faf
@@ -2225,12 +5418,12 @@ Date:	Fri Sep 21 08:18:29 2012 +0200
 
     Increase sonames
 
- CMakeLists.txt		|    2 +-
- glib/CMakeLists.txt	|    2 +-
- glib/Makefile.am	|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		| 2 +-
+ glib/CMakeLists.txt	| 2 +-
+ glib/Makefile.am	| 2 +-
+ poppler/Makefile.am	| 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am	| 2 +-
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 2323e38f1a54cb58ec31b4cf15e6c2b1db742ca5
@@ -2239,10 +5432,10 @@ Date:	Fri Sep 21 08:12:52 2012 +0200
 
     Version increase
 
- CMakeLists.txt   |    4 ++--
- configure.ac	  |    4 ++--
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 4 ++--
+ configure.ac	  | 4 ++--
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 11a9a620276d199701be5811eb63687ace85ace1
@@ -2251,9 +5444,9 @@ Date:	Fri Sep 21 08:10:15 2012 +0200
 
     Drop the s from AdditionalActionsType
 
- qt4/src/poppler-annotation-private.h |    5 +++--
- qt4/src/poppler-annotation.cc	      |    6 +++---
- qt4/src/poppler-annotation.h	      |    6 +++---
+ qt4/src/poppler-annotation-private.h | 5 +++--
+ qt4/src/poppler-annotation.cc	      | 6 +++---
+ qt4/src/poppler-annotation.h	      | 6 +++---
  3 files changed, 9 insertions(+), 8 deletions(-)
 
 commit 028e0e7ddf8c30d311feb937385ef21acd34a52d
@@ -2262,7 +5455,7 @@ Date:	Thu Sep 20 18:13:08 2012 +0200
 
     0.21.0 news
 
- NEWS |   39 +++++++++++++++++++++++++++++++++++++++
+ NEWS | 39 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)
 
 commit 2f2d053352e04e434d83dd93dfdbd08ab5b23f2e
@@ -2271,10 +5464,10 @@ Date:	Thu Sep 20 18:12:57 2012 +0200
 
     Update copyrights
 
- poppler/Annot.cc	  |    3 ++-
- poppler/Annot.h	  |    1 +
- poppler/TextOutputDev.cc |    2 +-
- poppler/UTF.h		  |    1 +
+ poppler/Annot.cc	  | 3 ++-
+ poppler/Annot.h	  | 1 +
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/UTF.h		  | 1 +
  4 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 9fad83913791478b63fc76360f1a13e955cdcf4a
@@ -2283,7 +5476,7 @@ Date:	Mon Sep 17 23:15:10 2012 +0200
 
     Move to init
 
- poppler/XRef.cc |   11 +++--------
+ poppler/XRef.cc | 11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
 
 commit c470a3929c0a02b8a543fcada22138ab1fc18176
@@ -2292,10 +5485,10 @@ Date:	Mon Sep 17 23:13:48 2012 +0200
 
     Support encrypted pdf files in pdfseparate
 
- poppler/PDFDoc.cc    |   35 ++++++++++++++++++++++++++++++++---
- poppler/XRef.cc      |   15 +++++++++++++++
- poppler/XRef.h       |    2 ++
- utils/pdfseparate.cc |    4 ----
+ poppler/PDFDoc.cc    | 35 ++++++++++++++++++++++++++++++++---
+ poppler/XRef.cc      | 15 +++++++++++++++
+ poppler/XRef.h       |  2 ++
+ utils/pdfseparate.cc |  4 ----
  4 files changed, 49 insertions(+), 7 deletions(-)
 
 commit 9b613dcf3c77bc2801d1125dc9bbc5a4dd04e16b
@@ -2304,7 +5497,7 @@ Date:	Mon Sep 17 23:12:43 2012 +0200
 
     Compile
 
- goo/TiffWriter.cc |	5 +++++
+ goo/TiffWriter.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit fb5c383bd5be7090fc78380b4bb3244c3316c0cd
@@ -2315,8 +5508,8 @@ Date:	Mon Sep 17 00:03:49 2012 +0200
 
     Bug #54896
 
- goo/TiffWriter.cc |   13 ++++++++++++-
- goo/TiffWriter.h  |	4 +++-
+ goo/TiffWriter.cc | 13 ++++++++++++-
+ goo/TiffWriter.h  |  4 +++-
  2 files changed, 15 insertions(+), 2 deletions(-)
 
 commit 3794916572a0531b10ee57c9f189497489b90bc8
@@ -2327,10 +5520,10 @@ Date:	Sun Sep 16 17:53:47 2012 +0200
 
     Fixes KDE bug #302334
 
- poppler/Form.cc	 |   45
+ poppler/Form.cc	 | 45
  +++++++++++++++++++++++++--------------------
- poppler/Form.h		 |   24 +++++++++++++-----------
- qt4/src/poppler-form.cc |   13 ++++++++++---
+ poppler/Form.h		 | 24 +++++++++++++-----------
+ qt4/src/poppler-form.cc | 13 ++++++++++---
  3 files changed, 48 insertions(+), 34 deletions(-)
 
 commit e8b6d2ac3a874dd5de166b52625fa628004ea5fe
@@ -2346,7 +5539,7 @@ Date:	Sun Sep 16 14:07:45 2012 +0200
 
     Rework the #ifdef so that i don't get a gcc warning
 
- poppler/strtok_r.cpp |    3 ++-
+ poppler/strtok_r.cpp | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit b63049f97629a93ec346033e0ec56fc11f34c4fe
@@ -2355,7 +5548,7 @@ Date:	Sun Sep 16 14:05:01 2012 +0200
 
     Forgot to add the new test to autotools
 
- qt4/tests/Makefile.am |    7 ++++++-
+ qt4/tests/Makefile.am | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 7cb40726f9e80ee2b2f27ca6ce151b46c6ec091d
@@ -2374,10 +5567,10 @@ Date:	Sun Sep 16 13:48:51 2012 +0200
     -2147483648 is an integer
     -2147483649 is a real
 
- poppler/Lexer.cc	   |   14 +++++-
- qt4/tests/CMakeLists.txt  |	1 +
- qt4/tests/check_lexer.cpp |  118
- +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Lexer.cc	   |  14 +++++-
+ qt4/tests/CMakeLists.txt  |   1 +
+ qt4/tests/check_lexer.cpp | 118
+ ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 131 insertions(+), 2 deletions(-)
 
 commit e980d11061c19f13c75f93506e07903b4d1c7f97
@@ -2400,9 +5593,9 @@ Date:	Sat Sep 15 20:38:10 2012 +0200
 
     Bug #54851
 
- poppler/poppler-config.h.cmake |    2 +-
- poppler/poppler-config.h.in	|    2 +-
- poppler/strtok_r.cpp		|   16 +++++++++++++++-
+ poppler/poppler-config.h.cmake |  2 +-
+ poppler/poppler-config.h.in	|  2 +-
+ poppler/strtok_r.cpp		| 16 +++++++++++++++-
  3 files changed, 17 insertions(+), 3 deletions(-)
 
 commit b72c02d1a2ec8180b3ddfd2bb2b462c0189377d5
@@ -2413,7 +5606,7 @@ Date:	Thu Sep 13 19:56:45 2012 +0200
 
     sometimes it's very slow and doesn't really add much
 
- qt4/tests/test-poppler-qt4.cpp |    4 ----
+ qt4/tests/test-poppler-qt4.cpp | 4 ----
  1 file changed, 4 deletions(-)
 
 commit cb93d51ccb6b1f6938946ae5d38fb9817005fd7a
@@ -2426,7 +5619,7 @@ Date:	Wed Sep 12 00:12:07 2012 +0200
     and complains
     they might be used un-initialized
 
- poppler/TextOutputDev.cc |    1 +
+ poppler/TextOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3349a8dd7e0469cc5b5aaa8dd929c6078183ef86
@@ -2444,7 +5637,7 @@ Date:	Wed Sep 12 00:04:45 2012 +0200
     such a huge
     bitmap and then draw it to splash.
 
- poppler/SplashOutputDev.cc |	 7 +++++--
+ poppler/SplashOutputDev.cc | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 2e77799a1668f949612f551425d0665c59ff1d93
@@ -2536,21 +5729,21 @@ Date:	Tue Sep 11 23:33:25 2012 +0200
     application
     and the cirumstances if it wants to use this new mode or not.
 
- poppler/Function.cc	    |	14 +
- poppler/Function.h	    |	 4 +
- poppler/GfxState.cc	    |  341 ++++++++++++++++-
- poppler/GfxState.h	    |	41 ++-
- poppler/SplashOutputDev.cc |  173 ++++++++-
- poppler/SplashOutputDev.h  |	 3 +
- splash/Splash.cc	    |  255 ++++++++++++-
- splash/Splash.h	    |	 7 +-
- splash/SplashBitmap.cc     |  115 +++++-
- splash/SplashBitmap.h	    |	 8 +-
- splash/SplashState.cc	    |	30 +-
- splash/SplashState.h	    |	 3 +
- splash/SplashTypes.h	    |	30 +-
- utils/pdftoppm.cc	    |  878
- ++++++++++++++++++++++----------------------
+ poppler/Function.cc	    |  14 +
+ poppler/Function.h	    |	4 +
+ poppler/GfxState.cc	    | 341 +++++++++++++++++-
+ poppler/GfxState.h	    |  41 ++-
+ poppler/SplashOutputDev.cc | 173 ++++++++-
+ poppler/SplashOutputDev.h  |	3 +
+ splash/Splash.cc	    | 255 ++++++++++++-
+ splash/Splash.h	    |	7 +-
+ splash/SplashBitmap.cc     | 115 +++++-
+ splash/SplashBitmap.h	    |	8 +-
+ splash/SplashState.cc	    |  30 +-
+ splash/SplashState.h	    |	3 +
+ splash/SplashTypes.h	    |  30 +-
+ utils/pdftoppm.cc	    | 878
+ ++++++++++++++++++++++-----------------------
  14 files changed, 1415 insertions(+), 487 deletions(-)
 
 commit cb2ed646c4ef4161e443ee0a377d1111b3be28ff
@@ -2568,10 +5761,10 @@ Date:	Tue Sep 11 19:28:28 2012 +0200
 
     Bug #6923
 
- glib/poppler-page.cc	  |   49 +++++-----
- poppler/TextOutputDev.cc |  224
- ++++++++++++++++++++++------------------------
- poppler/TextOutputDev.h  |   21 ++---
+ glib/poppler-page.cc	  |  49 ++++++-----
+ poppler/TextOutputDev.cc | 224
+ ++++++++++++++++++++++-------------------------
+ poppler/TextOutputDev.h  |  21 ++---
  3 files changed, 145 insertions(+), 149 deletions(-)
 
 commit 3ce4d213480471dfd8e307c24c99bf3c6308cd6f
@@ -2580,7 +5773,7 @@ Date:	Tue Sep 11 19:24:58 2012 +0200
 
     Do not use isnan as it is C99
 
- poppler/TextOutputDev.cc |    6 +++---
+ poppler/TextOutputDev.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 4d7a64a23fd4b4b5ee0d47ead8677f374aaaf6c9
@@ -2589,7 +5782,7 @@ Date:	Tue Sep 11 19:24:11 2012 +0200
 
     Check for NaN in TextPage::addChar
 
- poppler/TextOutputDev.cc |    5 ++++-
+ poppler/TextOutputDev.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit e79b70ec13ab4d2cce8f245d150fa9329b436658
@@ -2600,10 +5793,10 @@ Date:	Tue Sep 11 16:39:55 2012 +0200
 
     Bug #53589
 
- qt4/src/poppler-annotation-private.h |    3 ++
- qt4/src/poppler-annotation.cc	      |   99
- +++++++++++++++++++++++++++++++++-
- qt4/src/poppler-annotation.h	      |   68 ++++++++++++++++++++++-
+ qt4/src/poppler-annotation-private.h |  3 ++
+ qt4/src/poppler-annotation.cc	      | 99
+ +++++++++++++++++++++++++++++++++++-
+ qt4/src/poppler-annotation.h	      | 68 ++++++++++++++++++++++++-
  3 files changed, 168 insertions(+), 2 deletions(-)
 
 commit 5f338ea7d01cabc0f8c50690d0bc262d85baa0ed
@@ -2612,7 +5805,7 @@ Date:	Mon Sep 10 19:47:20 2012 +0200
 
     Fix typo
 
- NEWS |    4 ++--
+ NEWS | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5fd691dc58aac817bca81c87c4820afcf53989d1
@@ -2621,12 +5814,12 @@ Date:	Mon Sep 10 19:29:01 2012 +0200
 
     0.20.40.20.40.20.40.20.4
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 13 +++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 13 +++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 19 insertions(+), 6 deletions(-)
 
 commit 1b40cdd9f863cd3868db85b5ccfa77a8350c56d6
@@ -2644,8 +5837,8 @@ Date:	Sun Sep 9 23:35:45 2012 +0200
 
     Bug #14303
 
- poppler/XRef.cc |   14 ++++++++++++--
- poppler/XRef.h  |    4 ++--
+ poppler/XRef.cc | 14 ++++++++++++--
+ poppler/XRef.h  |  4 ++--
  2 files changed, 14 insertions(+), 4 deletions(-)
 
 commit 6c40a553a3c8825931c59797059392fd110531cc
@@ -2661,8 +5854,8 @@ Date:	Sun Sep 9 23:25:47 2012 +0200
 
     Fix invalid memory access in solves 1066.pdf.asan.38.75
 
- splash/SplashClip.cc	      |   23 +++++++++++++++++++++++
- splash/SplashXPathScanner.cc |    3 +++
+ splash/SplashClip.cc	      | 23 +++++++++++++++++++++++
+ splash/SplashXPathScanner.cc |  3 +++
  2 files changed, 26 insertions(+)
 
 commit d0df8e54512f584ca2b3edbae1c19e167948e5c3
@@ -2671,7 +5864,7 @@ Date:	Sun Sep 9 23:21:38 2012 +0200
 
     Fix invalid memory access in 1106.pdf.asan.30.120.patch
 
- poppler/Function.cc |	  5 +++++
+ poppler/Function.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 86b89864396a1dcf027e5793e6ac75411977bcf9
@@ -2680,7 +5873,7 @@ Date:	Sun Sep 9 23:08:49 2012 +0200
 
     Fix crash in 1255.pdf.SIGSEGV.56f.285
 
- poppler/XRef.cc |    6 ++++++
+ poppler/XRef.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 96931732f343d2bbda9af9488b485da031866c3b
@@ -2689,8 +5882,8 @@ Date:	Sun Sep 9 22:47:57 2012 +0200
 
     Fix invalid memory access in 61.pdf.asan.13.95
 
- fofi/FoFiType1C.cc |	25 +++++++++++++++++--------
- fofi/FoFiType1C.h  |	 2 ++
+ fofi/FoFiType1C.cc | 25 +++++++++++++++++--------
+ fofi/FoFiType1C.h  |  2 ++
  2 files changed, 19 insertions(+), 8 deletions(-)
 
 commit 26917d69c4da6a110db02b120133c36579fbb17c
@@ -2699,7 +5892,7 @@ Date:	Sun Sep 9 22:23:36 2012 +0200
 
     Add unlikely
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e6a3c797c01aa343f640f2e6f45de5bf379aa8ad
@@ -2708,7 +5901,7 @@ Date:	Sun Sep 9 22:22:59 2012 +0200
 
     Fix wrong memory access in 68.pdf.asan.7.1030
 
- poppler/Gfx.cc |    4 ++++
+ poppler/Gfx.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 48fe18cf277cd2a4e665c74b3a594482f762f4b6
@@ -2717,7 +5910,7 @@ Date:	Sun Sep 9 22:09:44 2012 +0200
 
     Fix memory leak
 
- poppler/Gfx.cc |    1 +
+ poppler/Gfx.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit b87aafc0cdb36c3555053f2684c45f1a9d7b2f94
@@ -2726,8 +5919,8 @@ Date:	Sun Sep 9 21:42:48 2012 +0200
 
     Add unlikelys to the ifs
 
- poppler/DCTStream.cc	|    4 ++--
- poppler/JBIG2Stream.cc |    2 +-
+ poppler/DCTStream.cc	| 4 ++--
+ poppler/JBIG2Stream.cc | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit a019eef2f8ca53addd7ccab7f9c47657f4e52286
@@ -2736,7 +5929,7 @@ Date:	Sun Sep 9 21:41:09 2012 +0200
 
     Fix crash in 1162.pdf.SIGSEGV.28e.182
 
- poppler/DCTStream.cc |    4 ++++
+ poppler/DCTStream.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit ad7c6ac88f2315c9ce003308d1b4988592d4434b
@@ -2745,7 +5938,7 @@ Date:	Sun Sep 9 21:31:58 2012 +0200
 
     Fix crash in 1028.pdf.SIGSEGV.ae6.33
 
- poppler/JBIG2Stream.cc |    8 ++++++++
+ poppler/JBIG2Stream.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit b861af714daee4125e54b250dddf82106f5a8ce8
@@ -2754,7 +5947,7 @@ Date:	Sun Sep 9 21:15:06 2012 +0200
 
     Fix memory leak
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 17fc1bfa8013cafe3b348f0cc07ef08bf9c7dd9a
@@ -2770,7 +5963,7 @@ Date:	Sun Sep 9 12:49:43 2012 +0200
 
     Fix memory leak
 
- poppler/Annot.cc |    3 ++-
+ poppler/Annot.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 28240046f8fe37ca96f9a80cb1ea3a59af9c66f3
@@ -2779,7 +5972,7 @@ Date:	Sun Sep 9 12:48:26 2012 +0200
 
     Fix crash in 589.pdf.SIGSEGV.8b1.929
 
- poppler/Annot.cc |    8 ++++++++
+ poppler/Annot.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit e0118be3ba38bd00fa2a9c20c5b4cd82e820ba0b
@@ -2801,7 +5994,7 @@ Date:	Sat Sep 8 18:10:14 2012 +0200
 
     Only complain when the malloc really failed
 
- poppler/JBIG2Stream.cc |    2 +-
+ poppler/JBIG2Stream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2c41430732f517d4d57e914a315ba315a2545541
@@ -2810,10 +6003,10 @@ Date:	Thu Sep 6 22:12:38 2012 +0200
 
     Add missing licenses
 
- goo/grandom.cc		|    2 ++
- goo/grandom.h		|    2 ++
- splash/SplashScreen.cc |    1 +
- utils/pdfinfo.cc	|    1 +
+ goo/grandom.cc		| 2 ++
+ goo/grandom.h		| 2 ++
+ splash/SplashScreen.cc | 1 +
+ utils/pdfinfo.cc	| 1 +
  4 files changed, 6 insertions(+)
 
 commit be88963a5955ac033e7a7d224bdcc4049085a9dc
@@ -2823,10 +6016,10 @@ Date:	Thu Aug 9 13:18:22 2012 +0200
     pdf-fullrewrite: Added support for encrypted documents, checks on
     output documents, incremental update mode
 
- test/CMakeLists.txt	 |    1 +
- test/Makefile.am	 |    3 +-
- test/pdf-fullrewrite.cc |  354
- +++++++++++++++++++++++++++++++++++++++++++++--
+ test/CMakeLists.txt	 |   1 +
+ test/Makefile.am	 |   3 +-
+ test/pdf-fullrewrite.cc | 354
+ ++++++++++++++++++++++++++++++++++++++++++++++--
  3 files changed, 342 insertions(+), 16 deletions(-)
 
 commit 381be58e9e0d0e323acbd975a2334eca6d9018fd
@@ -2835,7 +6028,7 @@ Date:	Sat Aug 4 13:00:06 2012 +0200
 
     pdfinfo: Show info about the encryption algorithm
 
- utils/pdfinfo.cc |   24 ++++++++++++++++++++++--
+ utils/pdfinfo.cc | 24 ++++++++++++++++++++++--
  1 file changed, 22 insertions(+), 2 deletions(-)
 
 commit 273e8c896e95b548093159dc8bb14d48ce447053
@@ -2848,7 +6041,7 @@ Date:	Wed Aug 15 18:09:02 2012 +0200
     not referenced from the XRef table we build, and we already
     individually write each object they contain.
 
- poppler/XRef.cc |   13 +++++++++++++
+ poppler/XRef.cc | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit 59db8deaa7b1907831b526de3011dc22d0ffb333
@@ -2867,10 +6060,10 @@ Date:	Thu Aug 9 20:08:44 2012 +0200
       think that they are regularly encrypted objects, resulting in
       currupt objects.
 
- poppler/PDFDoc.cc |	5 +++
- poppler/XRef.cc   |  126
- +++++++++++++++++++++++++++++++++++------------------
- poppler/XRef.h    |	9 ++--
+ poppler/PDFDoc.cc |   5 +++
+ poppler/XRef.cc   | 126
+ +++++++++++++++++++++++++++++++++++-------------------
+ poppler/XRef.h    |   9 ++--
  3 files changed, 94 insertions(+), 46 deletions(-)
 
 commit 116722cc74e267ac44dd5a70924557cdf6f25d02
@@ -2879,9 +6072,9 @@ Date:	Sat Aug 4 12:47:22 2012 +0200
 
     Encrypt strWeird streams before writing them in PDFDoc::writeObject
 
- poppler/Decrypt.cc |	 9 ++++++++-
- poppler/Decrypt.h  |	 2 ++
- poppler/PDFDoc.cc  |	10 ++++++++++
+ poppler/Decrypt.cc |  9 ++++++++-
+ poppler/Decrypt.h  |  2 ++
+ poppler/PDFDoc.cc  | 10 ++++++++++
  3 files changed, 20 insertions(+), 1 deletion(-)
 
 commit 695889c1330ca5b37338b8363dbf233fce936bc6
@@ -2890,7 +6083,7 @@ Date:	Sat Aug 4 12:24:25 2012 +0200
 
     Encrypt strings before writing them in PDFDoc::writeString
 
- poppler/PDFDoc.cc |   20 ++++++++++++++++++++
+ poppler/PDFDoc.cc | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit 4ab8e7be536db40db8a1a4af50dad3ba59c49f14
@@ -2899,12 +6092,12 @@ Date:	Sat Aug 4 02:06:11 2012 +0200
 
     Propagate encryption parameters to PDFDoc's write functions
 
- poppler/PDFDoc.cc |   54
- +++++++++++++++++++++++++++++++++++------------------
- poppler/PDFDoc.h  |   20 +++++++++++++-------
- poppler/XRef.cc   |   14 ++++++++++++++
- poppler/XRef.h    |	2 ++
- utils/pdfunite.cc |	2 +-
+ poppler/PDFDoc.cc | 54
+ ++++++++++++++++++++++++++++++++++++------------------
+ poppler/PDFDoc.h  | 20 +++++++++++++-------
+ poppler/XRef.cc   | 14 ++++++++++++++
+ poppler/XRef.h    |  2 ++
+ utils/pdfunite.cc |  2 +-
  5 files changed, 66 insertions(+), 26 deletions(-)
 
 commit 9e43f9a8bcbee9060309b9679dbcc6b501a79cfb
@@ -2918,10 +6111,10 @@ Date:	Wed Aug 1 16:14:22 2012 +0200
     always,
     not only if the object's header and footer need to be written.
 
- poppler/PDFDoc.cc |   51
+ poppler/PDFDoc.cc | 51
  +++++++++++++++++++++++++++++++++------------------
- poppler/PDFDoc.h  |   11 +++++++----
- utils/pdfunite.cc |	2 +-
+ poppler/PDFDoc.h  | 11 +++++++----
+ utils/pdfunite.cc |  2 +-
  3 files changed, 41 insertions(+), 23 deletions(-)
 
 commit 4d19a002801531b07f11382daaf9880e4691a10e
@@ -2934,7 +6127,7 @@ Date:	Sat Aug 4 01:36:06 2012 +0200
     Because we will raw-copy encrypted streams, and the ID is part of the
     decryption key.
 
- poppler/PDFDoc.cc |	5 ++++-
+ poppler/PDFDoc.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 800b2e37d3c4c73147bf9e11d9f38afe2183ab9d
@@ -2948,10 +6141,10 @@ Date:	Wed Aug 1 14:07:10 2012 +0200
     - Mark indirect objects referred from /Encrypt as not encrypted
     in XRef::scanSpecialFlags
 
- poppler/PDFDoc.cc |   49 +++++++++++++++++-------------------------
- poppler/XRef.cc   |   62
- ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/XRef.h    |   16 +++++++++++++-
+ poppler/PDFDoc.cc | 49 ++++++++++++++++++-------------------------
+ poppler/XRef.cc   | 62
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/XRef.h    | 16 +++++++++++++-
  3 files changed, 96 insertions(+), 31 deletions(-)
 
 commit 6647153d47b1d67d2a4d6b90dce2184ab6c7dda6
@@ -2963,9 +6156,9 @@ Date:	Thu Aug 9 12:26:53 2012 +0200
 
     In next patches I'll add other flags
 
- poppler/PDFDoc.cc |	4 ++--
- poppler/XRef.cc   |   18 +++++++++---------
- poppler/XRef.h    |   20 +++++++++++++++++++-
+ poppler/PDFDoc.cc |  4 ++--
+ poppler/XRef.cc   | 18 +++++++++---------
+ poppler/XRef.h    | 20 +++++++++++++++++++-
  3 files changed, 30 insertions(+), 12 deletions(-)
 
 commit a284c6c6623587abb7da7e4c171c42e006ea477b
@@ -2977,7 +6170,7 @@ Date:	Sat Aug 4 01:57:41 2012 +0200
     Because Lexer.cc:241 can read them, and we must be able to write them
     back (especially in full rewrite mode).
 
- poppler/PDFDoc.cc |	3 +++
+ poppler/PDFDoc.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 53baea19658a27f15c7ed870a24be82b8219ddfe
@@ -2988,8 +6181,8 @@ Date:	Sat Aug 4 01:32:08 2012 +0200
 
     Just like any other FilterStream-derived class does
 
- poppler/Stream.cc |   14 +++++++++++---
- poppler/Stream.h  |	2 ++
+ poppler/Stream.cc | 14 +++++++++++---
+ poppler/Stream.h  |  2 ++
  2 files changed, 13 insertions(+), 3 deletions(-)
 
 commit 4e5fee4e9156480173f05e7b3d0bdf604127d481
@@ -2998,7 +6191,7 @@ Date:	Mon Aug 6 02:08:27 2012 +0200
 
     Initialize AES encryption with random CBC IV data
 
- poppler/Decrypt.cc |	 5 +++--
+ poppler/Decrypt.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 1b008f273359b8df6b64ffa94bb2828e42ffa63e
@@ -3007,7 +6200,7 @@ Date:	Mon Aug 6 02:08:40 2012 +0200
 
     Replaced srand/rand calls in SplashScreen with grandom calls
 
- splash/SplashScreen.cc |    7 ++-----
+ splash/SplashScreen.cc | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 commit faff947d8106048b19ba74dd483b90b8cebb16c7
@@ -3016,14 +6209,14 @@ Date:	Mon Aug 6 02:06:47 2012 +0200
 
     Added goo/grandom.[cc|h] with POSIX implementation
 
- CMakeLists.txt        |    2 ++
- ConfigureChecks.cmake |    1 +
- config.h.cmake        |    3 +++
- configure.ac	       |    1 +
- goo/Makefile.am       |    6 +++--
- goo/grandom.cc        |   68
- +++++++++++++++++++++++++++++++++++++++++++++++++
- goo/grandom.h	       |   32 +++++++++++++++++++++++
+ CMakeLists.txt        |  2 ++
+ ConfigureChecks.cmake |  1 +
+ config.h.cmake        |  3 +++
+ configure.ac	       |  1 +
+ goo/Makefile.am       |  6 +++--
+ goo/grandom.cc        | 68
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/grandom.h	       | 32 ++++++++++++++++++++++++
  7 files changed, 111 insertions(+), 2 deletions(-)
 
 commit af8d05d1ab89b74e307e90aaf19c750528f5f561
@@ -3032,9 +6225,9 @@ Date:	Fri Aug 3 12:46:06 2012 +0200
 
     Added encryption support in Decrypt.cc/.h
 
- poppler/Decrypt.cc |  222
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Decrypt.h  |	21 ++++-
+ poppler/Decrypt.cc | 222
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Decrypt.h  |  21 ++++-
  2 files changed, 242 insertions(+), 1 deletion(-)
 
 commit ba6ff179aa78a42a384166ace2df80101cfbe7b9
@@ -3043,9 +6236,9 @@ Date:	Thu Aug 2 18:56:29 2012 +0200
 
     Refactoring of Decrypt.cc/.h in preparation for encryption support
 
- poppler/Decrypt.cc |  219
- ++++++++++++++++++++++++++--------------------------
- poppler/Decrypt.h  |	35 ++++++---
+ poppler/Decrypt.cc | 219
+ +++++++++++++++++++++++++++--------------------------
+ poppler/Decrypt.h  |  35 ++++++---
  2 files changed, 133 insertions(+), 121 deletions(-)
 
 commit cd1ab1e34032d5620140bd0b6b6ec4b74f89ae19
@@ -3054,11 +6247,11 @@ Date:	Thu Aug 30 22:36:14 2012 +0200
 
     Update Adrian's copyrights
 
- goo/GooString.cc	      |    1 +
- poppler/CharCodeToUnicode.cc |    1 +
- poppler/TextOutputDev.cc     |    2 +-
- poppler/UTF.cc		      |   23 +++++++++++++++++++++++
- utils/HtmlOutputDev.cc       |    2 +-
+ goo/GooString.cc	      |  1 +
+ poppler/CharCodeToUnicode.cc |  1 +
+ poppler/TextOutputDev.cc     |  2 +-
+ poppler/UTF.cc		      | 23 +++++++++++++++++++++++
+ utils/HtmlOutputDev.cc       |  2 +-
  5 files changed, 27 insertions(+), 2 deletions(-)
 
 commit ce8a579f339507da3fd7802e1531fbf6849c0c98
@@ -3070,11 +6263,11 @@ Date:	Tue Aug 28 22:16:34 2012 +0930
     This also ensures UTF-16 ActualText strings are converted to UCS-4
     before calling addChar.
 
- goo/GooString.cc	  |    2 +-
- poppler/TextOutputDev.cc |   32 ++++----------------------------
- poppler/UTF.cc		  |   34 ++++++++++++++++++++++++++++++++++
- poppler/UTF.h		  |    8 ++++++++
- utils/pdfinfo.cc	  |   37 ++++++-------------------------------
+ goo/GooString.cc	  |  2 +-
+ poppler/TextOutputDev.cc | 32 ++++----------------------------
+ poppler/UTF.cc		  | 34 ++++++++++++++++++++++++++++++++++
+ poppler/UTF.h		  |  8 ++++++++
+ utils/pdfinfo.cc	  | 37 ++++++-------------------------------
  5 files changed, 53 insertions(+), 60 deletions(-)
 
 commit cac13e782cf4413703cfd1fa23e76133dfbe5ef9
@@ -3092,7 +6285,7 @@ Date:	Tue Aug 28 21:48:16 2012 +0930
     This patch increases the tolerance for overlapping bounding boxes to
     prevent diacritics from splitting lines.
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6f6386219449e70c2c3bc3559fdde3df4a57a809
@@ -3103,17 +6296,17 @@ Date:	Thu Mar 8 20:52:28 2012 +1030
 
     to ensure only UCS-4 values are used with the "Unicode" type.
 
- CMakeLists.txt		      |    3 +-
- poppler/CairoOutputDev.cc    |    2 +-
- poppler/CharCodeToUnicode.cc |   12 +++--
- poppler/GlobalParams.cc      |    2 +-
- poppler/Makefile.am	      |    3 +-
- poppler/TextOutputDev.cc     |   19 +-------
- poppler/UTF.cc		      |   47 +++++++++++++++++++
- poppler/UTF.h		      |  103
- ++++++++++++++++++++++++++++++++++++++++++
- poppler/UTF8.h		      |   84 ----------------------------------
- utils/HtmlOutputDev.cc       |   14 +-----
+ CMakeLists.txt		      |   3 +-
+ poppler/CairoOutputDev.cc    |   2 +-
+ poppler/CharCodeToUnicode.cc |  12 ++---
+ poppler/GlobalParams.cc      |   2 +-
+ poppler/Makefile.am	      |   3 +-
+ poppler/TextOutputDev.cc     |  19 +-------
+ poppler/UTF.cc		      |  47 ++++++++++++++++++++
+ poppler/UTF.h		      | 103
+ +++++++++++++++++++++++++++++++++++++++++++
+ poppler/UTF8.h		      |  84 -----------------------------------
+ utils/HtmlOutputDev.cc       |  14 +-----
  10 files changed, 165 insertions(+), 124 deletions(-)
 
 commit b3b0f5abe4fdcc39d884670e4a998d39324659f6
@@ -3122,7 +6315,7 @@ Date:	Thu Aug 30 00:57:51 2012 +0200
 
     qt4: unbreak spacing
 
- qt4/src/poppler-embeddedfile.cc |    6 +++---
+ qt4/src/poppler-embeddedfile.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6356c0bbae47db291a3585d31c7727bc3f8d97a4
@@ -3131,7 +6324,7 @@ Date:	Thu Aug 30 00:57:51 2012 +0200
 
     qt4: unbreak spacing
 
- qt4/src/poppler-embeddedfile.cc |    6 +++---
+ qt4/src/poppler-embeddedfile.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 46948868dee6d4e68b658c68d7df482590e34da3
@@ -3142,7 +6335,7 @@ Date:	Thu Aug 30 00:43:45 2012 +0200
 
     File to try in KDE bug #306008
 
- poppler/Catalog.cc |	 4 +++-
+ poppler/Catalog.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit debc8fb497bc22c0f9f34d785852981a87475c30
@@ -3151,8 +6344,8 @@ Date:	Thu Aug 30 00:35:40 2012 +0200
 
     Take into account the embFile returned by the core may be NULL
 
- qt4/src/poppler-embeddedfile-private.h |    4 +++-
- qt4/src/poppler-embeddedfile.cc	|   19 ++++++++++++-------
+ qt4/src/poppler-embeddedfile-private.h |  4 +++-
+ qt4/src/poppler-embeddedfile.cc	| 19 ++++++++++++-------
  2 files changed, 15 insertions(+), 8 deletions(-)
 
 commit 3ca67a59fc15782abb1e479eb2b8916de5b1b6ed
@@ -3163,7 +6356,7 @@ Date:	Thu Aug 30 00:34:06 2012 +0200
 
     Otherwise we might end up asserting
 
- poppler/FileSpec.cc |	  4 ++++
+ poppler/FileSpec.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 9264b375eec19e639c524b677f770ad750b1cb43
@@ -3174,7 +6367,7 @@ Date:	Thu Aug 30 00:43:45 2012 +0200
 
     File to try in KDE bug #306008
 
- poppler/Catalog.cc |	 4 +++-
+ poppler/Catalog.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 01528eaedc77d5559f6dc4229b66f1a819678fb7
@@ -3183,8 +6376,8 @@ Date:	Thu Aug 30 00:35:40 2012 +0200
 
     Take into account the embFile returned by the core may be NULL
 
- qt4/src/poppler-embeddedfile-private.h |    4 +++-
- qt4/src/poppler-embeddedfile.cc	|   19 ++++++++++++-------
+ qt4/src/poppler-embeddedfile-private.h |  4 +++-
+ qt4/src/poppler-embeddedfile.cc	| 19 ++++++++++++-------
  2 files changed, 15 insertions(+), 8 deletions(-)
 
 commit c1fba45be106dc30a5136efe41493b1cf6d2a1b5
@@ -3195,7 +6388,7 @@ Date:	Thu Aug 30 00:34:06 2012 +0200
 
     Otherwise we might end up asserting
 
- poppler/FileSpec.cc |	  4 ++++
+ poppler/FileSpec.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 1881486e9817304d0817ce24b177c1bc79587138
@@ -3206,9 +6399,9 @@ Date:	Fri Aug 24 19:12:20 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=53586
 
- poppler/Annot.cc |   58
- +++++++++++++++++++++++++++++++++++++++++++-----------
- poppler/Annot.h  |   24 ++++++++++++++++++----
+ poppler/Annot.cc | 58
+ ++++++++++++++++++++++++++++++++++++++++++++------------
+ poppler/Annot.h  | 24 +++++++++++++++++++----
  2 files changed, 66 insertions(+), 16 deletions(-)
 
 commit 686ec0cc92e25f74eaa9e09a328724cbdf939bca
@@ -3217,7 +6410,7 @@ Date:	Wed Aug 15 20:02:05 2012 +0200
 
     Remove declared but not implemented function
 
- poppler/XRef.h |    1 -
+ poppler/XRef.h | 1 -
  1 file changed, 1 deletion(-)
 
 commit 0b3259c1d5679cb8d59d770e5fbe7e1bc141a025
@@ -3226,7 +6419,7 @@ Date:	Wed Aug 15 20:02:05 2012 +0200
 
     Remove declared but not implemented function
 
- poppler/XRef.h |    1 -
+ poppler/XRef.h | 1 -
  1 file changed, 1 deletion(-)
 
 commit 5fd2a35227c22dbddedfb397eff0e0a09c3d1b03
@@ -3237,8 +6430,8 @@ Date:	Wed Aug 15 19:51:43 2012 +0200
 
     no public header uses them anymore, so need to expose them
 
- poppler/poppler-config.h.cmake |   10 ----------
- poppler/poppler-config.h.in	|   10 ----------
+ poppler/poppler-config.h.cmake | 10 ----------
+ poppler/poppler-config.h.in	| 10 ----------
  2 files changed, 20 deletions(-)
 
 commit edd0ea4847c143adb1d15a57b42b0ce2b2c80b0e
@@ -3247,7 +6440,7 @@ Date:	Wed Aug 15 19:31:50 2012 +0200
 
     ignore more qt4 tests
 
- qt4/tests/.gitignore |    3 +++
+ qt4/tests/.gitignore | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 2df57857000c5adbee6b029ff7a79acc707786a0
@@ -3261,13 +6454,13 @@ Date:	Wed Aug 15 18:59:15 2012 +0200
     in other directories;
     likewise, do not to link to it if not needed
 
- glib/Makefile.am      |    4 +---
- qt4/demos/Makefile.am |    2 --
- qt4/src/Makefile.am   |    2 --
- qt4/tests/Makefile.am |    2 --
- test/Makefile.am      |    6 ++----
- utils/CMakeLists.txt  |    3 ---
- utils/Makefile.am     |    4 +---
+ glib/Makefile.am      | 4 +---
+ qt4/demos/Makefile.am | 2 --
+ qt4/src/Makefile.am   | 2 --
+ qt4/tests/Makefile.am | 2 --
+ test/Makefile.am      | 6 ++----
+ utils/CMakeLists.txt  | 3 ---
+ utils/Makefile.am     | 4 +---
  7 files changed, 4 insertions(+), 19 deletions(-)
 
 commit 3e802949264d9310df057daff891a3fccb2eb8d3
@@ -3279,7 +6472,7 @@ Date:	Wed Aug 15 00:02:23 2012 +0200
     Makes some people happier and it doesn't hurt us much
     Bug #53159
 
- poppler/PSOutputDev.cc |    7 ++-----
+ poppler/PSOutputDev.cc | 7 ++-----
  1 file changed, 2 insertions(+), 5 deletions(-)
 
 commit e83568065f77ba722b147b3b10faed1ff66f22dc
@@ -3290,7 +6483,8 @@ Date:	Sat Aug 11 01:38:08 2012 +0200
 
     (cherry picked from commit 9a5a19ee2f9cd536c3527b30c0256ca9dce3638c)
 
- 0 files changed
+ goo/GooTimer.h | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 9a5a19ee2f9cd536c3527b30c0256ca9dce3638c
 Author: Pino Toscano <pino@kde.org>
@@ -3298,7 +6492,8 @@ Date:	Sat Aug 11 01:38:08 2012 +0200
 
     remove extra execution permissions
 
- 0 files changed
+ goo/GooTimer.h | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit 1b2903c104012fdd3c982d57898910945dff9a15
 Author: Albert Astals Cid <aacid@kde.org>
@@ -3306,12 +6501,12 @@ Date:	Sat Aug 11 00:05:10 2012 +0200
 
     0.20.3
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 16 ++++++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 16 ++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 22 insertions(+), 6 deletions(-)
 
 commit 40e7b744d32152ab4c6201b8bda7fb7caf6bfd4e
@@ -3323,7 +6518,7 @@ Date:	Sun Aug 5 15:07:16 2012 +0200
     Reviewed by Jose Aliste
     Bug #3498
 
- poppler/SecurityHandler.cc |	 7 ++++++-
+ poppler/SecurityHandler.cc | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit a53e0641365608f832b455404f1ee584d278e0c4
@@ -3335,7 +6530,7 @@ Date:	Sun Aug 5 15:07:16 2012 +0200
     Reviewed by Jose Aliste
     Bug #3498
 
- poppler/SecurityHandler.cc |	 7 ++++++-
+ poppler/SecurityHandler.cc | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 3ca2bc0d3abdf92741b7921ea402c9de09e531f6
@@ -3346,7 +6541,7 @@ Date:	Fri Aug 3 00:48:12 2012 +0200
 
     Bug 52488
 
- splash/Splash.cc |    7 +++++++
+ splash/Splash.cc | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 31fe12c63f0133d124e2115aba607857aaff0978
@@ -3357,7 +6552,7 @@ Date:	Fri Aug 3 00:48:12 2012 +0200
 
     Bug 52488
 
- splash/Splash.cc |    7 +++++++
+ splash/Splash.cc | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit d3c339017857cd762d8419260e33e1cc4e197743
@@ -3368,7 +6563,7 @@ Date:	Thu Aug 2 00:22:19 2012 +0200
 
     Bug #52384
 
- poppler/PSOutputDev.cc |    4 ++--
+ poppler/PSOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 768cf5877f48f8cee80fe96e2ee52f42f230dfdf
@@ -3379,7 +6574,7 @@ Date:	Thu Aug 2 00:22:19 2012 +0200
 
     Bug #52384
 
- poppler/PSOutputDev.cc |    4 ++--
+ poppler/PSOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d0e55aa49484263882345fa648e1e907d2b172f2
@@ -3388,9 +6583,9 @@ Date:	Wed Aug 1 22:56:49 2012 +0200
 
     Splash: Blend mode enhancements for CMYK
 
- poppler/SplashOutputDev.cc |	76
- +++++++++++++++++++++++++++++++-------------
- splash/Splash.cc	    |	22 -------------
+ poppler/SplashOutputDev.cc | 76
+ ++++++++++++++++++++++++++++++++--------------
+ splash/Splash.cc	    | 22 --------------
  2 files changed, 54 insertions(+), 44 deletions(-)
 
 commit 315447843a368556a8536bc30e579c9bf338682e
@@ -3399,9 +6594,9 @@ Date:	Wed Aug 1 22:56:49 2012 +0200
 
     Splash: Blend mode enhancements for CMYK
 
- poppler/SplashOutputDev.cc |	76
- +++++++++++++++++++++++++++++++-------------
- splash/Splash.cc	    |	22 -------------
+ poppler/SplashOutputDev.cc | 76
+ ++++++++++++++++++++++++++++++++--------------
+ splash/Splash.cc	    | 22 --------------
  2 files changed, 54 insertions(+), 44 deletions(-)
 
 commit 78c6a5615013d26b8a2babb13b3c4f7d6a1d70a4
@@ -3413,7 +6608,7 @@ Date:	Tue Jul 31 23:32:19 2012 +0200
     Fixes build in Solaris 10
     Bug #52426
 
- goo/gstrtod.cc |   10 +++++-----
+ goo/gstrtod.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit c0c88b3707fc7337e814ae4252d80002641a19ee
@@ -3425,7 +6620,7 @@ Date:	Tue Jul 31 23:32:19 2012 +0200
     Fixes build in Solaris 10
     Bug #52426
 
- goo/gstrtod.cc |   10 +++++-----
+ goo/gstrtod.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit dcbc923bd3592a81876f84005fbaddcea18641cc
@@ -3436,7 +6631,7 @@ Date:	Sun Jul 22 18:40:46 2012 +0200
 
     Bug #52215
 
- poppler/PSOutputDev.cc |    5 +----
+ poppler/PSOutputDev.cc | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 36481939e3064de920e49d9d1742a85473a50963
@@ -3447,7 +6642,7 @@ Date:	Sun Jul 22 18:40:46 2012 +0200
 
     Bug #52215
 
- poppler/PSOutputDev.cc |    5 +----
+ poppler/PSOutputDev.cc | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit ef7c2418e12d3e6a79f1d89a0051b005fadbc344
@@ -3458,7 +6653,7 @@ Date:	Sat Jul 21 00:01:49 2012 +0200
 
     Bug 51982
 
- poppler/PSOutputDev.cc |    4 +++-
+ poppler/PSOutputDev.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 6b567565b7b9d591fbd7441592096960a303bd39
@@ -3469,7 +6664,7 @@ Date:	Sat Jul 21 00:01:49 2012 +0200
 
     Bug 51982
 
- poppler/PSOutputDev.cc |    4 +++-
+ poppler/PSOutputDev.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 349b21acc249c130fb053bc4a0c75019f75bd35b
@@ -3480,15 +6675,15 @@ Date:	Thu Jul 19 00:18:14 2012 +0200
 
     Bug 52193
 
- goo/FixedPoint.h      |    2 +-
- goo/GooTimer.h        |    2 +-
- goo/JpegWriter.h      |    2 +-
- goo/PNGWriter.h       |    2 +-
- goo/TiffWriter.h      |    2 +-
- goo/gfile.h	       |    2 +-
- goo/gmem.h	       |    2 +-
- splash/SplashFTFont.h |    2 +-
- splash/SplashMath.h   |    2 +-
+ goo/FixedPoint.h      | 2 +-
+ goo/GooTimer.h        | 2 +-
+ goo/JpegWriter.h      | 2 +-
+ goo/PNGWriter.h       | 2 +-
+ goo/TiffWriter.h      | 2 +-
+ goo/gfile.h	       | 2 +-
+ goo/gmem.h	       | 2 +-
+ splash/SplashFTFont.h | 2 +-
+ splash/SplashMath.h   | 2 +-
  9 files changed, 9 insertions(+), 9 deletions(-)
 
 commit 34327b2c201392f96e3449941411b7ad4b3e8bcb
@@ -3499,15 +6694,15 @@ Date:	Thu Jul 19 00:18:14 2012 +0200
 
     Bug 52193
 
- goo/FixedPoint.h      |    2 +-
- goo/GooTimer.h        |    2 +-
- goo/JpegWriter.h      |    2 +-
- goo/PNGWriter.h       |    2 +-
- goo/TiffWriter.h      |    2 +-
- goo/gfile.h	       |    2 +-
- goo/gmem.h	       |    2 +-
- splash/SplashFTFont.h |    2 +-
- splash/SplashMath.h   |    2 +-
+ goo/FixedPoint.h      | 2 +-
+ goo/GooTimer.h        | 2 +-
+ goo/JpegWriter.h      | 2 +-
+ goo/PNGWriter.h       | 2 +-
+ goo/TiffWriter.h      | 2 +-
+ goo/gfile.h	       | 2 +-
+ goo/gmem.h	       | 2 +-
+ splash/SplashFTFont.h | 2 +-
+ splash/SplashMath.h   | 2 +-
  9 files changed, 9 insertions(+), 9 deletions(-)
 
 commit 8fe700217ab6ce786a8272f2c338e3dab434c56e
@@ -3518,7 +6713,7 @@ Date:	Thu Jul 19 00:06:45 2012 +0200
 
     Bug 52197
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 15c6ae699f083ea6c9716c1098ae9833a56eeb3e
@@ -3529,7 +6724,7 @@ Date:	Thu Jul 19 00:06:45 2012 +0200
 
     Bug 52197
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f5311da76ec7cd7c1e6cdfc4e18df6dd56e8398b
@@ -3538,7 +6733,7 @@ Date:	Thu Jul 19 00:01:49 2012 +0200
 
     pdfseparate: Return 0 on success
 
- utils/pdfseparate.cc |    6 +++++-
+ utils/pdfseparate.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit dc8833a36b514c13cfd6b1fd4665d2fddd71f357
@@ -3547,7 +6742,7 @@ Date:	Thu Jul 19 00:01:49 2012 +0200
 
     pdfseparate: Return 0 on success
 
- utils/pdfseparate.cc |    6 +++++-
+ utils/pdfseparate.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 51f22ca0badfc41c19cba66cabd63184244f81c7
@@ -3559,9 +6754,9 @@ Date:	Mon Jul 16 23:32:23 2012 +0200
 
     Bug #51822
 
- poppler/PSOutputDev.cc |   54
- +++++++++++++++++++++++++++++++++++++++++-------
- poppler/PSOutputDev.h	|    2 +-
+ poppler/PSOutputDev.cc | 54
+ +++++++++++++++++++++++++++++++++++++++++++-------
+ poppler/PSOutputDev.h	|  2 +-
  2 files changed, 48 insertions(+), 8 deletions(-)
 
 commit 31ef967033407de91109ff46db9c60cb8748bc55
@@ -3573,9 +6768,9 @@ Date:	Mon Jul 16 23:32:23 2012 +0200
 
     Bug #51822
 
- poppler/PSOutputDev.cc |   54
- +++++++++++++++++++++++++++++++++++++++++-------
- poppler/PSOutputDev.h	|    2 +-
+ poppler/PSOutputDev.cc | 54
+ +++++++++++++++++++++++++++++++++++++++++++-------
+ poppler/PSOutputDev.h	|  2 +-
  2 files changed, 48 insertions(+), 8 deletions(-)
 
 commit f9f5238d32615f93d07afa3aa7384a8b30737203
@@ -3587,10 +6782,10 @@ Date:	Fri Jul 13 00:56:48 2012 +0200
 
     Bug #49523
 
- poppler/SplashOutputDev.cc |	 2 +-
- splash/Splash.cc	    |	79
- +++++++++++++++++++++++++-------------------
- splash/Splash.h	    |	 4 +--
+ poppler/SplashOutputDev.cc |  2 +-
+ splash/Splash.cc	    | 79
+ ++++++++++++++++++++++++++--------------------
+ splash/Splash.h	    |  4 +--
  3 files changed, 48 insertions(+), 37 deletions(-)
 
 commit 950d5f3dec4bff5d3c523d55689d7b70215dc110
@@ -3602,10 +6797,10 @@ Date:	Fri Jul 13 00:56:48 2012 +0200
 
     Bug #49523
 
- poppler/SplashOutputDev.cc |	 2 +-
- splash/Splash.cc	    |	79
- +++++++++++++++++++++++++-------------------
- splash/Splash.h	    |	 4 +--
+ poppler/SplashOutputDev.cc |  2 +-
+ splash/Splash.cc	    | 79
+ ++++++++++++++++++++++++++--------------------
+ splash/Splash.h	    |  4 +--
  3 files changed, 48 insertions(+), 37 deletions(-)
 
 commit e09be3bc6ba1290fd31bde0c3d19c4ffcbadbf00
@@ -3614,11 +6809,11 @@ Date:	Tue Jul 10 23:06:53 2012 +0200
 
     0.20.2
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   11 +++++++++++
- configure.ac	  |    2 +-
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 11 +++++++++++
+ configure.ac	  |  2 +-
+ cpp/Doxyfile	  |  2 +-
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 15 insertions(+), 4 deletions(-)
 
 commit e15fe0e1e6accf779caeb1179a8d62161c0aa650
@@ -3629,7 +6824,7 @@ Date:	Thu Jul 5 17:44:02 2012 +0200
 
     bug #51548
 
- poppler/PSOutputDev.cc |   14 --------------
+ poppler/PSOutputDev.cc | 14 --------------
  1 file changed, 14 deletions(-)
 
 commit 31837201cf5b3db735c89ef4969105b7a6ab465d
@@ -3640,7 +6835,7 @@ Date:	Thu Jul 5 17:44:02 2012 +0200
 
     bug #51548
 
- poppler/PSOutputDev.cc |   14 --------------
+ poppler/PSOutputDev.cc | 14 --------------
  1 file changed, 14 deletions(-)
 
 commit 262203bd86403e43034fbfbbeef5a5894a62ecb2
@@ -3649,9 +6844,9 @@ Date:	Sat Jun 30 14:36:28 2012 +0200
 
     [qt4] Refactor part of ::search() functions
 
- qt4/src/poppler-page-private.h |    7 ++++-
- qt4/src/poppler-page.cc	|   61
- ++++++++++++++++++----------------------
+ qt4/src/poppler-page-private.h |  7 ++++-
+ qt4/src/poppler-page.cc	| 61
+ +++++++++++++++++++-----------------------
  2 files changed, 34 insertions(+), 34 deletions(-)
 
 commit bd71f80c409dbb47231088c3c6661946ccde6e67
@@ -3660,8 +6855,8 @@ Date:	Thu Jun 28 17:42:17 2012 +0200
 
     [qt4] add whole-page search method to Poppler::Page
 
- qt4/src/poppler-page.cc |   39 +++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h	 |   14 ++++++++++++++
+ qt4/src/poppler-page.cc | 39 +++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	 | 14 ++++++++++++++
  2 files changed, 53 insertions(+)
 
 commit 46ebe7dc84b14ce8dda7b3b1da516b9d99ac3344
@@ -3672,7 +6867,7 @@ Date:	Fri Jun 29 01:56:55 2012 +0200
 
     Bug 51479
 
- poppler/PSOutputDev.cc |   20 ++++++++++++++++++++
+ poppler/PSOutputDev.cc | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit 02c4e6bf4cc0f5535946fe31815081a40b1de986
@@ -3683,7 +6878,7 @@ Date:	Fri Jun 29 01:56:55 2012 +0200
 
     Bug 51479
 
- poppler/PSOutputDev.cc |   20 ++++++++++++++++++++
+ poppler/PSOutputDev.cc | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit 2b8d95aeede56c75699bb83ca3b23ea199b81c2c
@@ -3695,7 +6890,7 @@ Date:	Thu Jun 28 00:18:07 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/JPXStream.cc |   14 ++++++++++++--
+ poppler/JPXStream.cc | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit f7990386d268a444c297958e9c50ed27a0825a00
@@ -3707,7 +6902,7 @@ Date:	Thu Jun 28 00:18:07 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/JPXStream.cc |   14 ++++++++++++--
+ poppler/JPXStream.cc | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit c5c6eed1623506e1206e89cee0b7c887d815ba62
@@ -3718,8 +6913,8 @@ Date:	Sun Jun 24 23:43:03 2012 +0200
 
     Fixes abort in KDE bug #302372
 
- splash/Splash.cc	|   37 +++++++++++++++++++++++--------------
- splash/SplashBitmap.cc |   18 +++++++++++-------
+ splash/Splash.cc	| 37 +++++++++++++++++++++++--------------
+ splash/SplashBitmap.cc | 18 +++++++++++-------
  2 files changed, 34 insertions(+), 21 deletions(-)
 
 commit f48eb669ae5c729c026554802e666e64399c0900
@@ -3730,8 +6925,8 @@ Date:	Sun Jun 24 23:43:03 2012 +0200
 
     Fixes abort in KDE bug #302372
 
- splash/Splash.cc	|   37 +++++++++++++++++++++++--------------
- splash/SplashBitmap.cc |   18 +++++++++++-------
+ splash/Splash.cc	| 37 +++++++++++++++++++++++--------------
+ splash/SplashBitmap.cc | 18 +++++++++++-------
  2 files changed, 34 insertions(+), 21 deletions(-)
 
 commit c87738ee234aafc6eda5a263ad789205037020e1
@@ -3742,7 +6937,7 @@ Date:	Sun Jun 24 20:20:38 2012 +0200
 
     Fixes bug #51369
 
- poppler/PDFDoc.cc |   16 ++++++++++++++--
+ poppler/PDFDoc.cc | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
 commit ff48a5d67a130211fbbb98aa0011bca0c1185114
@@ -3753,7 +6948,7 @@ Date:	Sun Jun 24 20:20:38 2012 +0200
 
     Fixes bug #51369
 
- poppler/PDFDoc.cc |   16 ++++++++++++++--
+ poppler/PDFDoc.cc | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
 commit 6cdf879e389f05abba30b3fad8083b7fff23056e
@@ -3768,7 +6963,7 @@ Date:	Sun Jun 24 11:48:04 2012 +0200
 
     Fixes bug #51361
 
- qt4/src/poppler-annotation.cc |    5 +++++
+ qt4/src/poppler-annotation.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit bd1dab39a857b852c09d21f64254ffc1f24c2df0
@@ -3783,7 +6978,7 @@ Date:	Sun Jun 24 11:48:04 2012 +0200
 
     Fixes bug #51361
 
- qt4/src/poppler-annotation.cc |    5 +++++
+ qt4/src/poppler-annotation.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 31db47d077825045edd1a2d229e873a6f8e09fb1
@@ -3798,8 +6993,7 @@ Date:	Sun Jun 17 12:00:43 2012 +0200
      - Don't fetch the stream to check the reference is valid, this is
        already done when used
 
- poppler/Annot.cc |   50
- ++++++++++++++++++--------------------------------
+ poppler/Annot.cc | 50 ++++++++++++++++++--------------------------------
  1 file changed, 18 insertions(+), 32 deletions(-)
 
 commit b15d02b92aca1348564e70d0245064bc27eefce8
@@ -3808,8 +7002,8 @@ Date:	Fri May 18 01:47:55 2012 +0200
 
     Add the possibility of using lcms1 even if lcms2 is installed
 
- CMakeLists.txt |   20 +++++++++++++-------
- configure.ac	|   31 +++++++++++++++----------------
+ CMakeLists.txt | 20 +++++++++++++-------
+ configure.ac	| 31 +++++++++++++++----------------
  2 files changed, 28 insertions(+), 23 deletions(-)
 
 commit 0cc2738737ed411159c8c8045eff5d1a4463ed16
@@ -3818,7 +7012,7 @@ Date:	Thu Jun 14 20:31:26 2012 +0200
 
     fix typo to compile in Windows
 
- poppler/GlobalParamsWin.cc |	 3 ++-
+ poppler/GlobalParamsWin.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 3575becd60585324bcefc0631b1bac47c1db3c5c
@@ -3827,7 +7021,7 @@ Date:	Thu Jun 14 20:31:26 2012 +0200
 
     fix typo to compile in Windows
 
- poppler/GlobalParamsWin.cc |	 3 ++-
+ poppler/GlobalParamsWin.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 2e1410ea62fe99e52c94f878d02181f0b59f1cd5
@@ -3839,8 +7033,8 @@ Date:	Mon Jun 11 15:17:59 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/JBIG2Stream.cc |   58
- ++++++++++++++++++++++++++++++++++++------------
+ poppler/JBIG2Stream.cc | 58
+ ++++++++++++++++++++++++++++++++++++++------------
  1 file changed, 44 insertions(+), 14 deletions(-)
 
 commit 06618065c8a97a5bec125560546b98edfc1210f3
@@ -3852,8 +7046,8 @@ Date:	Mon Jun 11 15:17:59 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/JBIG2Stream.cc |   58
- ++++++++++++++++++++++++++++++++++++------------
+ poppler/JBIG2Stream.cc | 58
+ ++++++++++++++++++++++++++++++++++++++------------
  1 file changed, 44 insertions(+), 14 deletions(-)
 
 commit 6a76d21661add4f84ee0859c4e7a4c23e7a63bc4
@@ -3865,7 +7059,7 @@ Date:	Sun Jun 10 19:44:18 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/Linearization.cc |    4 ++--
+ poppler/Linearization.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit e3fe88df3646a80945210ba426eb4681a98b55e9
@@ -3877,7 +7071,7 @@ Date:	Sun Jun 10 19:44:18 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/Linearization.cc |    4 ++--
+ poppler/Linearization.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 1240eee8c0d0d01113443e0fda87721775a76da9
@@ -3886,12 +7080,12 @@ Date:	Sun Jun 10 20:42:55 2012 +0200
 
     0.20.1
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 25 +++++++++++++++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 25 +++++++++++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 31 insertions(+), 6 deletions(-)
 
 commit d483436517c5d9679fd6f4ec5544128ffcc2188e
@@ -3900,7 +7094,7 @@ Date:	Sun Jun 10 20:15:01 2012 +0200
 
     Update copyrights
 
- poppler/GlobalParamsWin.cc |	 1 +
+ poppler/GlobalParamsWin.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit c783037619e2b4c101e8ecd7e61c94ee077b4be2
@@ -3909,7 +7103,7 @@ Date:	Sun Jun 10 20:15:01 2012 +0200
 
     Update copyrights
 
- poppler/GlobalParamsWin.cc |	 1 +
+ poppler/GlobalParamsWin.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit d791101fbdebf7a3b3f333939f9bbff6bbecf45f
@@ -3921,7 +7115,7 @@ Date:	Sun Jun 10 19:09:17 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/Gfx.cc |    5 +++--
+ poppler/Gfx.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit f3f9d8f28a97338da92c842d5668b0ef3495ef13
@@ -3933,7 +7127,7 @@ Date:	Sun Jun 10 19:09:17 2012 +0200
     Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
     and Gynvael Coldwind
 
- poppler/Gfx.cc |    5 +++--
+ poppler/Gfx.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 8b3fa65f293804dab7ae2fd069132d0d6f44bbb2
@@ -3942,8 +7136,8 @@ Date:	Sun Jun 10 17:48:08 2012 +0200
 
     [qt4] Add accessor methods for poster information
 
- qt4/src/poppler-movie.cc |   15 +++++++++++++++
- qt4/src/poppler-qt4.h	  |   15 +++++++++++++++
+ qt4/src/poppler-movie.cc | 15 +++++++++++++++
+ qt4/src/poppler-qt4.h	  | 15 +++++++++++++++
  2 files changed, 30 insertions(+)
 
 commit e8aa8266254bfd2189d5b5105e3d76caa4cc6713
@@ -3952,7 +7146,7 @@ Date:	Sun Jun 10 16:58:54 2012 +0200
 
     use setoverprintmode only if rip knows it
 
- poppler/PSOutputDev.cc |    6 +++---
+ poppler/PSOutputDev.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 92ef16e3699da949c80716c3fd4b438fe79c134d
@@ -3961,7 +7155,7 @@ Date:	Sun Jun 10 16:58:54 2012 +0200
 
     use setoverprintmode only if rip knows it
 
- poppler/PSOutputDev.cc |    6 +++---
+ poppler/PSOutputDev.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6e3503b5591b105fa92e6cc6568b8819f6acd625
@@ -3974,7 +7168,7 @@ Date:	Thu May 24 23:17:27 2012 +0200
     If the page is rotated by 90 or 270 degrees, width and height need
     to be swapped
 
- qt4/src/poppler-annotation.cc |   16 ++++++++++++++--
+ qt4/src/poppler-annotation.cc | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
 commit 99aa734ae2d3ba51f840d4c8ef450488fb702a31
@@ -3987,7 +7181,7 @@ Date:	Thu May 24 23:17:27 2012 +0200
     If the page is rotated by 90 or 270 degrees, width and height need
     to be swapped
 
- qt4/src/poppler-annotation.cc |   16 ++++++++++++++--
+ qt4/src/poppler-annotation.cc | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
 commit 4f2ac544f36aa11747c3e13ff69fc19bdd0136dc
@@ -3998,7 +7192,7 @@ Date:	Sat Jun 9 01:31:29 2012 +0200
 
     The default icon is Note not comment
 
- qt4/src/poppler-annotation.cc |    2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bde31ce7b223abc86d25e06f3d73668b792c70df
@@ -4009,7 +7203,7 @@ Date:	Sat Jun 9 01:31:29 2012 +0200
 
     The default icon is Note not comment
 
- qt4/src/poppler-annotation.cc |    2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0df0aa439eed1d9838a80942e00af08e9acabb8d
@@ -4018,8 +7212,8 @@ Date:	Sat Jun 2 17:33:23 2012 +0200
 
     glib-demo: Add find options to find demo
 
- glib/demo/find.c |   61
- +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/demo/find.c | 61
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 60 insertions(+), 1 deletion(-)
 
 commit 52b3ede4bfd1e2288a0efca34da5d6239d3563e9
@@ -4028,8 +7222,8 @@ Date:	Sat Jun 2 16:25:06 2012 +0200
 
     glib-demo: Show search matches in a document view
 
- glib/demo/find.c |  253
- ++++++++++++++++++++++++++++++++++++++++++++++--------
+ glib/demo/find.c | 253
+ +++++++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 218 insertions(+), 35 deletions(-)
 
 commit ed0c761c2190a3c1959a60ae9b7961f58a43c939
@@ -4043,11 +7237,11 @@ Date:	Sat Jun 2 11:54:21 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=2951
 
- glib/poppler-page.cc		     |	 52
- ++++++++++++++++++++++++++---------
- glib/poppler-page.h		     |	  3 ++
- glib/poppler.h			     |	 18 ++++++++++++
- glib/reference/poppler-sections.txt |	  2 ++
+ glib/poppler-page.cc		     | 52
+ +++++++++++++++++++++++++++----------
+ glib/poppler-page.h		     |	3 +++
+ glib/poppler.h			     | 18 +++++++++++++
+ glib/reference/poppler-sections.txt |	2 ++
  4 files changed, 62 insertions(+), 13 deletions(-)
 
 commit 126b55c9a44ccb0dba55e758843e9ee4aa43ee2b
@@ -4058,8 +7252,8 @@ Date:	Sat Jun 2 17:19:30 2012 +0200
 
     It seems we missed it in the xpdf303 merge.
 
- poppler/TextOutputDev.cc |  144
- ++++++++++++++++++++++++----------------------
+ poppler/TextOutputDev.cc | 144
+ ++++++++++++++++++++++++-----------------------
  1 file changed, 74 insertions(+), 70 deletions(-)
 
 commit 20210fbb6117649b20f6930031f24b8fc97b773d
@@ -4070,9 +7264,9 @@ Date:	Mon May 28 23:44:17 2012 +0200
 
     Outputs the font name without any substitutions. Bug #49872
 
- utils/HtmlFonts.cc |	 4 +++-
- utils/pdftohtml.1  |	 3 +++
- utils/pdftohtml.cc |	 4 ++++
+ utils/HtmlFonts.cc | 4 +++-
+ utils/pdftohtml.1  | 3 +++
+ utils/pdftohtml.cc | 4 ++++
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 03f979a7e59c4eb5ecb8acc324c7faf700144589
@@ -4081,8 +7275,8 @@ Date:	Sat May 26 17:46:59 2012 +0200
 
     Make the output more xhtml compliant
 
- utils/HtmlOutputDev.cc |  105
- ++++++++++++++++++++++++------------------------
+ utils/HtmlOutputDev.cc | 105
+ +++++++++++++++++++++++++------------------------
  1 file changed, 53 insertions(+), 52 deletions(-)
 
 commit ba6406222f828e354323223fc4bdb01c1726fb49
@@ -4100,12 +7294,12 @@ Date:	Mon May 21 18:16:06 2012 +0200
     dictionary
       contained /P
 
- poppler/Annot.cc	       |   40
+ poppler/Annot.cc	       | 40
  ++++++++++++++++++++++++++++++++++------
- poppler/Annot.h	       |   13 +++++++++----
- poppler/Page.cc	       |    7 ++++---
- poppler/Page.h		       |    2 +-
- qt4/src/poppler-annotation.cc |    8 --------
+ poppler/Annot.h	       | 13 +++++++++----
+ poppler/Page.cc	       |  7 ++++---
+ poppler/Page.h		       |  2 +-
+ qt4/src/poppler-annotation.cc |  8 --------
  5 files changed, 48 insertions(+), 22 deletions(-)
 
 commit 9904b8f10abf068a7816bd90976ccbb320387645
@@ -4114,7 +7308,7 @@ Date:	Thu May 24 18:24:48 2012 +0930
 
     glib docs: fix typo
 
- glib/poppler-document.cc |    4 ++--
+ glib/poppler-document.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 028f580056f99719cfb8af7bbe8184ceac02cb16
@@ -4123,7 +7317,7 @@ Date:	Sun May 13 21:36:36 2012 +0930
 
     add sustitute font name to GlobalParamsWin32 to fix compilation
 
- poppler/GlobalParamsWin.cc |	 5 ++++-
+ poppler/GlobalParamsWin.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 1916d000a86336213ffd6e9bd44ce873e8955895
@@ -4134,9 +7328,9 @@ Date:	Sat May 12 16:31:38 2012 +0930
 
     Bug 49826
 
- poppler/FontInfo.cc	 |    1 +
- poppler/GlobalParams.cc |   58
- ++++++++++++++++++++++++++---------------------
+ poppler/FontInfo.cc	 |  1 +
+ poppler/GlobalParams.cc | 58
+ +++++++++++++++++++++++++++----------------------
  2 files changed, 33 insertions(+), 26 deletions(-)
 
 commit b47d38e2ccd8563394df89765e277bde95730052
@@ -4145,7 +7339,7 @@ Date:	Thu May 24 18:24:48 2012 +0930
 
     glib docs: fix typo
 
- glib/poppler-document.cc |    4 ++--
+ glib/poppler-document.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 14a29dbff585cbe55247431a346c2ac3e12473fe
@@ -4154,7 +7348,7 @@ Date:	Sun May 13 21:36:36 2012 +0930
 
     add sustitute font name to GlobalParamsWin32 to fix compilation
 
- poppler/GlobalParamsWin.cc |	 5 ++++-
+ poppler/GlobalParamsWin.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 7436b2c8a853f5121eb7dd13168ab997f1cf7d80
@@ -4165,9 +7359,9 @@ Date:	Sat May 12 16:31:38 2012 +0930
 
     Bug 49826
 
- poppler/FontInfo.cc	 |    1 +
- poppler/GlobalParams.cc |   58
- ++++++++++++++++++++++++++---------------------
+ poppler/FontInfo.cc	 |  1 +
+ poppler/GlobalParams.cc | 58
+ +++++++++++++++++++++++++++----------------------
  2 files changed, 33 insertions(+), 26 deletions(-)
 
 commit 1c6e84555572a6bf3a2e3fbe9a54b40f11c122ad
@@ -4176,7 +7370,7 @@ Date:	Fri May 18 16:22:46 2012 +0200
 
     qt4: Make TextAnnotation ctor public
 
- qt4/src/poppler-annotation.h |    2 +-
+ qt4/src/poppler-annotation.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fe28614e7aab6e029f4b420353b67a7eea24de36
@@ -4185,7 +7379,7 @@ Date:	Fri May 18 16:22:46 2012 +0200
 
     qt4: Make TextAnnotation ctor public
 
- qt4/src/poppler-annotation.h |    2 +-
+ qt4/src/poppler-annotation.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8e504bf2543621973fdaddbd29055ce435540146
@@ -4194,7 +7388,7 @@ Date:	Wed May 16 23:49:01 2012 +0300
 
     pdfseparate.1: Syntax fixes.
 
- utils/pdfseparate.1 |	  6 +++---
+ utils/pdfseparate.1 | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 918456372548810c9efbf0533fa155034dd081f2
@@ -4203,7 +7397,7 @@ Date:	Wed May 16 23:49:01 2012 +0300
 
     pdfseparate.1: Syntax fixes.
 
- utils/pdfseparate.1 |	  6 +++---
+ utils/pdfseparate.1 | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 892e486addcbcad619613c7be1ca692a0d36d6e5
@@ -4212,9 +7406,9 @@ Date:	Mon May 21 20:28:42 2012 +0200
 
     Compile++
 
- cmake/modules/FindGTK.cmake |	  8 ++++----
- glib/demo/CMakeLists.txt    |	  6 +++---
- test/CMakeLists.txt	     |	  6 +++---
+ cmake/modules/FindGTK.cmake | 8 ++++----
+ glib/demo/CMakeLists.txt    | 6 +++---
+ test/CMakeLists.txt	     | 6 +++---
  3 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 794e89ed41d03997778fc4c59b7f1ba557b5e6b7
@@ -4223,7 +7417,7 @@ Date:	Mon May 21 20:18:42 2012 +0200
 
     Compile
 
- glib/CMakeLists.txt |	  2 ++
+ glib/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 78e6c9905a52c0cd4bfc1e56874f50689f04a1c6
@@ -4232,7 +7426,7 @@ Date:	Sun May 20 12:11:27 2012 +0200
 
     glib-demo: Make text characters list fill and expand in text demo
 
- glib/demo/text.c |    2 +-
+ glib/demo/text.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 610eb24426d9b36ac7da40a2fceb3dbeeec19a5c
@@ -4241,8 +7435,7 @@ Date:	Sun May 20 12:08:09 2012 +0200
 
     glib-demo: Add a button to remove annots from the annot view
 
- glib/demo/annots.c |	48
- +++++++++++++++++++++++++++++++++++++++++-------
+ glib/demo/annots.c | 48 +++++++++++++++++++++++++++++++++++++++++-------
  1 file changed, 41 insertions(+), 7 deletions(-)
 
 commit 11a3093e093319e88f14af0ab6c15009104d17ee
@@ -4253,9 +7446,9 @@ Date:	Sun May 20 11:22:49 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=40473
 
- glib/poppler-page.cc		     |	 19 +++++++++++++++++++
- glib/poppler-page.h		     |	  2 ++
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-page.cc		     | 19 +++++++++++++++++++
+ glib/poppler-page.h		     |	2 ++
+ glib/reference/poppler-sections.txt |	1 +
  3 files changed, 22 insertions(+)
 
 commit 0dd157ae7f19cd91ea425a607b968f08addc3a40
@@ -4271,8 +7464,8 @@ Date:	Sun May 20 10:37:47 2012 +0200
     added to
     a page doesn't leak the core annotation anymore.
 
- glib/poppler-annot.cc |   53
- ++++++++++++++++++++-----------------------------
+ glib/poppler-annot.cc | 53
+ +++++++++++++++++++++------------------------------
  1 file changed, 22 insertions(+), 31 deletions(-)
 
 commit f818b842f54d6860920b39778228e8b247b4e761
@@ -4281,7 +7474,7 @@ Date:	Sat May 19 12:32:33 2012 +0200
 
     glib-demo: Fix runtime warning
 
- glib/demo/selections.c |    2 +-
+ glib/demo/selections.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a24e326425e198eeb70c4d9205bb7a0a3a9db297
@@ -4290,28 +7483,28 @@ Date:	Sat May 19 12:09:45 2012 +0200
 
     gtk-tests: Port to GTK+ 3.0
 
- configure.ac		 |    4 +-
- glib/demo/annots.c	 |   74 ++++++-------
- glib/demo/attachments.c |    4 +-
- glib/demo/find.c	 |    4 +-
- glib/demo/fonts.c	 |    4 +-
- glib/demo/forms.c	 |   64 ++++++------
- glib/demo/images.c	 |   21 ++--
- glib/demo/info.cc	 |   67 ++++++------
- glib/demo/layers.c	 |   22 ++--
- glib/demo/links.c	 |    6 +-
- glib/demo/main.c	 |   31 ++----
- glib/demo/outline.c	 |    2 +-
- glib/demo/page.c	 |   23 ++---
- glib/demo/print.c	 |   14 +--
- glib/demo/render.c	 |  263
- +++++++++++++----------------------------------
- glib/demo/selections.c  |   77 ++++++--------
- glib/demo/text.c	 |   22 ++--
- glib/demo/transitions.c |    4 +-
- glib/demo/utils.c	 |  101 +++++++++---------
- glib/demo/utils.h	 |    6 +-
- test/gtk-test.cc	 |   48 +++++----
+ configure.ac		 |   4 +-
+ glib/demo/annots.c	 |  74 +++++++-------
+ glib/demo/attachments.c |   4 +-
+ glib/demo/find.c	 |   4 +-
+ glib/demo/fonts.c	 |   4 +-
+ glib/demo/forms.c	 |  64 ++++++------
+ glib/demo/images.c	 |  21 ++--
+ glib/demo/info.cc	 |  67 ++++++------
+ glib/demo/layers.c	 |  22 ++--
+ glib/demo/links.c	 |   6 +-
+ glib/demo/main.c	 |  31 ++----
+ glib/demo/outline.c	 |   2 +-
+ glib/demo/page.c	 |  23 ++---
+ glib/demo/print.c	 |  14 +--
+ glib/demo/render.c	 | 263
+ ++++++++++++++----------------------------------
+ glib/demo/selections.c  |  77 ++++++--------
+ glib/demo/text.c	 |  22 ++--
+ glib/demo/transitions.c |   4 +-
+ glib/demo/utils.c	 | 101 +++++++++----------
+ glib/demo/utils.h	 |   6 +-
+ test/gtk-test.cc	 |  48 +++++----
  21 files changed, 350 insertions(+), 511 deletions(-)
 
 commit 9f7d919e68a26bb7dd809986d8394fe20b750bd0
@@ -4320,7 +7513,7 @@ Date:	Thu May 17 19:54:47 2012 +0200
 
     Fix logic on SplashBitmap::writeImgFile
 
- splash/SplashBitmap.cc |    3 ++-
+ splash/SplashBitmap.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 87093d1250807f660042295747a012032f84c034
@@ -4329,7 +7522,7 @@ Date:	Thu May 17 19:54:47 2012 +0200
 
     Fix logic on SplashBitmap::writeImgFile
 
- splash/SplashBitmap.cc |    3 ++-
+ splash/SplashBitmap.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 7e7997e12faccf4c0513811b324a2fd0fa960a96
@@ -4340,9 +7533,9 @@ Date:	Tue May 15 23:16:27 2012 +0200
 
     Bug #49758
 
- utils/HtmlFonts.cc	|   24 ++++++++++++++++++------
- utils/HtmlFonts.h	|    3 ++-
- utils/HtmlOutputDev.cc |    4 +---
+ utils/HtmlFonts.cc	| 24 ++++++++++++++++++------
+ utils/HtmlFonts.h	|  3 ++-
+ utils/HtmlOutputDev.cc |  4 +---
  3 files changed, 21 insertions(+), 10 deletions(-)
 
 commit 3a249aa8ad5e9f7511bcafd0416ce51c7efe5f4d
@@ -4353,9 +7546,9 @@ Date:	Tue May 15 23:16:27 2012 +0200
 
     Bug #49758
 
- utils/HtmlFonts.cc	|   24 ++++++++++++++++++------
- utils/HtmlFonts.h	|    3 ++-
- utils/HtmlOutputDev.cc |    4 +---
+ utils/HtmlFonts.cc	| 24 ++++++++++++++++++------
+ utils/HtmlFonts.h	|  3 ++-
+ utils/HtmlOutputDev.cc |  4 +---
  3 files changed, 21 insertions(+), 10 deletions(-)
 
 commit ff2c251dbaef9b964af48f51ebb517626ac3145c
@@ -4364,7 +7557,7 @@ Date:	Sun May 13 20:13:32 2012 +0200
 
     glib-demo: Use poppler_document_new_from_gfile to load the given uri
 
- glib/demo/main.c |    9 ++-------
+ glib/demo/main.c | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 commit a7629331ab4ba5b256213af1f1b2954a49953c34
@@ -4373,10 +7566,10 @@ Date:	Sun May 13 20:13:03 2012 +0200
 
     glib: Add poppler_document_new_from_gfile
 
- glib/poppler-document.cc	     |	 46
- +++++++++++++++++++++++++++++++++++
- glib/poppler-document.h	     |	  4 +++
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-document.cc	     | 46
+ +++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h	     |	4 ++++
+ glib/reference/poppler-sections.txt |	1 +
  3 files changed, 51 insertions(+)
 
 commit 95277b1f481e274ab0ce22ffb44b40437bffa3c8
@@ -4386,7 +7579,7 @@ Date:	Sun May 13 20:11:12 2012 +0200
     glib Add missing cancellable param in poppler_document_new_from_stream
     doc
 
- glib/poppler-document.cc |    1 +
+ glib/poppler-document.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 329bb1e2b4f4b58832847bcf805d19ac0fd5ef02
@@ -4399,7 +7592,7 @@ Date:	Sun May 13 19:45:55 2012 +0200
     receive
     utf8 strings.
 
- glib/poppler-document.cc |   38 +++++++++++++++++++-------------------
+ glib/poppler-document.cc | 38 +++++++++++++++++++-------------------
  1 file changed, 19 insertions(+), 19 deletions(-)
 
 commit c4bf7b162028a2f9ffcd2baba2759bdb14fae51f
@@ -4412,8 +7605,7 @@ Date:	Sun May 13 19:45:55 2012 +0200
     receive
     utf8 strings.
 
- glib/poppler-document.cc |   43
- ++++++++++++++++++++-----------------------
+ glib/poppler-document.cc | 43 ++++++++++++++++++++-----------------------
  1 file changed, 20 insertions(+), 23 deletions(-)
 
 commit 7714b4e319c48ee915061a172208245ae7c4141b
@@ -4422,7 +7614,7 @@ Date:	Sun May 13 19:30:17 2012 +0200
 
     glib: Fix memory leak when document fails to load
 
- glib/poppler-document.cc |    3 +--
+ glib/poppler-document.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 4d0786a97e061a752686968bd7976bdda01b1f84
@@ -4431,7 +7623,7 @@ Date:	Sun May 13 19:30:17 2012 +0200
 
     glib: Fix memory leak when document fails to load
 
- glib/poppler-document.cc |    3 +--
+ glib/poppler-document.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 1d1c8175c57ebe6518f4252ab92a20286b7d4c6f
@@ -4445,19 +7637,19 @@ Date:	Sun May 13 18:41:25 2012 +0200
     those cases. A PopplerCachedFileLoader has been added to handle all
     other cases.
 
- configure.ac			     |	 10 +--
- glib/Makefile.am		     |	  4 +
- glib/poppler-cached-file-loader.cc  |	108 +++++++++++++++++++++++++++
- glib/poppler-cached-file-loader.h   |	 44 +++++++++++
- glib/poppler-document.cc	     |	 69 +++++++++++++++++
- glib/poppler-document.h	     |	  6 ++
- glib/poppler-input-stream.cc	     |	141
- +++++++++++++++++++++++++++++++++++
- glib/poppler-input-stream.h	     |	 74 ++++++++++++++++++
- glib/reference/poppler-docs.sgml    |	  4 +
- glib/reference/poppler-sections.txt |	  1 +
- poppler-glib-uninstalled.pc.in      |	  2 +-
- poppler-glib.pc.in		     |	  2 +-
+ configure.ac			     |	10 +--
+ glib/Makefile.am		     |	 4 +
+ glib/poppler-cached-file-loader.cc  | 108 +++++++++++++++++++++++++++
+ glib/poppler-cached-file-loader.h   |	44 +++++++++++
+ glib/poppler-document.cc	     |	69 ++++++++++++++++++
+ glib/poppler-document.h	     |	 6 ++
+ glib/poppler-input-stream.cc	     | 141
+ ++++++++++++++++++++++++++++++++++++
+ glib/poppler-input-stream.h	     |	74 +++++++++++++++++++
+ glib/reference/poppler-docs.sgml    |	 4 +
+ glib/reference/poppler-sections.txt |	 1 +
+ poppler-glib-uninstalled.pc.in      |	 2 +-
+ poppler-glib.pc.in		     |	 2 +-
  12 files changed, 458 insertions(+), 7 deletions(-)
 
 commit 13d2aa303eb1fd900f1045efec14af8002477b02
@@ -4468,13 +7660,13 @@ Date:	Sun May 13 17:25:15 2012 +0200
 
     Bug #13487
 
- poppler/Gfx.cc		    |	64
- +++++++++++++++++++++++++++++++++++++++++++-
- poppler/Gfx.h		    |	 4 ++-
- poppler/GfxState.cc	    |	 4 ++-
- poppler/OutputDev.h	    |	 1 +
- poppler/SplashOutputDev.cc |	11 ++++++++
- poppler/SplashOutputDev.h  |	 1 +
+ poppler/Gfx.cc		    | 64
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Gfx.h		    |  4 ++-
+ poppler/GfxState.cc	    |  4 ++-
+ poppler/OutputDev.h	    |  1 +
+ poppler/SplashOutputDev.cc | 11 ++++++++
+ poppler/SplashOutputDev.h  |  1 +
  6 files changed, 82 insertions(+), 3 deletions(-)
 
 commit b477443e8a4c52500529aaf3be76f01a61e85f28
@@ -4485,13 +7677,13 @@ Date:	Sun May 13 17:25:15 2012 +0200
 
     Bug #13487
 
- poppler/Gfx.cc		    |	64
- +++++++++++++++++++++++++++++++++++++++++++-
- poppler/Gfx.h		    |	 4 ++-
- poppler/GfxState.cc	    |	 4 ++-
- poppler/OutputDev.h	    |	 1 +
- poppler/SplashOutputDev.cc |	11 ++++++++
- poppler/SplashOutputDev.h  |	 1 +
+ poppler/Gfx.cc		    | 64
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Gfx.h		    |  4 ++-
+ poppler/GfxState.cc	    |  4 ++-
+ poppler/OutputDev.h	    |  1 +
+ poppler/SplashOutputDev.cc | 11 ++++++++
+ poppler/SplashOutputDev.h  |  1 +
  6 files changed, 82 insertions(+), 3 deletions(-)
 
 commit a76867003a7bff5ab03016156c75b4c928788d50
@@ -4502,7 +7694,7 @@ Date:	Sun May 13 13:10:40 2012 +0200
 
     Bug #49818
 
- Makefile.am |	  1 +
+ Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8f040dec2ce2eae24dd1eb15900d4d284e4b3848
@@ -4513,7 +7705,7 @@ Date:	Sun May 13 13:10:40 2012 +0200
 
     Bug #49818
 
- Makefile.am |	  1 +
+ Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 7f47630a7fc19214cd48dbd164ecf577ba35cc46
@@ -4522,7 +7714,7 @@ Date:	Thu May 10 23:12:04 2012 +0200
 
     Compile with the unsupported ENABLE_PLUGINS defined
 
- poppler/GlobalParams.cc |    2 +-
+ poppler/GlobalParams.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 22264cb230fc5902aea14ab43fa013a8ebdbf812
@@ -4533,10 +7725,10 @@ Date:	Thu May 10 23:04:33 2012 +0200
 
     Sorry :-/
 
- goo/gfile.cc		|   82
- ------------------------------------------------
- goo/gfile.h		|    4 ---
- poppler/GlobalParams.h |    2 +-
+ goo/gfile.cc		| 82
+ --------------------------------------------------
+ goo/gfile.h		|  4 ---
+ poppler/GlobalParams.h |  2 +-
  3 files changed, 1 insertion(+), 87 deletions(-)
 
 commit 44bf99a7b8683a077f2a5db50541099c109aa069
@@ -4552,13 +7744,13 @@ Date:	Thu May 10 22:59:18 2012 +0200
 
     Fixes bug 49448
 
- goo/gfile.cc		 |   46
+ goo/gfile.cc		 | 46
  ----------------------------------------------
- goo/gfile.h		 |    3 ---
- poppler/GfxState.cc	 |   16 ++--------------
- poppler/GlobalParams.cc |   21 ---------------------
- poppler/GlobalParams.h  |    3 ---
- test/perf-test.cc	 |    1 -
+ goo/gfile.h		 |  3 ---
+ poppler/GfxState.cc	 | 16 ++--------------
+ poppler/GlobalParams.cc | 21 ---------------------
+ poppler/GlobalParams.h  |  3 ---
+ test/perf-test.cc	 |  1 -
  6 files changed, 2 insertions(+), 88 deletions(-)
 
 commit bb091e38a1c0248ba24b0711b4afc0b0524cce10
@@ -4567,7 +7759,7 @@ Date:	Thu May 10 22:38:41 2012 +0200
 
     Make it be something closer to real english
 
- utils/pdftohtml.1 |	2 +-
+ utils/pdftohtml.1 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 67f3c3e0d03ec63df7c6028cbd626e384d231c2b
@@ -4577,10 +7769,10 @@ Date:	Wed May 9 16:48:15 2012 +0200
     GooString formatting: add support for uppercase hexadecimal + Use
     it in Annot::layoutText
 
- goo/GooString.cc |   61
- +++++++++++++++++++++++++++++++++++++++++++++---------
- goo/GooString.h  |   17 ++++++++-------
- poppler/Annot.cc |    2 +-
+ goo/GooString.cc | 61
+ ++++++++++++++++++++++++++++++++++++++++++++++----------
+ goo/GooString.h  | 17 ++++++++--------
+ poppler/Annot.cc |  2 +-
  3 files changed, 61 insertions(+), 19 deletions(-)
 
 commit 1f7f8a78409e6bcc90bd32ea2aaa75ed3a7b6218
@@ -4589,7 +7781,7 @@ Date:	Wed May 9 16:18:05 2012 +0200
 
     Use error() instead of fprintf(stderr, ...) in Annot::layoutText
 
- poppler/Annot.cc |    3 +--
+ poppler/Annot.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit a7a2e72f9ba43816a81278e0565d31807ac5ceb5
@@ -4598,9 +7790,9 @@ Date:	Thu May 10 22:31:24 2012 +0200
 
     More gs cleanup and forgot the (C) on modification
 
- goo/gfile.cc	    |	 2 +-
- goo/gfile.h	    |	 2 +-
- utils/pdftohtml.cc |	 4 ----
+ goo/gfile.cc	    | 2 +-
+ goo/gfile.h	    | 2 +-
+ utils/pdftohtml.cc | 4 ----
  3 files changed, 2 insertions(+), 6 deletions(-)
 
 commit ad36d22d1f11339be90403534b921cce120fdbad
@@ -4609,11 +7801,11 @@ Date:	Thu May 10 22:24:40 2012 +0200
 
     pdftohtml: Remove the option to invoke gs
 
- goo/gfile.cc	    |	 8 ---
- goo/gfile.h	    |	 3 --
- utils/pdftohtml.1  |	 8 +--
- utils/pdftohtml.cc |  149
- ++++++++++++----------------------------------------
+ goo/gfile.cc	    |	8 ---
+ goo/gfile.h	    |	3 --
+ utils/pdftohtml.1  |	8 +--
+ utils/pdftohtml.cc | 149
+ ++++++++++++-----------------------------------------
  4 files changed, 36 insertions(+), 132 deletions(-)
 
 commit 4114c928fa2560937e02319f57937f1c267a9817
@@ -4622,12 +7814,12 @@ Date:	Thu May 10 21:09:14 2012 +0200
 
     0.20.0
 
- CMakeLists.txt      |	  6 +++---
- NEWS		     |	 16 ++++++++++++++++
- configure.ac	     |	  4 ++--
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	6 +++---
+ NEWS		     | 16 ++++++++++++++++
+ configure.ac	     |	4 ++--
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 24 insertions(+), 8 deletions(-)
 
 commit df05d084cb26807c39695280cd8ea52d13aa1255
@@ -4638,9 +7830,9 @@ Date:	Thu May 10 20:54:13 2012 +0200
 
     For those evil people that keep using poppler internals
 
- poppler/Gfx.cc       |    8 ++++++++
- poppler/OutputDev.cc |    8 +++++++-
- poppler/OutputDev.h  |    4 +++-
+ poppler/Gfx.cc       | 8 ++++++++
+ poppler/OutputDev.cc | 8 +++++++-
+ poppler/OutputDev.h  | 4 +++-
  3 files changed, 18 insertions(+), 2 deletions(-)
 
 commit b6159fea4a13ecfd1c38b3a666a797c5147dd952
@@ -4649,7 +7841,7 @@ Date:	Thu May 10 20:02:19 2012 +0200
 
     splash uses cmykTransferC for M, Y and K in two places
 
- splash/Splash.cc |   14 +++++++-------
+ splash/Splash.cc | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit c2146219d555cab277906daefd2589f9056f536c
@@ -4658,7 +7850,7 @@ Date:	Thu May 10 13:26:18 2012 +0200
 
     Add missing function parameter
 
- poppler/GlobalParams.cc |    4 +++-
+ poppler/GlobalParams.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 753f6ab9347f972223ec21b7ed4b4f7ebed3d420
@@ -4667,10 +7859,10 @@ Date:	Thu May 3 15:29:57 2012 -0700
 
     Compile with ENABLE_PLUGINS defined
 
- poppler/SecurityHandler.cc |	 4 ++--
- poppler/SecurityHandler.h  |	16 ++++++++++++++++
- poppler/XpdfPluginAPI.cc   |	35 +----------------------------------
- poppler/XpdfPluginAPI.h    |	34 +++++++++++++++-------------------
+ poppler/SecurityHandler.cc |  4 ++--
+ poppler/SecurityHandler.h  | 16 ++++++++++++++++
+ poppler/XpdfPluginAPI.cc   | 35 +----------------------------------
+ poppler/XpdfPluginAPI.h    | 34 +++++++++++++++-------------------
  4 files changed, 34 insertions(+), 55 deletions(-)
 
 commit 23df93aaf495428b580bafd0fd1f41515828b08d
@@ -4681,7 +7873,7 @@ Date:	Thu May 3 14:50:09 2012 -0700
 
     remove wrong merge
 
- poppler/GlobalParams.cc |    1 -
+ poppler/GlobalParams.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit e55838b41959acc311e9b00dc390c9816a9afac2
@@ -4692,7 +7884,7 @@ Date:	Wed May 2 19:35:26 2012 +0200
 
     https://bugs.freedesktop.org/show_bug.cgi?id=48447
 
- glib/poppler-document.cc |    2 +-
+ glib/poppler-document.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dec873463b06bfe76ff48e36282877e6ac11b59d
@@ -4701,7 +7893,7 @@ Date:	Sun Apr 29 23:36:57 2012 +0200
 
     Add the objUint type
 
- poppler/Object.cc |	5 +++--
+ poppler/Object.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 50c0b294d08114920a5db711876e20d991f474a6
@@ -4713,7 +7905,7 @@ Date:	Sun Apr 29 22:33:09 2012 +0200
     Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael
     Coldwind
 
- poppler/Stream.cc |	3 +++
+ poppler/Stream.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 9e36206465289c96cb189c648a6f5121714c647b
@@ -4722,7 +7914,7 @@ Date:	Sun Apr 29 22:18:12 2012 +0200
 
     include for memcpy
 
- splash/SplashBitmap.cc |    3 ++-
+ splash/SplashBitmap.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 931051fe0bb445545355027d999515bc3d4b32ef
@@ -4734,7 +7926,7 @@ Date:	Sun Apr 29 22:07:34 2012 +0200
     Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael
     Coldwind
 
- poppler/Stream.cc |   10 ++++++----
+ poppler/Stream.cc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 53b9c2e2806320d0d0e35134b75da5da72514742
@@ -4746,7 +7938,7 @@ Date:	Sun Apr 29 22:00:18 2012 +0200
     Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael
     Coldwind
 
- poppler/Link.cc |   17 ++++++++++-------
+ poppler/Link.cc | 17 ++++++++++-------
  1 file changed, 10 insertions(+), 7 deletions(-)
 
 commit da8d858c4fc610718a5f14b14dc3a4a11564a73d
@@ -4758,7 +7950,7 @@ Date:	Sun Apr 29 20:28:37 2012 +0200
     Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael
     Coldwind
 
- poppler/Gfx.cc |   10 ++++++----
+ poppler/Gfx.cc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 934b1a7cd502fe5537a350cdfc650989992693f7
@@ -4769,7 +7961,7 @@ Date:	Sun Apr 29 19:59:15 2012 +0200
 
     Found by Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 
- poppler/GfxState.cc |	 13 ++++++++++---
+ poppler/GfxState.cc | 13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
 
 commit e80fd082914fe29fad7e60c321a747eb8634e413
@@ -4778,7 +7970,7 @@ Date:	Sun Apr 29 18:27:41 2012 +0200
 
     [qt4] the qualified name may be unicode encoded
 
- qt4/src/poppler-form.cc |    4 ++--
+ qt4/src/poppler-form.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 251be1787a2a003862691f5a825eb3468eceb6a2
@@ -4790,8 +7982,8 @@ Date:	Sun Apr 29 18:26:42 2012 +0200
     Based on a patch from Mark Riedesel.
     Bug #49256
 
- poppler/Form.cc |   71
- +++++++++++++++++++++++++++++++++++++++++++++++--------
+ poppler/Form.cc | 71
+ +++++++++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 61 insertions(+), 10 deletions(-)
 
 commit be41f1c7905d695d17e19ced83a1018531d00199
@@ -4802,11 +7994,11 @@ Date:	Sun Apr 29 16:02:45 2012 +0200
 
     Bug #12185
 
- poppler/SplashOutputDev.cc |	31 ++++++++++++++++++++++++++++---
- splash/Splash.cc	    |	21 ++++++++++++++++++---
- splash/Splash.h	    |	 6 ++++--
- splash/SplashBitmap.cc     |	22 +++++++++++++++++++++-
- splash/SplashBitmap.h	    |	 2 ++
+ poppler/SplashOutputDev.cc | 31 ++++++++++++++++++++++++++++---
+ splash/Splash.cc	    | 21 ++++++++++++++++++---
+ splash/Splash.h	    |  6 ++++--
+ splash/SplashBitmap.cc     | 22 +++++++++++++++++++++-
+ splash/SplashBitmap.h	    |  2 ++
  5 files changed, 73 insertions(+), 9 deletions(-)
 
 commit 800cb9ec7189a539d64b99fa181cd4126496c1ec
@@ -4817,7 +8009,7 @@ Date:	Sat Apr 28 17:15:30 2012 +0200
 
     Bug #40719
 
- poppler/XRef.cc |    2 +-
+ poppler/XRef.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 410822d7013ce1f61325afdb61d75ea64666755e
@@ -4826,12 +8018,12 @@ Date:	Fri Apr 27 01:10:22 2012 +0200
 
     0.19.4
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 17 +++++++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 17 +++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 23 insertions(+), 6 deletions(-)
 
 commit b1d5c6c0a20a4a24b42de66db23e0f63d10ca52d
@@ -4841,10 +8033,10 @@ Date:	Tue Apr 24 21:00:11 2012 +0200
     Output XRef stream when incrementally updating if there's already
     a XRef stream
 
- poppler/PDFDoc.cc |   45 +++++++++++++++++++++++++++++--
- poppler/XRef.cc   |   76
- +++++++++++++++++++++++++++++++++++++++++++++--------
- poppler/XRef.h    |   34 ++++++++++++++++++++++++
+ poppler/PDFDoc.cc | 45 ++++++++++++++++++++++++++++++--
+ poppler/XRef.cc   | 76
+ +++++++++++++++++++++++++++++++++++++++++++++++--------
+ poppler/XRef.h    | 34 +++++++++++++++++++++++++
  3 files changed, 142 insertions(+), 13 deletions(-)
 
 commit 2ecf3b2e49a4c35e995d25016b810592260edfeb
@@ -4861,12 +8053,12 @@ Date:	Tue Apr 24 18:10:15 2012 +0200
      the XRef
        table too (previously it was demanded to the caller)
 
- poppler/PDFDoc.cc |   61
- ++++++++++++++++++++++++++---------------------------
- poppler/PDFDoc.h  |   14 +++++++++---
- poppler/XRef.cc   |	2 +-
- poppler/XRef.h    |	2 +-
- utils/pdfunite.cc |   10 +++++----
+ poppler/PDFDoc.cc | 61
+ +++++++++++++++++++++++++++----------------------------
+ poppler/PDFDoc.h  | 14 ++++++++++---
+ poppler/XRef.cc   |  2 +-
+ poppler/XRef.h    |  2 +-
+ utils/pdfunite.cc | 10 +++++----
  5 files changed, 49 insertions(+), 40 deletions(-)
 
 commit cf7a20adbd15f901d414ce06825459c33eeef3f5
@@ -4878,15 +8070,15 @@ Date:	Wed Apr 25 18:51:23 2012 +0200
 
     Makes it around 8 times faster
 
- poppler/CairoOutputDev.cc  |	 6 +++---
- poppler/CairoOutputDev.h   |	 6 +++---
- poppler/Gfx.cc		    |	 4 ++--
- poppler/OutputDev.cc	    |	 5 +++--
- poppler/OutputDev.h	    |	 6 +++---
- poppler/PSOutputDev.cc     |	 4 ++--
- poppler/PSOutputDev.h	    |	 4 ++--
- poppler/SplashOutputDev.cc |	35 +++++++++++------------------------
- poppler/SplashOutputDev.h  |	 4 ++--
+ poppler/CairoOutputDev.cc  |  6 +++---
+ poppler/CairoOutputDev.h   |  6 +++---
+ poppler/Gfx.cc		    |  4 ++--
+ poppler/OutputDev.cc	    |  5 +++--
+ poppler/OutputDev.h	    |  6 +++---
+ poppler/PSOutputDev.cc     |  4 ++--
+ poppler/PSOutputDev.h	    |  4 ++--
+ poppler/SplashOutputDev.cc | 35 +++++++++++------------------------
+ poppler/SplashOutputDev.h  |  4 ++--
  9 files changed, 31 insertions(+), 43 deletions(-)
 
 commit 26fd142a3608283fd41e07b54067a51a9db76e93
@@ -4895,7 +8087,7 @@ Date:	Sat Apr 21 18:16:46 2012 +0200
 
     Preserve z-index after annotation removal
 
- poppler/Annot.cc |    5 +++--
+ poppler/Annot.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 7b10014c1fe9ef1cba57fd6b01c63129ac31386a
@@ -4904,9 +8096,9 @@ Date:	Sat Apr 21 17:53:22 2012 +0200
 
     Do not remove appearance stream if it's shared with other annotations
 
- poppler/Annot.cc |   78
- +++++++++++++++++++++++++++++++++++++++++++++++++++---
- poppler/Annot.h  |    6 +++++
+ poppler/Annot.cc | 78
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ poppler/Annot.h  |  6 +++++
  2 files changed, 80 insertions(+), 4 deletions(-)
 
 commit 7684c325929493ad9de01a891de0aef197e176dd
@@ -4916,7 +8108,7 @@ Date:	Sat Apr 21 20:26:49 2012 +0200
     AnnotText: Always force 24x24 size with custom stamps, not only on
     first rendering
 
- poppler/Annot.cc |   21 ++++++++++++---------
+ poppler/Annot.cc | 21 ++++++++++++---------
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 commit 44cd46a6e04a87bd702dab4a662042f69f16c4ad
@@ -4927,7 +8119,7 @@ Date:	Mon Apr 23 20:02:55 2012 +0200
 
     Found by Mateusz "j00ru" Jurczyk and Gynvael Coldwind
 
- poppler/GfxState.cc |	 20 +++++++++++++++++++-
+ poppler/GfxState.cc | 20 +++++++++++++++++++-
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 commit a92f87b83e3c6c9078508c644aa09f4f2b14e9cc
@@ -4938,7 +8130,7 @@ Date:	Mon Apr 23 00:06:18 2012 +0200
 
     Since we are actually looking for non existing entries :D
 
- poppler/XRef.cc |    2 +-
+ poppler/XRef.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 114e113e3278d02baaffd6c0da7fda266283c176
@@ -4947,7 +8139,7 @@ Date:	Sat Apr 21 21:08:55 2012 +0200
 
     Do not allocate XRef entries whose generation number is 65535
 
- poppler/XRef.cc |    5 ++++-
+ poppler/XRef.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit ad8785b053aa115b593b2f20073e2989d59a77c9
@@ -4956,7 +8148,7 @@ Date:	Wed Apr 18 22:51:33 2012 +0200
 
     Remove duplicate call
 
- utils/pdftohtml.cc |	 1 -
+ utils/pdftohtml.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 80d4e1843c56801508f476fed64ecb3201ba18c8
@@ -4965,7 +8157,7 @@ Date:	Tue Apr 17 20:25:57 2012 +0200
 
     Do not draw border in AnnotText::draw
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a1e3d868ccd7fb84d52d94754d8681c97119fb6e
@@ -4974,7 +8166,7 @@ Date:	Fri Mar 30 21:52:04 2012 +0200
 
     Save/restore gfx state when drawing annot border
 
- poppler/Gfx.cc |    3 +++
+ poppler/Gfx.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 7fbeaac5c0d0240564add6c252c1ba7c14639d98
@@ -4983,7 +8175,7 @@ Date:	Tue Apr 17 20:36:51 2012 +0200
 
     Be sure we are checking a non free entry
 
- poppler/XRef.cc |    2 +-
+ poppler/XRef.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d1254c7e8e995302542093968a0c2967f3c0b5ff
@@ -4996,8 +8188,8 @@ Date:	Tue Apr 17 20:36:03 2012 +0200
     pos belongs so no need to cry if the entry is not there
     Bug 48679
 
- poppler/XRef.cc |   10 ++++++----
- poppler/XRef.h  |    2 +-
+ poppler/XRef.cc | 10 ++++++----
+ poppler/XRef.h  |  2 +-
  2 files changed, 7 insertions(+), 5 deletions(-)
 
 commit bcbe9497a4fa50b41852abd538ad139c7b6693e5
@@ -5010,7 +8202,7 @@ Date:	Tue Apr 17 20:21:58 2012 +0200
     TiffWriter.h,
     CFLAGS to include libpng, libjpeg and libtiff headers are expected.
 
- cpp/Makefile.am |   22 +++++++++++++++++++++-
+ cpp/Makefile.am | 22 +++++++++++++++++++++-
  1 file changed, 21 insertions(+), 1 deletion(-)
 
 commit 44c9df8277877ee1021317a3b6c253f80310f826
@@ -5059,7 +8251,7 @@ Date:	Tue Apr 17 20:21:00 2012 +0200
     environmental
     values.
 
- configure.ac |    5 +++--
+ configure.ac | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 9e0f0368e543df46b40cbd7bed6fdc1abf846e7d
@@ -5082,7 +8274,7 @@ Date:	Tue Apr 17 20:19:41 2012 +0200
     is unavailable. I propose a patch NOT to "-ansi" flag, if CXXFLAGS
     includes "-std=XXX" already.
 
- configure.ac |    8 +++++++-
+ configure.ac | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 2f1e7ef252b8d1f7ee6004825c2926f0f5e181a5
@@ -5095,7 +8287,7 @@ Date:	Thu Apr 12 23:11:41 2012 +0200
     bounds anymore
     Crash found by Joel Voss of Leviathan Security Group
 
- poppler/XRef.cc |   11 +++++++++++
+ poppler/XRef.cc | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 19fb9caecb1b265a8b8651e9bcf4b779f593fefd
@@ -5106,7 +8298,7 @@ Date:	Thu Apr 12 22:24:50 2012 +0200
 
     Issue found by Joel Voss of Leviathan Security Group
 
- utils/HtmlOutputDev.cc |   18 ++++++++++--------
+ utils/HtmlOutputDev.cc | 18 ++++++++++--------
  1 file changed, 10 insertions(+), 8 deletions(-)
 
 commit fa4848eae370437ab1b9863124e9a340830f66c7
@@ -5115,7 +8307,7 @@ Date:	Fri Apr 13 22:11:01 2012 +0930
 
     man pages: add missing section heading
 
- utils/pdftotext.1 |	1 +
+ utils/pdftotext.1 | 1 +
  1 file changed, 1 insertion(+)
 
 commit 08a14aa37b177bb4586869857ae678cb4bcd4039
@@ -5124,14 +8316,14 @@ Date:	Thu Apr 12 21:52:30 2012 +0200
 
     0.19.3
 
- CMakeLists.txt		|    4 ++--
- NEWS			|   26 +++++++++++++++++++++++++-
- configure.ac		|    2 +-
- cpp/Doxyfile		|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Doxyfile	|    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		|  4 ++--
+ NEWS			| 26 +++++++++++++++++++++++++-
+ configure.ac		|  2 +-
+ cpp/Doxyfile		|  2 +-
+ poppler/Makefile.am	|  2 +-
+ qt4/src/CMakeLists.txt |  2 +-
+ qt4/src/Doxyfile	|  2 +-
+ qt4/src/Makefile.am	|  2 +-
  8 files changed, 33 insertions(+), 9 deletions(-)
 
 commit 52227b59d1fa2a2029bfff2f8a167efd81faebbb
@@ -5140,7 +8332,7 @@ Date:	Thu Apr 12 20:52:55 2012 +0200
 
     Update (C)
 
- poppler/CairoFontEngine.cc |	 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 40cb3f27f4dcad4fe8c48f0b638eac7913fc3722
@@ -5149,9 +8341,9 @@ Date:	Thu Apr 12 20:50:38 2012 +0200
 
     Do not pass those params to createGfx since they aren't used
 
- glib/poppler-page.cc |    4 ++--
- poppler/Page.cc      |    9 +++------
- poppler/Page.h       |    5 ++---
+ glib/poppler-page.cc | 4 ++--
+ poppler/Page.cc      | 9 +++------
+ poppler/Page.h       | 5 ++---
  3 files changed, 7 insertions(+), 11 deletions(-)
 
 commit 9a10d31fca7f060f24bae9efe15662f02a9684ca
@@ -5160,10 +8352,10 @@ Date:	Thu Apr 12 20:31:23 2012 +0200
 
     qt4: Remove unimplemented revision setters from public API
 
- qt4/src/poppler-annotation-private.h |    2 ++
- qt4/src/poppler-annotation.cc	      |   62
- ++++++++--------------------------
- qt4/src/poppler-annotation.h	      |   13 -------
+ qt4/src/poppler-annotation-private.h |  2 ++
+ qt4/src/poppler-annotation.cc	      | 62
+ ++++++++----------------------------
+ qt4/src/poppler-annotation.h	      | 13 --------
  3 files changed, 16 insertions(+), 61 deletions(-)
 
 commit 0531329aeb8783c48f056929e6e81cebda33500f
@@ -5172,7 +8364,7 @@ Date:	Thu Apr 12 20:07:13 2012 +0200
 
     [qt4] Mark the dummy stuff as deprecated
 
- qt4/src/poppler-annotation.h |    4 ++--
+ qt4/src/poppler-annotation.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 67b7b2bdd0943680437d96349c3415aa40082cbb
@@ -5181,7 +8373,7 @@ Date:	Thu Apr 12 20:06:52 2012 +0200
 
     [qt4] initialize the dummy members here too
 
- qt4/src/poppler-annotation.cc |    4 +++-
+ qt4/src/poppler-annotation.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit bf171382afb6b50284c3855e3a1815a15ec34366
@@ -5190,7 +8382,7 @@ Date:	Thu Apr 12 19:24:42 2012 +0200
 
     Add since markers
 
- qt4/src/poppler-annotation.h |    7 ++++---
+ qt4/src/poppler-annotation.h | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit e36fd775394ee752c0f62f789359c72b52094975
@@ -5199,7 +8391,7 @@ Date:	Thu Apr 12 18:58:29 2012 +0200
 
     Remove unneeded forward declaration
 
- qt4/src/poppler-qt4.h |    3 +--
+ qt4/src/poppler-qt4.h | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit c1aa4a8c0aa9d46757e3849776acac42731e02d1
@@ -5211,7 +8403,7 @@ Date:	Thu Apr 12 00:39:33 2012 +0200
     Call Annot::invalidateAppearance every time the visual aspect
     is changed
 
- qt4/src/poppler-annotation.cc |   34 ++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.cc | 34 ++++++++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
 
 commit 4338ae354c66e4df8d7d70a156517e27b3b80539
@@ -5220,8 +8412,8 @@ Date:	Sun Mar 25 22:58:33 2012 +0200
 
     qt4: Added HideAnnotations option to PSConverter
 
- qt4/src/poppler-ps-converter.cc |   23 ++++++++++++++++++++++-
- qt4/src/poppler-qt4.h		 |    3 ++-
+ qt4/src/poppler-ps-converter.cc | 23 ++++++++++++++++++++++-
+ qt4/src/poppler-qt4.h		 |  3 ++-
  2 files changed, 24 insertions(+), 2 deletions(-)
 
 commit e50993b3b47a759c93ccdeeaef289d6985b05bb1
@@ -5231,7 +8423,7 @@ Date:	Thu Mar 22 19:58:12 2012 +0100
     qt4: DOM annotation store - Black color is different than invalid
     color
 
- qt4/src/poppler-annotation.cc |    2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4739a6a02097f110c37defdfa616351459902806
@@ -5240,10 +8432,10 @@ Date:	Mon Mar 19 19:17:33 2012 +0100
 
     qt4: Annotation removal
 
- qt4/src/poppler-annotation-private.h |    3 +++
- qt4/src/poppler-annotation.cc	      |   29 +++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc	      |    5 +++++
- qt4/src/poppler-qt4.h		      |    8 ++++++++
+ qt4/src/poppler-annotation-private.h |  3 +++
+ qt4/src/poppler-annotation.cc	      | 29 +++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc	      |  5 +++++
+ qt4/src/poppler-qt4.h		      |  8 ++++++++
  4 files changed, 45 insertions(+)
 
 commit 25a64d69aaab61c8cf944107e649e19920244a2b
@@ -5254,8 +8446,8 @@ Date:	Tue Mar 20 01:46:07 2012 +0100
 
     Also makes inplaceText a synoym for contents
 
- qt4/src/poppler-annotation.cc |  159
- ++++++++++++++++++++++++++++++++---------
+ qt4/src/poppler-annotation.cc | 159
+ ++++++++++++++++++++++++++++++++----------
  1 file changed, 124 insertions(+), 35 deletions(-)
 
 commit a31a8118ba07aa7f90c69130476fb7d86f8614ad
@@ -5264,9 +8456,9 @@ Date:	Sun Mar 11 23:57:51 2012 +0100
 
     qt4: GeomAnnotation, InkAnnotation and CaretAnnotation write support
 
- qt4/src/poppler-annotation.cc |  103
- +++++++++++++++++++++++++++++++++++++----
- qt4/src/poppler-annotation.h  |    6 +--
+ qt4/src/poppler-annotation.cc | 103
+ ++++++++++++++++++++++++++++++++++++++----
+ qt4/src/poppler-annotation.h  |   6 +--
  2 files changed, 96 insertions(+), 13 deletions(-)
 
 commit e4052b52002447772e24571fd13f0f22fd2bfb16
@@ -5275,9 +8467,9 @@ Date:	Sat Mar 10 17:48:56 2012 +0100
 
     qt4: HighlightAnnotation and StampAnnotation write support
 
- qt4/src/poppler-annotation.cc |   96
- ++++++++++++++++++++++++++++++++++++++---
- qt4/src/poppler-annotation.h  |    4 +-
+ qt4/src/poppler-annotation.cc | 96
+ +++++++++++++++++++++++++++++++++++++++----
+ qt4/src/poppler-annotation.h  |  4 +-
  2 files changed, 91 insertions(+), 9 deletions(-)
 
 commit b5e948b6130cdb04387a8244179337c7904dcd03
@@ -5292,12 +8484,12 @@ Date:	Wed Mar 14 17:44:50 2012 +0100
     for other
     types will be added in the next patches.
 
- qt4/src/poppler-annotation-private.h |   12 ++
- qt4/src/poppler-annotation.cc	      |  297
- ++++++++++++++++++++++++++++++++--
- qt4/src/poppler-annotation.h	      |    4 +-
- qt4/src/poppler-page.cc	      |    5 +
- qt4/src/poppler-qt4.h		      |    9 ++
+ qt4/src/poppler-annotation-private.h |  12 ++
+ qt4/src/poppler-annotation.cc	      | 297
+ +++++++++++++++++++++++++++++++++--
+ qt4/src/poppler-annotation.h	      |   4 +-
+ qt4/src/poppler-page.cc	      |   5 +
+ qt4/src/poppler-qt4.h		      |   9 ++
  5 files changed, 316 insertions(+), 11 deletions(-)
 
 commit 20b4feec612448be8a800173ddadbf257657477e
@@ -5306,10 +8498,10 @@ Date:	Fri Mar 9 19:31:16 2012 +0100
 
     qt4: Basic setters to edit annotations
 
- qt4/src/poppler-annotation-helper.h  |   15 ++++
- qt4/src/poppler-annotation-private.h |    1 +
- qt4/src/poppler-annotation.cc	      |  128
- +++++++++++++++++++++++++++++++---
+ qt4/src/poppler-annotation-helper.h  |  15 ++++
+ qt4/src/poppler-annotation-private.h |   1 +
+ qt4/src/poppler-annotation.cc	      | 128
+ ++++++++++++++++++++++++++++++++---
  3 files changed, 135 insertions(+), 9 deletions(-)
 
 commit 0e8c35b59f0fba926b30c9a87823c92ae03bf116
@@ -5423,8 +8615,8 @@ Date:	Tue Apr 10 00:08:49 2012 +0930
 
     Bug 48468
 
- poppler/CairoOutputDev.cc |   15 ++++++---------
- poppler/CairoOutputDev.h  |	4 ++--
+ poppler/CairoOutputDev.cc | 15 ++++++---------
+ poppler/CairoOutputDev.h  |  4 ++--
  2 files changed, 8 insertions(+), 11 deletions(-)
 
 commit 5ea305c3924cead302092378ab67300c3099afd9
@@ -5435,9 +8627,9 @@ Date:	Sun Apr 8 23:11:30 2012 +0930
 
     Bug 48318
 
- poppler/CairoOutputDev.cc |   80
- ++++++++++++++++++++++++++++++++++-----------
- poppler/CairoOutputDev.h  |	2 +-
+ poppler/CairoOutputDev.cc | 80
+ ++++++++++++++++++++++++++++++++++++-----------
+ poppler/CairoOutputDev.h  |  2 +-
  2 files changed, 62 insertions(+), 20 deletions(-)
 
 commit 8414d8f621b8abb018e80f2255cfb511a1e558d4
@@ -5450,8 +8642,7 @@ Date:	Mon Apr 9 12:08:20 2012 +0930
     setting. Rearrange the code so the code path for stroke_adjust == TRUE
     is performed first (this will also set 0 width lines to 1 pixel wide).
 
- poppler/CairoOutputDev.cc |   42
- +++++++++++++++++++++---------------------
+ poppler/CairoOutputDev.cc | 42 +++++++++++++++++++++---------------------
  1 file changed, 21 insertions(+), 21 deletions(-)
 
 commit af1a84eb90656de68bb14f2c4ae4f813c51bc3a3
@@ -5463,7 +8654,7 @@ Date:	Mon Apr 9 17:17:29 2012 +0930
 
     Bug 48453
 
- poppler/CairoOutputDev.cc |	8 +++++++-
+ poppler/CairoOutputDev.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 46b3a70cae3b37cb4270a83afaddd6734442b752
@@ -5472,9 +8663,9 @@ Date:	Mon Apr 9 19:32:24 2012 +0200
 
     Caption text rendering in AnnotLine
 
- poppler/Annot.cc |  262
- +++++++++++++++++++++++++++++++++++++-----------------
- poppler/Annot.h  |    2 +
+ poppler/Annot.cc | 262
+ ++++++++++++++++++++++++++++++++++++++-----------------
+ poppler/Annot.h  |   2 +
  2 files changed, 183 insertions(+), 81 deletions(-)
 
 commit 855607828447ecec2c8444650d015e21bd17d2e2
@@ -5484,9 +8675,9 @@ Date:	Mon Apr 9 16:45:50 2012 +0200
     AnnotFreeText rendering improvements (auto word-wrap, quadding,
     border style, font/border color)
 
- poppler/Annot.cc |  146
- ++++++++++++++++++++++++++++++++++++++++++------------
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 146
+ +++++++++++++++++++++++++++++++++++++++++++------------
+ poppler/Annot.h  |   1 +
  2 files changed, 115 insertions(+), 32 deletions(-)
 
 commit 80f662162698c1ec27771d9cf5e2e6bc3d21c4df
@@ -5495,7 +8686,7 @@ Date:	Thu Apr 12 00:19:26 2012 +0200
 
     Fix the mask inversion
 
- utils/HtmlOutputDev.cc |    2 +-
+ utils/HtmlOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 06591d848e53598973f7d5fddac50785a46e8027
@@ -5515,8 +8706,8 @@ Date:	Wed Apr 11 23:49:29 2012 +0200
     routine.
     ******
 
- poppler/SplashOutputDev.cc |	 9 +++++++++
- splash/Splash.cc	    |	 2 +-
+ poppler/SplashOutputDev.cc | 9 +++++++++
+ splash/Splash.cc	    | 2 +-
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 1f45afde6410f03c79fcf4b66d5834079879d38f
@@ -5525,8 +8716,8 @@ Date:	Mon Apr 9 19:17:41 2012 +0200
 
     Add producer and version to xml output
 
- utils/HtmlOutputDev.cc |    2 +-
- utils/pdf2xml.dtd	|    4 ++++
+ utils/HtmlOutputDev.cc | 2 +-
+ utils/pdf2xml.dtd	| 4 ++++
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit cef6ac0ebbf8451beaadb3ddb6c991bbb7239432
@@ -5535,7 +8726,7 @@ Date:	Sun Apr 8 23:15:15 2012 +0200
 
     FIX: Do not append a NUL character to Unicode page labels
 
- poppler/PageLabelInfo.cc |    3 +--
+ poppler/PageLabelInfo.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 3d4985f14e54ddcc64ea654b23e931b7e6acfbdc
@@ -5544,7 +8735,7 @@ Date:	Sat Apr 7 11:28:36 2012 +0200
 
     Do not trust the rect of AnnotTextMarkup when drawing
 
- poppler/Annot.cc |   43 +++++++++++++++++++++++++++++--------------
+ poppler/Annot.cc | 43 +++++++++++++++++++++++++++++--------------
  1 file changed, 29 insertions(+), 14 deletions(-)
 
 commit c6296cd8c1ca398beac20f1e88c87b9082386247
@@ -5554,9 +8745,9 @@ Date:	Sat Apr 7 00:30:54 2012 +0200
     Do not trust the rect of AnnotLine, AnnotPolygon and AnnotInk
     when drawing
 
- poppler/Annot.cc |  126
- +++++++++++++++++++++++++++++++++++++++++++-----------
- poppler/Annot.h  |   27 ++++++++++++
+ poppler/Annot.cc | 126
+ ++++++++++++++++++++++++++++++++++++++++++++-----------
+ poppler/Annot.h  |  27 ++++++++++++
  2 files changed, 128 insertions(+), 25 deletions(-)
 
 commit 503620ae74d719da52e3374725e490c62f7be7a3
@@ -5581,11 +8772,11 @@ Date:	Thu Mar 29 19:07:05 2012 +0200
     ownership, in
     fact the returned object is destroyed by ~Page.
 
- poppler/Annot.cc	|   28 ++++++++++++++++++++++++++++
- poppler/Annot.h	|    5 +++--
- poppler/FontInfo.cc	|   11 ++++-------
- poppler/PSOutputDev.cc |   12 +++---------
- poppler/Page.h		|    2 +-
+ poppler/Annot.cc	| 28 ++++++++++++++++++++++++++++
+ poppler/Annot.h	|  5 +++--
+ poppler/FontInfo.cc	| 11 ++++-------
+ poppler/PSOutputDev.cc | 12 +++---------
+ poppler/Page.h		|  2 +-
  5 files changed, 39 insertions(+), 19 deletions(-)
 
 commit 2733504890333b0925d95e01310726d11fed44d8
@@ -5598,9 +8789,9 @@ Date:	Fri Mar 23 20:54:58 2012 +0100
     This patch also moves layoutText and writeString from AnnotWidget
     to Annot
 
- poppler/Annot.cc |  137
- +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h  |   11 +++--
+ poppler/Annot.cc | 137
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h  |  11 +++--
  2 files changed, 142 insertions(+), 6 deletions(-)
 
 commit 3023a59c0a1a5974b232f6f8cb629eabb6797616
@@ -5613,8 +8804,8 @@ Date:	Sun Mar 25 22:04:11 2012 +0200
     2) Implementation of typeSquiggly
     3) FIX: Form creation is common to all markup types
 
- poppler/Annot.cc |   92
- +++++++++++++++++++++++++++++++++---------------------
+ poppler/Annot.cc | 92
+ ++++++++++++++++++++++++++++++++++----------------------
  1 file changed, 56 insertions(+), 36 deletions(-)
 
 commit 8927ddc448edc016043107e88e3bc3b2b8b03269
@@ -5623,8 +8814,7 @@ Date:	Thu Mar 22 17:33:01 2012 +0100
 
     Improvements to AnnotLine::draw
 
- poppler/Annot.cc |   50
- ++++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/Annot.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 46 insertions(+), 4 deletions(-)
 
 commit bd7a40fd0312c753d1871558b566376304f1ff35
@@ -5633,9 +8823,9 @@ Date:	Wed Mar 21 22:48:05 2012 +0100
 
     AnnotInk rendering
 
- poppler/Annot.cc |   62
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 ++
+ poppler/Annot.cc | 62
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  2 ++
  2 files changed, 64 insertions(+)
 
 commit 6a8794abe639db8284db079e028cbcd66e138884
@@ -5644,9 +8834,9 @@ Date:	Wed Mar 21 22:33:13 2012 +0100
 
     AnnotPolygon rendering
 
- poppler/Annot.cc |   87
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 ++
+ poppler/Annot.cc | 87
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  2 ++
  2 files changed, 89 insertions(+)
 
 commit f389c50458079f24164b1c12b1151c8617485acb
@@ -5657,7 +8847,7 @@ Date:	Wed Mar 21 21:12:59 2012 +0100
 
     Previously it was filled with black.
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c63cc22dd82f827305ad57f241ad49998f2a1c23
@@ -5666,7 +8856,7 @@ Date:	Sun Apr 8 12:28:17 2012 +0200
 
     Remove extra copy() (memleak)
 
- poppler/GlobalParams.cc |    3 +--
+ poppler/GlobalParams.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit ed0c9640abcbea459e3a276ee0b27631b01c32c4
@@ -5679,7 +8869,7 @@ Date:	Sun Apr 8 12:24:20 2012 +0200
     https://ritdml.rit.edu/bitstream/handle/1850/11220/TYehThesis1992.pdf?sequence=1
     even though the page is still unrendered
 
- poppler/JBIG2Stream.cc |    9 +++++++--
+ poppler/JBIG2Stream.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit f1e621adbbb74ec709022b2a31195331651c83fa
@@ -5692,7 +8882,7 @@ Date:	Sun Apr 8 19:42:05 2012 +0930
 
     Bug 48399
 
- poppler/CairoFontEngine.cc |	24 ++++++++++++++++++++++++
+ poppler/CairoFontEngine.cc | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit f5b708c3e04ba50756cd9f9530cf82f547443ce9
@@ -5703,8 +8893,8 @@ Date:	Fri Apr 6 15:22:36 2012 +0200
 
     Bug 48046
 
- poppler/GlobalParamsWin.cc |  224
- +++++++++++++++++++++++++-------------------
+ poppler/GlobalParamsWin.cc | 224
+ ++++++++++++++++++++++++++-------------------
  1 file changed, 128 insertions(+), 96 deletions(-)
 
 commit 4e940b14a6fddde9a1714976ff8045e26cbf7d40
@@ -5713,7 +8903,7 @@ Date:	Mon Apr 2 20:03:11 2012 +0930
 
     cairo: fix regression caused by mesh gradients
 
- poppler/CairoOutputDev.cc |	6 ++++--
+ poppler/CairoOutputDev.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 74a7d963de75c0097eedcf4224d13cf275a64757
@@ -5722,7 +8912,7 @@ Date:	Sun Apr 1 19:35:48 2012 +0200
 
     regtest: remove debug print to show bisect exit status in Bisect.py
 
- regtest/Bisect.py |	1 -
+ regtest/Bisect.py | 1 -
  1 file changed, 1 deletion(-)
 
 commit 2749db77eb8ccdbc4b0771163c8942f882f259f4
@@ -5731,7 +8921,7 @@ Date:	Sun Apr 1 19:20:37 2012 +0200
 
     regtest: Fix crash when creating HTML report for a single test
 
- regtest/commands/create-report.py |	5 +----
+ regtest/commands/create-report.py | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 1c8e1bb637347d0d31945f9d265b29e7b49396e2
@@ -5741,7 +8931,7 @@ Date:	Sun Apr 1 19:11:57 2012 +0200
     regtest: Don't show results for crashed or failed to run tests in
     HTML report
 
- regtest/HTMLReport.py |    2 ++
+ regtest/HTMLReport.py | 2 ++
  1 file changed, 2 insertions(+)
 
 commit a5f4936dfb3e60ca37f932cc066aa10765f3cbc9
@@ -5750,11 +8940,11 @@ Date:	Sat Mar 24 23:13:48 2012 +0100
 
     Fix: annotDisplayDecideCbk was not propagated
 
- poppler/OutputDev.h	|    6 +++++-
- poppler/PSOutputDev.cc |   11 ++++++++---
- poppler/PSOutputDev.h	|    5 ++++-
- poppler/Page.cc	|    3 ++-
- utils/HtmlOutputDev.h	|    5 ++++-
+ poppler/OutputDev.h	|  6 +++++-
+ poppler/PSOutputDev.cc | 11 ++++++++---
+ poppler/PSOutputDev.h	|  5 ++++-
+ poppler/Page.cc	|  3 ++-
+ utils/HtmlOutputDev.h	|  5 ++++-
  5 files changed, 23 insertions(+), 7 deletions(-)
 
 commit aab8c9a026f781da47ecedd453e225f906361444
@@ -5763,11 +8953,11 @@ Date:	Thu Mar 29 21:49:38 2012 +0200
 
     Increase version
 
- CMakeLists.txt      |	  4 ++--
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      | 4 ++--
+ configure.ac	     | 2 +-
+ cpp/Doxyfile	     | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile    | 2 +-
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 commit f7e65b62480631d0485167a81a588a176630dd8d
@@ -5776,7 +8966,7 @@ Date:	Thu Mar 29 21:48:11 2012 +0200
 
     0.19.2 news
 
- NEWS |   23 ++++++++++++++++++++++-
+ NEWS | 23 ++++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 commit 627e072eb1edbfabf549656e9abf10100ed7340c
@@ -5785,7 +8975,7 @@ Date:	Thu Mar 29 21:40:13 2012 +0200
 
     Update copyrights
 
- poppler/TextOutputDev.cc |    1 +
+ poppler/TextOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit e9ad888b003d343d8ca60f044c7cf10a8df81cf4
@@ -5794,7 +8984,7 @@ Date:	Thu Mar 29 19:49:34 2012 +0200
 
     Add quotes to the poppler version define
 
- poppler/poppler-config.h.cmake |    2 +-
+ poppler/poppler-config.h.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8172bb03b6e8f1c16e1a152fb251b10446f54129
@@ -5805,7 +8995,7 @@ Date:	Mon Mar 26 11:13:34 2012 +0200
 
     Signed-off-by: Peter Breitenlohner <peb@mppmu.mpg.de>
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4a38d933d06d189317b1b9028c3fa4ae2a1551af
@@ -5814,7 +9004,7 @@ Date:	Thu Mar 29 19:34:25 2012 +0200
 
     per-collection fallback for missing CID-keyed fonts on Win32
 
- poppler/GlobalParamsWin.cc |	38 ++++++++++++++++++++++++++++++++++----
+ poppler/GlobalParamsWin.cc | 38 ++++++++++++++++++++++++++++++++++----
  1 file changed, 34 insertions(+), 4 deletions(-)
 
 commit a0b3e0938e08847d10c5d7b7528c7c5d43a7a3b8
@@ -5825,7 +9015,7 @@ Date:	Thu Mar 29 07:52:30 2012 +0200
 
     Partial credit goes to suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 631224dc0c721119c91984f1940c9e51edf17eca
@@ -5834,10 +9024,10 @@ Date:	Tue Mar 20 00:56:50 2012 +0100
 
     Annotation removal
 
- poppler/Annot.cc |   17 +++++++++++++++++
- poppler/Annot.h  |    1 +
- poppler/Page.cc  |   36 ++++++++++++++++++++++++++++++++++++
- poppler/Page.h   |    3 +++
+ poppler/Annot.cc | 17 +++++++++++++++++
+ poppler/Annot.h  |  1 +
+ poppler/Page.cc  | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/Page.h   |  3 +++
  4 files changed, 57 insertions(+)
 
 commit 20476370a445a26f1fae9db6ad58727ee3c63550
@@ -5846,9 +9036,9 @@ Date:	Wed Mar 28 23:16:37 2012 +0200
 
     Basic support for Annot appearance stream removal and invalidation
 
- poppler/Annot.cc |  190
- ++++++++++++++++++++++++++++++++++++++++--------------
- poppler/Annot.h  |   29 +++++++--
+ poppler/Annot.cc | 190
+ +++++++++++++++++++++++++++++++++++++++++--------------
+ poppler/Annot.h  |  29 +++++++--
  2 files changed, 168 insertions(+), 51 deletions(-)
 
 commit e9a066c3a53cc1cb73dd43a243390ae4e3c76ca3
@@ -5857,7 +9047,7 @@ Date:	Wed Mar 28 23:33:37 2012 +0200
 
     Fix another typo in macGlyphNames
 
- fofi/FoFiTrueType.cc |    4 ++--
+ fofi/FoFiTrueType.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3d277b230e806a648fcc6d9e7af39370aa89c2ae
@@ -5871,7 +9061,7 @@ Date:	Sat Feb 18 09:19:51 2012 +1030
 
     https://developer.apple.com/fonts/ttrefman/rm06/Chap6post.html
 
- fofi/FoFiTrueType.cc |    3 ++-
+ fofi/FoFiTrueType.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 47b910d35b2cf5914ed4c07f751c5e8c304be7fc
@@ -5890,7 +9080,7 @@ Date:	Wed Mar 28 20:21:44 2012 +0200
     error"
     messages are given. Thus, quoting of the variable would be safer.
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 78224609f6c1d87deee72b60a8f8f9f6c36ac75f
@@ -5915,7 +9105,7 @@ Date:	Wed Mar 28 20:21:11 2012 +0200
     uses it if it works. If jmorecfg.h or basetsd.h was manually fixed to
     prevent this issue, this trick is not used.
 
- configure.ac |   42 ++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
 commit d8cf31f8c7e190939525ad68cd4617fb48fea60e
@@ -5925,10 +9115,10 @@ Date:	Wed Mar 28 20:20:43 2012 +0200
     update Makefile.am to reflect LIBJPEG_CFLAGS, LIBTIFF_CFLAGS,
     LIBPNG_CFLAGS for related sources.
 
- goo/Makefile.am     |	 15 +++++++++++++++
- poppler/Makefile.am |	  6 ++++++
- splash/Makefile.am  |	 16 ++++++++++++++++
- utils/Makefile.am   |	  6 ++++++
+ goo/Makefile.am     | 15 +++++++++++++++
+ poppler/Makefile.am |	6 ++++++
+ splash/Makefile.am  | 16 ++++++++++++++++
+ utils/Makefile.am   |	6 ++++++
  4 files changed, 43 insertions(+)
 
 commit f0c13f5efc641c63627b8f0b0815b6b511d8d196
@@ -5940,7 +9130,7 @@ Date:	Wed Mar 28 20:20:06 2012 +0200
     evaluate pkg-config-like environmental variables like LIBJPEG_CFLAGS,
     LIBJPEG_LIBS, LIBTIFF_CFLAGS and LIBTIFF_LIBS in configuration.
 
- configure.ac |   50 ++++++++++++++++++++++++++++++++++++++++++++------
+ configure.ac | 50 ++++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 44 insertions(+), 6 deletions(-)
 
 commit e55f485d803cb1f82e0d8a53d1998e1887c7920f
@@ -5954,7 +9144,7 @@ Date:	Wed Mar 28 20:19:08 2012 +0200
     this patch modifies m4/libjpeg.m4 to reflect USER_INCLUDES
     when jpeglib.h is searched.
 
- m4/libjpeg.m4 |    6 ++++++
+ m4/libjpeg.m4 | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit e88c17d45220eea60a3dd7fab26a067616388c5f
@@ -5963,7 +9153,7 @@ Date:	Wed Mar 28 20:05:45 2012 +0200
 
     Fix compile in windows
 
- poppler/GlobalParamsWin.cc |	35 ++++++++++++++++++++++++++++++-----
+ poppler/GlobalParamsWin.cc | 35 ++++++++++++++++++++++++++++++-----
  1 file changed, 30 insertions(+), 5 deletions(-)
 
 commit ee0eaabe24019d2af226ef03e3f456787525e040
@@ -5972,9 +9162,9 @@ Date:	Mon Mar 19 00:05:49 2012 +0100
 
     Added Array::remove (and Object::arrayRemove)
 
- poppler/Array.cc |   13 +++++++++++++
- poppler/Array.h  |    4 ++++
- poppler/Object.h |    5 +++++
+ poppler/Array.cc | 13 +++++++++++++
+ poppler/Array.h  |  4 ++++
+ poppler/Object.h |  5 +++++
  3 files changed, 22 insertions(+)
 
 commit d6a1b7dcaeac1e49533519b9f8a279fd64d04c67
@@ -6000,12 +9190,12 @@ Date:	Tue Mar 27 00:00:05 2012 +0200
     on) when using fontconfig. I implement that to find the best font
     fitting to the needs.
 
- poppler/CharCodeToUnicode.cc |    5 +
- poppler/Gfx.cc		      |  329
- +++++++++++++++++++-----------------------
- poppler/GfxFont.cc	      |    3 +-
- poppler/GlobalParams.cc      |   78 +++++++---
- poppler/GlobalParams.h       |    6 +-
+ poppler/CharCodeToUnicode.cc |   5 +
+ poppler/Gfx.cc		      | 329
+ ++++++++++++++++++++-----------------------
+ poppler/GfxFont.cc	      |   3 +-
+ poppler/GlobalParams.cc      |  78 +++++++---
+ poppler/GlobalParams.h       |   6 +-
  5 files changed, 218 insertions(+), 203 deletions(-)
 
 commit a5257efe00d0fe850b1abe5c552f7581027ac64c
@@ -6024,11 +9214,11 @@ Date:	Mon Mar 26 19:28:55 2012 +0200
     output if
     forceRasterization was set.
 
- glib/poppler-page.cc	 |    2 +-
- poppler/GlobalParams.cc |   16 ----------------
- poppler/GlobalParams.h  |    3 ---
- poppler/PSOutputDev.cc  |    6 +++++-
- poppler/PSOutputDev.h	 |    3 +++
+ glib/poppler-page.cc	 |  2 +-
+ poppler/GlobalParams.cc | 16 ----------------
+ poppler/GlobalParams.h  |  3 ---
+ poppler/PSOutputDev.cc  |  6 +++++-
+ poppler/PSOutputDev.h	 |  3 +++
  5 files changed, 9 insertions(+), 21 deletions(-)
 
 commit 55d039ada063a9427de6dd59846ce1570ab26e9f
@@ -6042,10 +9232,9 @@ Date:	Mon Mar 26 22:31:29 2012 +0200
      for CJK
      * 2 workarounds for a Korean font on Microsoft Windows
 
- fofi/FoFiTrueType.cc |   47
- ++++++++++++++++++++++++++++++++++++-----------
- fofi/FoFiTrueType.h  |    8 +++++++-
- poppler/GfxFont.cc   |   14 ++++++++------
+ fofi/FoFiTrueType.cc | 47 ++++++++++++++++++++++++++++++++++++-----------
+ fofi/FoFiTrueType.h  |  8 +++++++-
+ poppler/GfxFont.cc   | 14 ++++++++------
  3 files changed, 51 insertions(+), 18 deletions(-)
 
 commit a8b0fa4d07480242afba7751995e38eaf3147ac5
@@ -6056,7 +9245,7 @@ Date:	Mon Mar 26 21:04:32 2012 +1030
 
     Bug 45955
 
- poppler/TextOutputDev.cc |    4 +++-
+ poppler/TextOutputDev.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit c40e2315cd796ba928969d13a761f5f19d8438fc
@@ -6076,7 +9265,7 @@ Date:	Fri Mar 23 21:49:42 2012 +1030
 
     Bug 47739
 
- poppler/CairoOutputDev.cc |   16 ++++++++++++++++
+ poppler/CairoOutputDev.cc | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
 commit 7b57afea2e433fc7b6f359a62b1289f0e1da3267
@@ -6088,8 +9277,8 @@ Date:	Sat Mar 24 08:27:34 2012 +1030
     Now that a stable version of cairo with mesh gradient support is
     released update poppler to use this api.
 
- poppler/CairoOutputDev.cc |   40 ++++++++++++++++++++--------------------
- poppler/CairoOutputDev.h  |	4 ++--
+ poppler/CairoOutputDev.cc | 40 ++++++++++++++++++++--------------------
+ poppler/CairoOutputDev.h  |  4 ++--
  2 files changed, 22 insertions(+), 22 deletions(-)
 
 commit 2f156b34fc8755ddd2a32cac830f3073d6b2c481
@@ -6098,7 +9287,7 @@ Date:	Fri Mar 23 20:00:18 2012 +0100
 
     Fix compile in mingw-gcc
 
- poppler/GlobalParamsWin.cc |	 3 ++-
+ poppler/GlobalParamsWin.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 06b6db92dd1ec32f9a55347073f8b533aa074ee1
@@ -6107,9 +9296,9 @@ Date:	Sun Mar 18 23:58:05 2012 +0100
 
     Added XRef::removeIndirectObject
 
- poppler/PDFDoc.cc |   15 ++++++++++-----
- poppler/XRef.cc   |   15 +++++++++++++++
- poppler/XRef.h    |	2 ++
+ poppler/PDFDoc.cc | 15 ++++++++++-----
+ poppler/XRef.cc   | 15 +++++++++++++++
+ poppler/XRef.h    |  2 ++
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 commit a2e9b7c02ffa0e5edc4da18cc726993bc92fc684
@@ -6122,7 +9311,7 @@ Date:	Mon Mar 19 19:17:09 2012 +0100
     it's correctly
     set to the *popup* annot's own.
 
- poppler/Annot.cc |    6 +++---
+ poppler/Annot.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 05641304df67beae546a2fe18071f3be52707aa8
@@ -6131,8 +9320,8 @@ Date:	Mon Mar 19 20:56:45 2012 +0100
 
     Basic Annot border editing support
 
- poppler/Annot.cc |   23 +++++++++++++++++++++++
- poppler/Annot.h  |    9 +++++++++
+ poppler/Annot.cc | 23 +++++++++++++++++++++++
+ poppler/Annot.h  |  9 +++++++++
  2 files changed, 32 insertions(+)
 
 commit 3e6275a05066c152b265cc27275d9e4107c089e9
@@ -6141,8 +9330,8 @@ Date:	Fri Mar 16 21:47:02 2012 +0100
 
     Yet new setters to AnnotFreeText
 
- poppler/Annot.cc |   45 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 ++
+ poppler/Annot.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  2 ++
  2 files changed, 47 insertions(+)
 
 commit f69f41056fc8cd8a70b38024f255e9074af20bdc
@@ -6151,7 +9340,7 @@ Date:	Tue Mar 20 15:18:33 2012 +0100
 
     cmake: reset CMAKE_REQUIRED_INCLUDES/CMAKE_REQUIRED_LIBRARIES
 
- cmake/modules/FindLIBOPENJPEG.cmake |	  3 +++
+ cmake/modules/FindLIBOPENJPEG.cmake | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 4a9238441a5317c3304296e4e6430cccefe8322c
@@ -6162,8 +9351,8 @@ Date:	Fri Mar 16 00:07:45 2012 +0100
 
     Bug 32340
 
- utils/HtmlOutputDev.cc |   50
- ++++++++++++++++++++++++++++++++++++++++++++++--
+ utils/HtmlOutputDev.cc | 50
+ ++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 48 insertions(+), 2 deletions(-)
 
 commit 6d68d0d3acc8c8e0d9d310b2e1ba2b07d6bfe942
@@ -6174,9 +9363,9 @@ Date:	Thu Mar 15 22:56:10 2012 +0100
 
     Bug #47186
 
- utils/HtmlOutputDev.cc |  203
- ++++++++++++++++++++++++++++++------------------
- utils/HtmlOutputDev.h	|    3 +
+ utils/HtmlOutputDev.cc | 203
+ +++++++++++++++++++++++++++++++------------------
+ utils/HtmlOutputDev.h	|   3 +
  2 files changed, 131 insertions(+), 75 deletions(-)
 
 commit 60155e0fc7224a6b479bf62133f72c460fe48078
@@ -6185,7 +9374,7 @@ Date:	Thu Mar 15 20:46:53 2012 +0100
 
     Install poppler-media.h
 
- qt4/src/Makefile.am |	  1 +
+ qt4/src/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6a173844d5ca6f32e188406ab14cae6a7548fc1d
@@ -6194,7 +9383,7 @@ Date:	Thu Mar 15 20:44:12 2012 +0100
 
     Add the export
 
- qt4/src/poppler-media.h |    5 ++++-
+ qt4/src/poppler-media.h | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit e401f8e6ba3e18d5a3a4920cd111b2174c75f415
@@ -6203,15 +9392,15 @@ Date:	Thu Mar 15 20:32:12 2012 +0100
 
     Increase version and sonames
 
- CMakeLists.txt		|    4 ++--
- configure.ac		|    2 +-
- cpp/Doxyfile		|    2 +-
- glib/CMakeLists.txt	|    2 +-
- glib/Makefile.am	|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Doxyfile	|    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		| 4 ++--
+ configure.ac		| 2 +-
+ cpp/Doxyfile		| 2 +-
+ glib/CMakeLists.txt	| 2 +-
+ glib/Makefile.am	| 2 +-
+ poppler/Makefile.am	| 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile	| 2 +-
+ qt4/src/Makefile.am	| 2 +-
  9 files changed, 10 insertions(+), 10 deletions(-)
 
 commit ce059698e8c5097f75e7a0f828af0936aa104af0
@@ -6222,8 +9411,8 @@ Date:	Thu Mar 15 20:27:45 2012 +0100
 
     Also inclusing 0.18.x ones
 
- NEWS |  110
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 110
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 110 insertions(+)
 
 commit 2041d5721871adb2a23999c16ecbdc60abb7b1c4
@@ -6232,9 +9421,9 @@ Date:	Thu Mar 15 20:20:31 2012 +0100
 
     Update C years
 
- poppler/CMap.h       |    1 +
- poppler/GfxFont.h    |    2 +-
- poppler/Rendition.cc |    1 +
+ poppler/CMap.h       | 1 +
+ poppler/GfxFont.h    | 2 +-
+ poppler/Rendition.cc | 1 +
  3 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 95d684aa2a87d01296f5e93516f2ac3f54adbec8
@@ -6246,15 +9435,15 @@ Date:	Thu Mar 15 20:13:20 2012 +0100
 
     Bug #47336
 
- qt4/src/CMakeLists.txt				  |    1 -
- qt4/src/Makefile.am				  |    1 -
- qt4/src/poppler-media.cc			  |   35 +++++++++-----
- qt4/src/poppler-media.h			  |    4 +-
- qt4/src/poppler-page.cc			  |    1 -
- qt4/src/poppler-streamsequentialdevice-private.h |   51
- --------------------
- qt4/src/poppler-streamsequentialdevice.cc	  |   56
- ----------------------
+ qt4/src/CMakeLists.txt				  |  1 -
+ qt4/src/Makefile.am				  |  1 -
+ qt4/src/poppler-media.cc			  | 35 ++++++++++-----
+ qt4/src/poppler-media.h			  |  4 +-
+ qt4/src/poppler-page.cc			  |  1 -
+ qt4/src/poppler-streamsequentialdevice-private.h | 51
+ ---------------------
+ qt4/src/poppler-streamsequentialdevice.cc	  | 56
+ ------------------------
  7 files changed, 26 insertions(+), 123 deletions(-)
 
 commit 9fee12f9bee7252db0974ef69870b69ff1452053
@@ -6263,7 +9452,7 @@ Date:	Thu Mar 15 19:23:47 2012 +0100
 
     Compile++
 
- qt4/src/Makefile.am |	  2 ++
+ qt4/src/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit aa1e6d12d063a64a22841f7996101b45aa680ec7
@@ -6272,18 +9461,18 @@ Date:	Thu Mar 15 00:35:31 2012 +0100
 
     Added media rendition support for Qt4
 
- qt4/src/CMakeLists.txt				  |    3 +
- qt4/src/poppler-annotation.cc			  |   66 ++++++++++
- qt4/src/poppler-annotation.h			  |   47 ++++++-
- qt4/src/poppler-link.cc			  |   44 +++++++
- qt4/src/poppler-link.h				  |   38 +++++-
- qt4/src/poppler-media.cc			  |  149
- ++++++++++++++++++++++
- qt4/src/poppler-media.h			  |   94 ++++++++++++++
- qt4/src/poppler-page.cc			  |   32 ++++-
- qt4/src/poppler-qt4.h				  |    2 +
- qt4/src/poppler-streamsequentialdevice-private.h |   51 ++++++++
- qt4/src/poppler-streamsequentialdevice.cc	  |   56 ++++++++
+ qt4/src/CMakeLists.txt				  |   3 +
+ qt4/src/poppler-annotation.cc			  |  66 ++++++++++
+ qt4/src/poppler-annotation.h			  |  47 ++++++-
+ qt4/src/poppler-link.cc			  |  44 +++++++
+ qt4/src/poppler-link.h				  |  38 +++++-
+ qt4/src/poppler-media.cc			  | 149
+ +++++++++++++++++++++++
+ qt4/src/poppler-media.h			  |  94 ++++++++++++++
+ qt4/src/poppler-page.cc			  |  32 ++++-
+ qt4/src/poppler-qt4.h				  |   2 +
+ qt4/src/poppler-streamsequentialdevice-private.h |  51 ++++++++
+ qt4/src/poppler-streamsequentialdevice.cc	  |  56 +++++++++
  11 files changed, 579 insertions(+), 3 deletions(-)
 
 commit 258e2197afa49e60b0b13a05408fc8d484dd8147
@@ -6292,8 +9481,8 @@ Date:	Wed Mar 14 23:25:00 2012 +0100
 
     Added some new setters to AnnotFreeText
 
- poppler/Annot.cc |   39 +++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    4 ++++
+ poppler/Annot.cc | 39 +++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  4 ++++
  2 files changed, 43 insertions(+)
 
 commit 84a62ac157e03880c1c1eda60c3927bd4414640e
@@ -6302,9 +9491,9 @@ Date:	Wed Mar 14 23:24:28 2012 +0100
 
     Added some new setters to AnnotGeometry, AnnotInk and AnnotCaret
 
- poppler/Annot.cc |  116
- ++++++++++++++++++++++++++++++++++++++++--------------
- poppler/Annot.h  |   10 +++++
+ poppler/Annot.cc | 116
+ +++++++++++++++++++++++++++++++++++++++++--------------
+ poppler/Annot.h  |  10 +++++
  2 files changed, 96 insertions(+), 30 deletions(-)
 
 commit 233c9a097bdc382f6a2eb6319ee15528c72e9632
@@ -6313,9 +9502,9 @@ Date:	Wed Mar 14 23:23:59 2012 +0100
 
     Added some new setters to AnnotTextMarkup and AnnotStamp
 
- poppler/Annot.cc |   61
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |   11 ++++++++--
+ poppler/Annot.cc | 61
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  | 11 ++++++++--
  2 files changed, 70 insertions(+), 2 deletions(-)
 
 commit 8fb3ac6cf66233b80959ba99a2c706111050f5f1
@@ -6324,7 +9513,7 @@ Date:	Wed Mar 14 23:23:23 2012 +0100
 
     Added Page::getDoc()
 
- poppler/Page.h |    2 ++
+ poppler/Page.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit dc4cb07c1e735006d5168e0e65f5143d7fc53e12
@@ -6333,9 +9522,9 @@ Date:	Wed Mar 14 23:22:10 2012 +0100
 
     Added some new setters to AnnotLine and AnnotPolygon
 
- poppler/Annot.cc |  201
- ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h  |   16 +++++
+ poppler/Annot.cc | 201
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h  |  16 +++++
  2 files changed, 211 insertions(+), 6 deletions(-)
 
 commit 4931018eecc37dbbe0df1a456347ab200f1b057a
@@ -6344,7 +9533,7 @@ Date:	Wed Mar 14 23:21:07 2012 +0100
 
     Make Dict::set remove the entry if object is Null
 
- poppler/Dict.cc |    5 +++++
+ poppler/Dict.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 13ac2c0bed3fa5515a3c068488cb6a0b17410a97
@@ -6353,9 +9542,9 @@ Date:	Wed Mar 14 23:20:13 2012 +0100
 
     Added some new setters to Annot and AnnotMarkup
 
- poppler/Annot.cc |   94
- ++++++++++++++++++++++++++++++++++++++++++++++++++----
- poppler/Annot.h  |    8 +++++
+ poppler/Annot.cc | 94
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/Annot.h  |  8 +++++
  2 files changed, 96 insertions(+), 6 deletions(-)
 
 commit aa2b5ffa7961aac0aea33ae9a42bf1f38a756b1b
@@ -6369,15 +9558,15 @@ Date:	Wed Mar 14 16:25:35 2012 +0100
     this needed a couple of explicit initializations of Ref (since it's
     a simple struct with no methods) and a private operator== for it
 
- qt4/src/CMakeLists.txt		      |    1 -
- qt4/src/poppler-annotation-private.h |    4 +-
- qt4/src/poppler-annotation.cc	      |    1 +
- qt4/src/poppler-link.cc	      |   16 +++---
- qt4/src/poppler-link.h		      |    5 +-
- qt4/src/poppler-objectreference.cc   |   89
- ----------------------------------
- qt4/src/poppler-objectreference_p.h  |   77 -----------------------------
- qt4/src/poppler-page.cc	      |    7 ++-
+ qt4/src/CMakeLists.txt		      |  1 -
+ qt4/src/poppler-annotation-private.h |  4 +-
+ qt4/src/poppler-annotation.cc	      |  1 +
+ qt4/src/poppler-link.cc	      | 16 ++++---
+ qt4/src/poppler-link.h		      |  5 +-
+ qt4/src/poppler-objectreference.cc   | 89
+ ------------------------------------
+ qt4/src/poppler-objectreference_p.h  | 77 -------------------------------
+ qt4/src/poppler-page.cc	      |  7 ++-
  8 files changed, 21 insertions(+), 179 deletions(-)
 
 commit e5b914b2bfbb5e95ecde5f1ce148374b1d58dadd
@@ -6388,9 +9577,9 @@ Date:	Tue Mar 13 23:54:26 2012 +0100
 
     Bug #47022
 
- utils/HtmlOutputDev.cc |    7 +++++--
- utils/pdftohtml.1	|    5 +++++
- utils/pdftohtml.cc	|    7 +++++++
+ utils/HtmlOutputDev.cc | 7 +++++--
+ utils/pdftohtml.1	| 5 +++++
+ utils/pdftohtml.cc	| 7 +++++++
  3 files changed, 17 insertions(+), 2 deletions(-)
 
 commit 4388cb69114e406ec29e8b6976d1a900e4ab1b7d
@@ -6403,7 +9592,7 @@ Date:	Sun Mar 11 23:37:39 2012 +0100
     more easily
     Bug 46622
 
- poppler/SplashOutputDev.h |	5 ++++-
+ poppler/SplashOutputDev.h | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 448cfc431b7067af38da51e725ac0f1b2a0bc8f8
@@ -6414,15 +9603,15 @@ Date:	Sun Mar 11 23:22:18 2012 +0100
 
     Bug #40561
 
- qt4/src/CMakeLists.txt		      |    1 +
- qt4/src/poppler-annotation-private.h |    4 ++
- qt4/src/poppler-annotation.h	      |    4 ++
- qt4/src/poppler-link.cc	      |   42 ++++++++++++----
- qt4/src/poppler-link.h		      |   43 ++++++++++++++--
- qt4/src/poppler-objectreference.cc   |   89
- ++++++++++++++++++++++++++++++++++
- qt4/src/poppler-objectreference_p.h  |   77 +++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc	      |   39 +++++++++++----
+ qt4/src/CMakeLists.txt		      |  1 +
+ qt4/src/poppler-annotation-private.h |  4 ++
+ qt4/src/poppler-annotation.h	      |  4 ++
+ qt4/src/poppler-link.cc	      | 42 +++++++++++++----
+ qt4/src/poppler-link.h		      | 43 +++++++++++++++--
+ qt4/src/poppler-objectreference.cc   | 89
+ ++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-objectreference_p.h  | 77 +++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc	      | 39 ++++++++++++----
  8 files changed, 276 insertions(+), 23 deletions(-)
 
 commit a0d151deabf8243c98ff9953f8a43bb56fbf95a9
@@ -6431,11 +9620,11 @@ Date:	Sun Mar 11 16:05:15 2012 +0100
 
     regtest: Add find-regression command to run git bisect automatically
 
- regtest/Bisect.py		     |	113
- +++++++++++++++++++++++++++++++++++
- regtest/builder/__init__.py	     |	 86 ++++++++++++++++++++++++++
- regtest/builder/autotools.py	     |	 63 +++++++++++++++++++
- regtest/commands/find-regression.py |	 77 ++++++++++++++++++++++++
+ regtest/Bisect.py		     | 113
+ ++++++++++++++++++++++++++++++++++++
+ regtest/builder/__init__.py	     |	86 +++++++++++++++++++++++++++
+ regtest/builder/autotools.py	     |	63 ++++++++++++++++++++
+ regtest/commands/find-regression.py |	77 ++++++++++++++++++++++++
  4 files changed, 339 insertions(+)
 
 commit 856768c380ecea30ce9727b81c4c44b4f9489626
@@ -6444,7 +9633,7 @@ Date:	Sat Mar 10 18:15:58 2012 +0100
 
     regtest: Add information about skipped tests in the summary
 
- regtest/TestRun.py |	12 +++++++++---
+ regtest/TestRun.py | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 commit 508c7c3ef1f22459daa822f8287cab382119e753
@@ -6458,7 +9647,7 @@ Date:	Wed Mar 7 18:35:05 2012 +0100
 
     https://bugs.freedesktop.org/show_bug.cgi?id=47063
 
- poppler/Rendition.cc |    2 +-
+ poppler/Rendition.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 68625258ab3cfc3e8e10a727e397f80bed0d1f5c
@@ -6467,7 +9656,7 @@ Date:	Sun Mar 4 18:37:53 2012 +1030
 
     glib demo: make ctrl-q quit the demo
 
- glib/demo/main.c |    9 +++++++++
+ glib/demo/main.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 684b47727ba810ad6bf239e2838aa65b6f6cec36
@@ -6476,7 +9665,7 @@ Date:	Sun Mar 4 18:10:49 2012 +1030
 
     glib demo: show font encoding in font demo
 
- glib/demo/fonts.c |	9 +++++++--
+ glib/demo/fonts.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 48c08d28645d82ab9d67433a0150f6e1ba24b7c6
@@ -6485,9 +9674,9 @@ Date:	Sun Mar 4 17:49:56 2012 +1030
 
     glib: add poppler_fonts_iter_get_encoding
 
- glib/poppler-document.cc	     |	 26 ++++++++++++++++++++++++++
- glib/poppler-document.h	     |	  1 +
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-document.cc	     | 26 ++++++++++++++++++++++++++
+ glib/poppler-document.h	     |	1 +
+ glib/reference/poppler-sections.txt |	1 +
  3 files changed, 28 insertions(+)
 
 commit 8d935569a977675afac35cf1bd5f2611b6a771b6
@@ -6496,7 +9685,7 @@ Date:	Mon Mar 5 21:59:09 2012 +0100
 
     Fix regression in some PSOutputDev array sizing
 
- poppler/PSOutputDev.cc |    2 +-
+ poppler/PSOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2484bc0f29aef74c45ea39ef1e24804ed736154c
@@ -6505,7 +9694,7 @@ Date:	Sun Mar 4 23:47:24 2012 +0100
 
     Fix mismatch in some functions declarations
 
- goo/GooString.h |    6 +++---
+ goo/GooString.h | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 35c960d198d2efa97d15e962662114c5c31b8d20
@@ -6515,7 +9704,7 @@ Date:	Sun Mar 4 20:32:42 2012 +0100
     Do not crash on malformed files with 0 bits in the color map of
     an image
 
- poppler/Gfx.cc |    4 ++++
+ poppler/Gfx.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit dae29c6c201cd69cbf4f008de865cc19a36f29b3
@@ -6542,10 +9731,10 @@ Date:	Sun Mar 4 15:22:02 2012 +0100
     gswin32c -q -dBATCH -sFONTDIR=<windows font directory>
     -sCIDFMAP=<popper data dir>/cidfmap mkcidfm.ps
 
- poppler/GlobalParams.cc    |	 5 +++
- poppler/GlobalParams.h     |	 2 +
- poppler/GlobalParamsWin.cc |  106
- +++++++++++++++++++++++++++++++++++++++-----
+ poppler/GlobalParams.cc    |	5 +++
+ poppler/GlobalParams.h     |	2 +
+ poppler/GlobalParamsWin.cc | 106
+ ++++++++++++++++++++++++++++++++++++++++-----
  3 files changed, 103 insertions(+), 10 deletions(-)
 
 commit 32e47ee03840cc8f21c00497025864d77edb75f5
@@ -6585,8 +9774,8 @@ Date:	Sun Mar 4 15:21:13 2012 +0100
     decided to
     return as default MS Mincho if a CID font is expected.
 
- poppler/PSOutputDev.cc |  203
- ++++++++++++++++++++++--------------------------
+ poppler/PSOutputDev.cc | 203
+ ++++++++++++++++++++++---------------------------
  1 file changed, 92 insertions(+), 111 deletions(-)
 
 commit 61037a6de157e39331ae7a8b12ee5a115fd7e936
@@ -6595,7 +9784,7 @@ Date:	Sun Mar 4 17:40:40 2012 +1030
 
     glib demo: fix typo
 
- glib/demo/selections.c |    4 ++--
+ glib/demo/selections.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit aff5b0a4f04c12ad7733aedbc9997367f5873aa1
@@ -6604,7 +9793,7 @@ Date:	Sat Mar 3 20:10:17 2012 +0100
 
     regtest: Ignore backends with no results when creating html report
 
- regtest/HTMLReport.py |    5 +++++
+ regtest/HTMLReport.py | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 9d28b8db3561845f4ca94c29479a259ceaf78bc5
@@ -6622,9 +9811,9 @@ Date:	Sat Mar 3 14:42:51 2012 +0100
     for text
     files is very slow.
 
- regtest/HTMLReport.py		   |  128
- ++++++++++++++++++++++++++++++++++++-
- regtest/commands/create-report.py |	4 ++
+ regtest/HTMLReport.py		   | 128
+ +++++++++++++++++++++++++++++++++++++-
+ regtest/commands/create-report.py |   4 ++
  2 files changed, 129 insertions(+), 3 deletions(-)
 
 commit 670ea176495b8b580daba061840c914714bf422d
@@ -6635,13 +9824,13 @@ Date:	Fri Mar 2 22:22:16 2012 +1030
 
     Bug 46888
 
- poppler/CMap.h      |	  2 ++
- poppler/FontInfo.cc |	  3 +++
- poppler/FontInfo.h  |	  2 ++
- poppler/GfxFont.cc  |	 26 ++++++++++++++++++++++++++
- poppler/GfxFont.h   |	  4 ++++
- utils/pdffonts.1    |	  3 +++
- utils/pdffonts.cc   |	  7 ++++---
+ poppler/CMap.h      |	2 ++
+ poppler/FontInfo.cc |	3 +++
+ poppler/FontInfo.h  |	2 ++
+ poppler/GfxFont.cc  | 26 ++++++++++++++++++++++++++
+ poppler/GfxFont.h   |	4 ++++
+ utils/pdffonts.1    |	3 +++
+ utils/pdffonts.cc   |	7 ++++---
  7 files changed, 44 insertions(+), 3 deletions(-)
 
 commit 3ab6b5ebf3b6c0d59bcb2ec68eae1aa95cab1d0e
@@ -6658,9 +9847,9 @@ Date:	Fri Mar 2 19:40:44 2012 +0100
 
     Bug 46744
 
- poppler/GlobalParams.cc |    9 +--------
- poppler/GlobalParams.h  |    4 +---
- utils/pdftops.cc	 |   10 +++++-----
+ poppler/GlobalParams.cc |  9 +--------
+ poppler/GlobalParams.h  |  4 +---
+ utils/pdftops.cc	 | 10 +++++-----
  3 files changed, 7 insertions(+), 16 deletions(-)
 
 commit 6c1ee34424b1122c0a2222b776d8d475f7c555cd
@@ -6669,8 +9858,8 @@ Date:	Fri Mar 2 18:41:58 2012 +1030
 
     Update poppler copyright
 
- poppler/poppler-config.h.cmake |    2 +-
- poppler/poppler-config.h.in	|    2 +-
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit cdb1350d1e28cf3bceda75736ca91e13d193de84
@@ -6679,15 +9868,15 @@ Date:	Thu Mar 1 18:58:02 2012 +0100
 
     Increase versions
 
- CMakeLists.txt		|    4 ++--
- configure.ac		|    2 +-
- cpp/Doxyfile		|    2 +-
- glib/CMakeLists.txt	|    2 +-
- glib/Makefile.am	|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Doxyfile	|    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		| 4 ++--
+ configure.ac		| 2 +-
+ cpp/Doxyfile		| 2 +-
+ glib/CMakeLists.txt	| 2 +-
+ glib/Makefile.am	| 2 +-
+ poppler/Makefile.am	| 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile	| 2 +-
+ qt4/src/Makefile.am	| 2 +-
  9 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 2c9e6fa5b3bc6cd01618c3fb4f46533bfce97466
@@ -6696,7 +9885,7 @@ Date:	Thu Mar 1 18:48:17 2012 +0100
 
     0.19.0 news file
 
- NEWS |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 48 insertions(+)
 
 commit 14f6abfcb83f91755e6de05cd33870934bba3cfb
@@ -6705,27 +9894,27 @@ Date:	Thu Mar 1 17:53:25 2012 +0100
 
     Update copyrights
 
- goo/JpegWriter.cc	      |    2 +-
- poppler/CairoFontEngine.cc   |    1 +
- poppler/CairoOutputDev.cc    |    3 ++-
- poppler/CairoOutputDev.h     |    2 +-
- poppler/CairoRescaleBox.cc   |   15 +++++++++++++++
- poppler/FontInfo.cc	      |    2 +-
- poppler/FontInfo.h	      |    1 +
- poppler/Gfx.cc		      |    2 +-
- poppler/GfxFont.cc	      |    1 +
- poppler/GlobalParams.cc      |    2 ++
- poppler/GlobalParams.h       |    1 +
- poppler/Lexer.cc	      |    1 +
- poppler/NameToUnicodeTable.h |    2 +-
- utils/ImageOutputDev.cc      |    1 +
- utils/ImageOutputDev.h       |    1 +
- utils/parseargs.cc	      |    1 +
- utils/parseargs.h	      |    1 +
- utils/pdffonts.cc	      |    1 +
- utils/pdfimages.cc	      |    1 +
- utils/pdftocairo.cc	      |    2 +-
- utils/pdftoppm.cc	      |    2 +-
+ goo/JpegWriter.cc	      |  2 +-
+ poppler/CairoFontEngine.cc   |  1 +
+ poppler/CairoOutputDev.cc    |  3 ++-
+ poppler/CairoOutputDev.h     |  2 +-
+ poppler/CairoRescaleBox.cc   | 15 +++++++++++++++
+ poppler/FontInfo.cc	      |  2 +-
+ poppler/FontInfo.h	      |  1 +
+ poppler/Gfx.cc		      |  2 +-
+ poppler/GfxFont.cc	      |  1 +
+ poppler/GlobalParams.cc      |  2 ++
+ poppler/GlobalParams.h       |  1 +
+ poppler/Lexer.cc	      |  1 +
+ poppler/NameToUnicodeTable.h |  2 +-
+ utils/ImageOutputDev.cc      |  1 +
+ utils/ImageOutputDev.h       |  1 +
+ utils/parseargs.cc	      |  1 +
+ utils/parseargs.h	      |  1 +
+ utils/pdffonts.cc	      |  1 +
+ utils/pdfimages.cc	      |  1 +
+ utils/pdftocairo.cc	      |  2 +-
+ utils/pdftoppm.cc	      |  2 +-
  21 files changed, 37 insertions(+), 8 deletions(-)
 
 commit e63ca8184168f824575be9bbb64e9b1eac1eff94
@@ -6736,7 +9925,7 @@ Date:	Thu Mar 1 21:46:12 2012 +1030
 
     based on pdftpppm patch 7ec31b8dc40ec8a3534fbb89964aa011aeb81f5e
 
- utils/pdftocairo.1 |	 4 +++-
+ utils/pdftocairo.1 | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit fa82a7ce1372e5976ad95624115fcd7a4d9bd22c
@@ -6748,8 +9937,8 @@ Date:	Thu Mar 1 21:43:32 2012 +1030
 
     based on pdftoppm patch 38ace7db5de0b2b247fd520e48a8f26e5d28c9d7
 
- utils/pdftocairo.1  |	  8 ++++++--
- utils/pdftocairo.cc |	  8 ++++++--
+ utils/pdftocairo.1  | 8 ++++++--
+ utils/pdftocairo.cc | 8 ++++++--
  2 files changed, 12 insertions(+), 4 deletions(-)
 
 commit a2b008223ad6887f00d76c535f2b0b0f13f52b76
@@ -6758,7 +9947,7 @@ Date:	Tue Feb 28 21:38:19 2012 +1030
 
     glib: add copy button to selections demo
 
- glib/demo/selections.c |   20 ++++++++++++++++++++
+ glib/demo/selections.c | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit b666d19308a043206e405c7e9d4ad709d68d331b
@@ -6767,7 +9956,7 @@ Date:	Tue Feb 28 21:07:06 2012 +1030
 
     glib: show substitute font name in demo
 
- glib/demo/fonts.c |	6 ++++--
+ glib/demo/fonts.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 18bc59fcf5a59b1fd51a631c02e900790c3a6dc0
@@ -6776,10 +9965,10 @@ Date:	Tue Feb 28 21:06:38 2012 +1030
 
     glib: add poppler_fonts_iter_get_substitute_name
 
- glib/poppler-document.cc	     |	 27 +++++++++++++++++++++++++++
- glib/poppler-document.h	     |	  1 +
- glib/reference/poppler-docs.sgml    |	  4 ++++
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-document.cc	     | 27 +++++++++++++++++++++++++++
+ glib/poppler-document.h	     |	1 +
+ glib/reference/poppler-docs.sgml    |	4 ++++
+ glib/reference/poppler-sections.txt |	1 +
  4 files changed, 33 insertions(+)
 
 commit 4eaafe67de79fb63ebf61f031a97bbc0ed6a8891
@@ -6791,7 +9980,7 @@ Date:	Wed Feb 29 23:22:34 2012 +0100
     This way people won't expect it to be six fixed digits
     Bug #46708
 
- utils/pdftoppm.1 |    4 ++--
+ utils/pdftoppm.1 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit aec6cb67951e56e4557a11c4fdf301e585268fe4
@@ -6806,10 +9995,10 @@ Date:	Wed Feb 29 23:18:16 2012 +0100
     restore the conversion of bitmaps with all gray to mono8
     fixed the CMYK misspelling in Stream.
 
- poppler/PSOutputDev.cc |  284
- ++++++++++++++++++++++++++++++++++++++++--------
- poppler/Stream.cc	|   55 +++++++++-
- poppler/Stream.h	|   39 ++++++-
+ poppler/PSOutputDev.cc | 284
+ +++++++++++++++++++++++++++++++++++++++++--------
+ poppler/Stream.cc	|  55 ++++++++--
+ poppler/Stream.h	|  39 ++++++-
  3 files changed, 320 insertions(+), 58 deletions(-)
 
 commit e977925a1eb15083e6b020b31da77ddef9d5df02
@@ -6820,7 +10009,7 @@ Date:	Wed Feb 29 23:12:24 2012 +0100
 
     xpdf303 merge glitch
 
- poppler/PSOutputDev.cc |    1 -
+ poppler/PSOutputDev.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit e13efe04facdc10f3acffece3b057544f018f40c
@@ -6831,7 +10020,7 @@ Date:	Wed Feb 29 23:10:43 2012 +0100
 
     Wrong merge from xpdf303
 
- poppler/GfxState.cc |	  3 +++
+ poppler/GfxState.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit adfc03e441b2a86dab5216dc560fd79343dfbe4f
@@ -6842,9 +10031,9 @@ Date:	Wed Feb 29 21:10:56 2012 +0100
 
     Fixes bug #46459.
 
- poppler/Hints.cc  |	6 ++++--
- poppler/Parser.cc |   30 ++++++++++++++++++++++++------
- poppler/Parser.h  |	7 +++++--
+ poppler/Hints.cc  |  6 ++++--
+ poppler/Parser.cc | 30 ++++++++++++++++++++++++------
+ poppler/Parser.h  |  7 +++++--
  3 files changed, 33 insertions(+), 10 deletions(-)
 
 commit 7ec31b8dc40ec8a3534fbb89964aa011aeb81f5e
@@ -6853,7 +10042,7 @@ Date:	Mon Feb 27 21:15:39 2012 +1030
 
     pdftoppm: document that -scale-to will preserve aspect ratio
 
- utils/pdftoppm.1 |    4 +++-
+ utils/pdftoppm.1 | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 38ace7db5de0b2b247fd520e48a8f26e5d28c9d7
@@ -6865,8 +10054,8 @@ Date:	Sat Feb 25 20:02:22 2012 +1030
 
     bug 43393
 
- utils/pdftoppm.1  |	8 ++++++--
- utils/pdftoppm.cc |	8 ++++++--
+ utils/pdftoppm.1  | 8 ++++++--
+ utils/pdftoppm.cc | 8 ++++++--
  2 files changed, 12 insertions(+), 4 deletions(-)
 
 commit 738b879ebb536cc84d7ec96543d484023b69e6d3
@@ -6876,10 +10065,10 @@ Date:	Sat Feb 25 20:53:58 2012 +0100
     regtest: Add create-report command to generate html report of
     test results
 
- regtest/HTMLReport.py		   |  197
- +++++++++++++++++++++++++++++++++++++
- regtest/backends/__init__.py	   |   20 +++-
- regtest/commands/create-report.py |   57 +++++++++++
+ regtest/HTMLReport.py		   | 197
+ ++++++++++++++++++++++++++++++++++++++
+ regtest/backends/__init__.py	   |  20 +++-
+ regtest/commands/create-report.py |  57 +++++++++++
  3 files changed, 273 insertions(+), 1 deletion(-)
 
 commit d5faabd509c2860ab199ee89b8ef9d4c14fa5118
@@ -6890,10 +10079,10 @@ Date:	Sat Feb 25 20:50:53 2012 +0100
 
     So that they are recognized as images
 
- regtest/backends/__init__.py |   16 ++++++++++++++--
- regtest/backends/cairo.py    |    2 +-
- regtest/backends/splash.py   |    2 +-
- regtest/backends/text.py     |    2 +-
+ regtest/backends/__init__.py | 16 ++++++++++++++--
+ regtest/backends/cairo.py    |  2 +-
+ regtest/backends/splash.py   |  2 +-
+ regtest/backends/text.py     |  2 +-
  4 files changed, 17 insertions(+), 5 deletions(-)
 
 commit 2a5f1594a23cf521497f904b502fbadf56a9e780
@@ -6902,7 +10091,7 @@ Date:	Sat Feb 25 16:32:33 2012 +0100
 
     Fix PSOutputDev regression with -level1
 
- poppler/PSOutputDev.cc |    4 ++--
+ poppler/PSOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6a5deb0a86ad227cce3f85b1f58a9b86755cd812
@@ -6912,7 +10101,7 @@ Date:	Sat Feb 25 19:39:02 2012 +1030
     autoconf: PKG_CHECK_EXISTS should not have the variable prefix in
     the first argument
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8f4566c14a727fb75c4c353989cf5eb96516c2e3
@@ -6924,7 +10113,7 @@ Date:	Wed Feb 22 21:21:52 2012 +1030
     Now that openjpeg 1.5 is released and supports pkg-config the compile
     test can be replaced with a pkg-config version check.
 
- configure.ac |   11 +++--------
+ configure.ac | 11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
 
 commit 30f38bf425e2f76b3f6cc4c080137ac7219a9dbe
@@ -6939,7 +10128,7 @@ Date:	Wed Feb 22 21:01:59 2012 +1030
 
     Bug 21789
 
- configure.ac |   28 +++++++++++++++++-----------
+ configure.ac | 28 +++++++++++++++++-----------
  1 file changed, 17 insertions(+), 11 deletions(-)
 
 commit 466340d257ff0fe7e3a88a4e013e3feec3f7b70a
@@ -6950,7 +10139,7 @@ Date:	Thu Feb 23 23:47:15 2012 +0100
 
     Bug 46521
 
- utils/HtmlOutputDev.cc |   14 +++++++++++++-
+ utils/HtmlOutputDev.cc | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 commit 675ef2bda3c4e06b39e2ba09b3b19d99cfb001b6
@@ -6959,7 +10148,7 @@ Date:	Thu Feb 23 23:22:50 2012 +0100
 
     Compile
 
- poppler/Stream.cc |	3 ++-
+ poppler/Stream.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 7705e65c231cc3af296bf19f5cba110cabb72e7d
@@ -6970,11 +10159,11 @@ Date:	Thu Feb 23 23:09:23 2012 +0100
 
     Bug 56993
 
- utils/HtmlOutputDev.cc |  130
- +++++++++++++++++++++++++++++++++++-------------
- utils/HtmlOutputDev.h	|    7 ++-
- utils/pdf2xml.dtd	|    7 ++-
- utils/pdftohtml.cc	|    5 +-
+ utils/HtmlOutputDev.cc | 130
+ ++++++++++++++++++++++++++++++++++++-------------
+ utils/HtmlOutputDev.h	|   7 ++-
+ utils/pdf2xml.dtd	|   7 ++-
+ utils/pdftohtml.cc	|   5 +-
  4 files changed, 108 insertions(+), 41 deletions(-)
 
 commit 30446bdd7e202eed88d131e04477c76861fd145c
@@ -6988,9 +10177,9 @@ Date:	Thu Feb 23 22:56:17 2012 +0100
 
     Bug #35468
 
- poppler/CharCodeToUnicode.cc |   18 +++++++++++++-----
- poppler/CharCodeToUnicode.h  |    7 +++++--
- poppler/GfxFont.cc	      |   13 +++++++------
+ poppler/CharCodeToUnicode.cc | 18 +++++++++++++-----
+ poppler/CharCodeToUnicode.h  |  7 +++++--
+ poppler/GfxFont.cc	      | 13 +++++++------
  3 files changed, 25 insertions(+), 13 deletions(-)
 
 commit 71104f1ec55d3be999afaa1b62405454b31066a9
@@ -6999,10 +10188,10 @@ Date:	Thu Feb 23 19:34:57 2012 +0100
 
     Remove unneded CharCodeToUnicode includes
 
- poppler/ArthurOutputDev.cc |	 3 +--
- poppler/CairoFontEngine.cc |	 3 +--
- poppler/CairoOutputDev.cc  |	 3 +--
- poppler/SplashOutputDev.cc |	 3 +--
+ poppler/ArthurOutputDev.cc | 3 +--
+ poppler/CairoFontEngine.cc | 3 +--
+ poppler/CairoOutputDev.cc  | 3 +--
+ poppler/SplashOutputDev.cc | 3 +--
  4 files changed, 4 insertions(+), 8 deletions(-)
 
 commit c0c8cc1592ee6aa13157e34f8083b951d487a413
@@ -7011,7 +10200,7 @@ Date:	Thu Feb 23 21:13:23 2012 +1030
 
     glib docs: fix typo
 
- glib/poppler.h |    2 +-
+ glib/poppler.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fde3bed0f400a50f31f1f6bcee44ac1b2c17ddc6
@@ -7023,7 +10212,7 @@ Date:	Wed Feb 22 00:03:37 2012 +0100
     Based on a patch by Adrian Johnson
     Bug 23075
 
- utils/pdfinfo.cc |   14 ++++++++++++--
+ utils/pdfinfo.cc | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit 3361564364a1799fc3d6c6df9f208c5531c407dc
@@ -7034,9 +10223,9 @@ Date:	Tue Feb 21 22:20:02 2012 +0100
 
     Bug 7002
 
- poppler/GfxFont.cc	     |	 14 +++++++++++++-
- poppler/UnicodeTypeTable.cc |	  9 +++++++++
- poppler/UnicodeTypeTable.h  |	  3 +++
+ poppler/GfxFont.cc	     | 14 +++++++++++++-
+ poppler/UnicodeTypeTable.cc |	9 +++++++++
+ poppler/UnicodeTypeTable.h  |	3 +++
  3 files changed, 25 insertions(+), 1 deletion(-)
 
 commit d0186c558f4a84a9317687ad50b460d34fb5fdf0
@@ -7049,11 +10238,11 @@ Date:	Mon Feb 20 22:18:00 2012 +0100
     CMake build system,
     importing the FindLCMS2.cmake from kdelibs
 
- CMakeLists.txt		       |   26 +++++++++++++--
- cmake/modules/FindLCMS2.cmake |   73
- +++++++++++++++++++++++++++++++++++++++++
- config.h.cmake		       |    3 ++
- utils/CMakeLists.txt	       |    3 ++
+ CMakeLists.txt		       | 26 +++++++++++++--
+ cmake/modules/FindLCMS2.cmake | 73
+ +++++++++++++++++++++++++++++++++++++++++++
+ config.h.cmake		       |  3 ++
+ utils/CMakeLists.txt	       |  3 ++
  4 files changed, 102 insertions(+), 3 deletions(-)
 
 commit e48c22d3b70412015b9cc07a9a6ce07845274e13
@@ -7062,11 +10251,11 @@ Date:	Mon Feb 20 22:04:01 2012 +0100
 
     Add support for lcms2
 
- configure.ac		     |	 24 ++++++-
- poppler/GfxState.cc	     |	159
- +++++++++++++++++++++++++++----------------
- qt4/src/poppler-document.cc |	  5 ++
- utils/pdftocairo.cc	     |	 17 +++++
+ configure.ac		     |	24 ++++++-
+ poppler/GfxState.cc	     | 159
+ +++++++++++++++++++++++++++-----------------
+ qt4/src/poppler-document.cc |	 5 ++
+ utils/pdftocairo.cc	     |	17 +++++
  4 files changed, 143 insertions(+), 62 deletions(-)
 
 commit 1bcae7aa8f87cc85ee6b477bf0abb49452e46505
@@ -7075,7 +10264,7 @@ Date:	Sun Feb 19 23:40:50 2012 +0100
 
     Consistently check if pdftohtml needs to generate outlines.
 
- utils/pdftohtml.cc |	 9 ++++++++-
+ utils/pdftohtml.cc | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 126bf08105e319f9216654782e5a63f99f1d1825
@@ -7089,8 +10278,8 @@ Date:	Sun Feb 19 23:18:25 2012 +0100
     Kudos to Adrian Johnson for find what was missing :-)
     Bug #13131
 
- poppler/NameToUnicodeTable.h |  213
- ++++++++++++++++++++++++++++++++++++++++--
+ poppler/NameToUnicodeTable.h | 213
+ +++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 207 insertions(+), 6 deletions(-)
 
 commit c0fec84312a37f62bdbfdee7c8e9b520af28330a
@@ -7099,7 +10288,7 @@ Date:	Sun Feb 19 14:47:24 2012 +0100
 
     fix typo, GString -> GooString
 
- goo/GooString.h |    2 +-
+ goo/GooString.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit aaae8996766f259dcc329755c7cccde7c916c1fb
@@ -7110,7 +10299,7 @@ Date:	Thu Feb 16 22:22:15 2012 +1030
 
     Bug 40828
 
- poppler/CairoOutputDev.cc |	1 +
+ poppler/CairoOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit fff439f25d9bbd199db5646deccd80733138898e
@@ -7119,7 +10308,7 @@ Date:	Sun Feb 19 15:45:31 2012 +1030
 
     update .gitignore
 
- utils/.gitignore |    1 +
+ utils/.gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 1cc3e152d6e879eb13fbdf2964ede3e01d13d097
@@ -7128,7 +10317,7 @@ Date:	Sun Feb 19 15:43:09 2012 +1030
 
     glib docs: fix typo
 
- glib/poppler-page.cc |    2 +-
+ glib/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4f4db591276ec156c55b3a3c2020a1cf82f1519b
@@ -7137,7 +10326,7 @@ Date:	Sun Feb 19 15:37:04 2012 +1030
 
     cairo: fix pdftocairo crash when pdf document uses actualText
 
- poppler/CairoOutputDev.cc |	2 +-
+ poppler/CairoOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9b72ee4e4c8658b2f7cd542d601a5c3be621d3fc
@@ -7146,8 +10335,8 @@ Date:	Sat Feb 18 17:34:12 2012 +0100
 
     Make some of the unfilteredResets be really unfiltered
 
- poppler/Stream.cc |   26 ++++++++++++++++++++------
- poppler/Stream.h  |	3 +++
+ poppler/Stream.cc | 26 ++++++++++++++++++++------
+ poppler/Stream.h  |  3 +++
  2 files changed, 23 insertions(+), 6 deletions(-)
 
 commit 33aded82fbd98832eaab7cb7487fe6a1c7ef15f5
@@ -7160,9 +10349,9 @@ Date:	Sat Feb 18 17:21:10 2012 +0100
     getNumObjects returns size as it did
     Kill getSize as it just returns the same as getNumObjects
 
- poppler/PDFDoc.cc |   10 +++++-----
- poppler/XRef.cc   |   12 +-----------
- poppler/XRef.h    |	6 ++----
+ poppler/PDFDoc.cc | 10 +++++-----
+ poppler/XRef.cc   | 12 +-----------
+ poppler/XRef.h    |  6 ++----
  3 files changed, 8 insertions(+), 20 deletions(-)
 
 commit 521d3740e9b7d2cfacf29f089a4a8f6c962de807
@@ -7173,11 +10362,11 @@ Date:	Mon Feb 13 22:05:18 2012 +1030
 
     Bug 46066
 
- utils/ImageOutputDev.cc |  204
- +++++++++++++++++++++++++++++++++++++++++------
- utils/ImageOutputDev.h  |   20 ++++-
- utils/pdfimages.1	 |  101 +++++++++++++++++++++++
- utils/pdfimages.cc	 |   12 ++-
+ utils/ImageOutputDev.cc | 204
+ ++++++++++++++++++++++++++++++++++++++++++------
+ utils/ImageOutputDev.h  |  20 ++++-
+ utils/pdfimages.1	 | 101 ++++++++++++++++++++++++
+ utils/pdfimages.cc	 |  12 ++-
  4 files changed, 307 insertions(+), 30 deletions(-)
 
 commit 119b6b752314c9b13440eddf5bd1d5cef2966e80
@@ -7188,7 +10377,7 @@ Date:	Mon Feb 6 16:50:11 2012 +1030
 
     Bug 45668
 
- poppler/CairoOutputDev.cc |	3 ++-
+ poppler/CairoOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit a76135391555145ec740d49a7141e60da0ea5dee
@@ -7199,23 +10388,23 @@ Date:	Tue Feb 14 20:11:19 2012 +0100
 
     This makes 'make distcheck' run succesfully.
 
- CMakeLists.txt			 |   20 +++++++++++++++++++
- Makefile.am			 |    2 +-
- configure.ac			 |   42
- +++++++++++++++++++++++++++++++++++++++
- qt4/tests/CMakeLists.txt	 |    1 +
- qt4/tests/Makefile.am		 |    1 +
- qt4/tests/check_actualtext.cpp  |    2 +-
- qt4/tests/check_attachments.cpp |   14 ++++++-------
- qt4/tests/check_fonts.cpp	 |   18 ++++++++---------
- qt4/tests/check_links.cpp	 |    6 +++---
- qt4/tests/check_metadata.cpp	 |   32 ++++++++++++++---------------
- qt4/tests/check_optcontent.cpp  |   12 +++++------
- qt4/tests/check_pagelayout.cpp  |    6 +++---
- qt4/tests/check_pagemode.cpp	 |   10 +++++-----
- qt4/tests/check_password.cpp	 |   12 +++++------
- qt4/tests/check_permissions.cpp |    2 +-
- qt4/tests/check_search.cpp	 |    4 ++--
+ CMakeLists.txt			 | 20 ++++++++++++++++++++
+ Makefile.am			 |  2 +-
+ configure.ac			 | 42
+ +++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/CMakeLists.txt	 |  1 +
+ qt4/tests/Makefile.am		 |  1 +
+ qt4/tests/check_actualtext.cpp  |  2 +-
+ qt4/tests/check_attachments.cpp | 14 +++++++-------
+ qt4/tests/check_fonts.cpp	 | 18 +++++++++---------
+ qt4/tests/check_links.cpp	 |  6 +++---
+ qt4/tests/check_metadata.cpp	 | 32 +++++++++++++++----------------
+ qt4/tests/check_optcontent.cpp  | 12 ++++++------
+ qt4/tests/check_pagelayout.cpp  |  6 +++---
+ qt4/tests/check_pagemode.cpp	 | 10 +++++-----
+ qt4/tests/check_password.cpp	 | 12 ++++++------
+ qt4/tests/check_permissions.cpp |  2 +-
+ qt4/tests/check_search.cpp	 |  4 ++--
  16 files changed, 124 insertions(+), 60 deletions(-)
 
 commit 59946e0c34e762eb5f5a13b4ae8c9ec7fb21379a
@@ -7289,16 +10478,16 @@ Date:	Tue Feb 14 19:37:21 2012 +0100
     The overprint switch in pdftoppm is still only available if compiled
     with the SPLASH_CMYK directive.
 
- poppler/PSOutputDev.cc     |	67 ++++++++++--
- poppler/PSOutputDev.h	    |	 3 +-
- poppler/SplashOutputDev.cc |	62 +++++++++--
- poppler/SplashOutputDev.h  |	 4 +-
- splash/Splash.cc	    |	70 +++++++++----
- splash/Splash.h	    |	 4 +-
- splash/SplashState.cc	    |	 5 +-
- splash/SplashState.h	    |  247
- ++++++++++++++++++++++----------------------
- utils/pdftops.cc	    |	13 +++
+ poppler/PSOutputDev.cc     |  67 ++++++++++--
+ poppler/PSOutputDev.h	    |	3 +-
+ poppler/SplashOutputDev.cc |  62 ++++++++++--
+ poppler/SplashOutputDev.h  |	4 +-
+ splash/Splash.cc	    |  70 +++++++++----
+ splash/Splash.h	    |	4 +-
+ splash/SplashState.cc	    |	5 +-
+ splash/SplashState.h	    | 247
+ +++++++++++++++++++++++----------------------
+ utils/pdftops.cc	    |  13 +++
  9 files changed, 308 insertions(+), 167 deletions(-)
 
 commit b505920db6d3dac58c7e9f4f8917f4c4449b08a0
@@ -7318,7 +10507,7 @@ Date:	Sun Feb 12 23:16:41 2012 +0100
 
     Improve moc detection when cross compiling
 
- configure.ac |    6 ++++--
+ configure.ac | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 66cf1fdb3ba6894f61d9078f5c30046b464347ae
@@ -7327,9 +10516,9 @@ Date:	Sun Feb 12 22:27:58 2012 +0100
 
     qt4: remove non-existing 'qt' include dirs
 
- qt4/demos/Makefile.am |    1 -
- qt4/src/Makefile.am   |    1 -
- qt4/tests/Makefile.am |    1 -
+ qt4/demos/Makefile.am | 1 -
+ qt4/src/Makefile.am   | 1 -
+ qt4/tests/Makefile.am | 1 -
  3 files changed, 3 deletions(-)
 
 commit 53d8fc4d2978b70e8926e3df71facd1f39de9348
@@ -7338,8 +10527,8 @@ Date:	Sun Feb 12 17:36:55 2012 +0100
 
     man pages: fix minor issues with hypens and %
 
- utils/pdfseparate.1 |	  6 +++---
- utils/pdftocairo.1  |	  4 ++--
+ utils/pdfseparate.1 | 6 +++---
+ utils/pdftocairo.1  | 4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit a63128179c65b5d9d6d9d41fa601a593b0a05d94
@@ -7348,7 +10537,7 @@ Date:	Thu Feb 9 22:02:52 2012 +0100
 
     [xpdf303] Fix merge issue
 
- utils/pdftoppm.cc |	2 +-
+ utils/pdftoppm.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cd5a6a4d02e579e543067d1847164aff90363f16
@@ -7357,7 +10546,7 @@ Date:	Thu Feb 9 22:01:42 2012 +0100
 
     [xpdf303] Fix merge bug
 
- poppler/GfxState.cc |	  2 +-
+ poppler/GfxState.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 597fa37cacec928c40d0491174ce843fe01f26d9
@@ -7370,7 +10559,7 @@ Date:	Wed Feb 8 19:22:13 2012 -0500
     Bug #45807
     (cherry picked from commit bf81250ff7d0968852fc7559fafb6389cd695b91)
 
- utils/HtmlOutputDev.cc |    9 ++++++---
+ utils/HtmlOutputDev.cc | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 2fc36dba5f63703896722adb5127896e4c2840e7
@@ -7383,9 +10572,9 @@ Date:	Thu Feb 9 00:15:13 2012 +0100
     imgNum is always equal to imgList->getLength()+1
     imgList is now maintained in HtmlPage.
 
- utils/HtmlOutputDev.cc |  143
- +++++++++++++++++++-----------------------------
- utils/HtmlOutputDev.h	|   15 +++--
+ utils/HtmlOutputDev.cc | 143
+ +++++++++++++++++++------------------------------
+ utils/HtmlOutputDev.h	|  15 ++++--
  2 files changed, 65 insertions(+), 93 deletions(-)
 
 commit f655efe327ddd3b6a68353a62589d4e4f8a318a8
@@ -7397,9 +10586,9 @@ Date:	Wed Feb 8 23:58:27 2012 +0100
     Bug #45805
     (cherry picked from commit 53a0c2043dfd56f6da7780f1a049f75af368b84b)
 
- utils/HtmlOutputDev.cc |   47
+ utils/HtmlOutputDev.cc | 47
  ++++++++++++++++++++++++-----------------------
- utils/HtmlOutputDev.h	|    7 ++++---
+ utils/HtmlOutputDev.h	|  7 ++++---
  2 files changed, 28 insertions(+), 26 deletions(-)
 
 commit 68f02d19c571fce956c7f4af6ccd0ff9ba8b1b03
@@ -7411,7 +10600,7 @@ Date:	Wed Feb 8 23:47:46 2012 +0100
     Bug #45805
     (cherry picked from commit 4afe4d827a342a847e8b89aba5b4164ed3b4cc32)
 
- utils/pdftohtml.cc |	 3 +--
+ utils/pdftohtml.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 2b7ba166c28e32653db4ae7acf90e06e0dd5975b
@@ -7420,8 +10609,8 @@ Date:	Wed Feb 8 19:12:52 2012 +0100
 
     [xpdf303] Compile fixes
 
- poppler/GlobalParamsWin.cc |	 2 +-
- poppler/SplashOutputDev.cc |	10 ----------
+ poppler/GlobalParamsWin.cc |  2 +-
+ poppler/SplashOutputDev.cc | 10 ----------
  2 files changed, 1 insertion(+), 11 deletions(-)
 
 commit b8c9b179c9491cf6755b07bfdec4174e78b7d241
@@ -7430,19 +10619,19 @@ Date:	Mon Feb 6 19:55:07 2012 +0100
 
     [xpdf303] Adapt better to what we did and what xpdf303 does
 
- poppler/ArthurOutputDev.cc   |    1 -
- poppler/GlobalParams.cc      |   10 ----------
- poppler/GlobalParams.h       |    1 -
- poppler/SplashOutputDev.cc   |    3 ---
- poppler/SplashOutputDev.h    |    1 -
- splash/SplashFTFont.cc       |   40
+ poppler/ArthurOutputDev.cc   |  1 -
+ poppler/GlobalParams.cc      | 10 ----------
+ poppler/GlobalParams.h       |  1 -
+ poppler/SplashOutputDev.cc   |  3 ---
+ poppler/SplashOutputDev.h    |  1 -
+ splash/SplashFTFont.cc       | 40
  +++++++++++++++++++---------------------
- splash/SplashFTFont.h	      |    1 -
- splash/SplashFTFontEngine.cc |    7 +++----
- splash/SplashFTFontEngine.h  |    5 ++---
- splash/SplashFontEngine.cc   |    3 +--
- splash/SplashFontEngine.h    |    1 -
- utils/pdftoppm.cc	      |    2 +-
+ splash/SplashFTFont.h	      |  1 -
+ splash/SplashFTFontEngine.cc |  7 +++----
+ splash/SplashFTFontEngine.h  |  5 ++---
+ splash/SplashFontEngine.cc   |  3 +--
+ splash/SplashFontEngine.h    |  1 -
+ utils/pdftoppm.cc	      |  2 +-
  12 files changed, 26 insertions(+), 49 deletions(-)
 
 commit ea6bc19564865e04431d9154802ae7fba975a716
@@ -7468,19 +10657,19 @@ Date:	Mon Feb 6 00:25:53 2012 +0100
 
     [xpdf303] TextOutputDev and associated changes
 
- cpp/poppler-page.cpp	    |	10 +-
- glib/poppler-page.cc	    |	 5 +-
- poppler/ArthurOutputDev.cc |	 1 +
- poppler/CairoOutputDev.cc  |	 2 +-
- poppler/Gfx.cc		    |	 6 +-
- poppler/PSOutputDev.cc     |	 6 +-
- poppler/TextOutputDev.cc   |  360
- +++++++++++++++++++++++++++-----------------
- poppler/TextOutputDev.h    |	18 ++-
- qt4/src/poppler-page.cc    |	12 +-
- test/perf-test.cc	    |	 2 +-
- utils/pdftotext.1	    |	 4 +
- utils/pdftotext.cc	    |	10 +-
+ cpp/poppler-page.cpp	    |  10 +-
+ glib/poppler-page.cc	    |	5 +-
+ poppler/ArthurOutputDev.cc |	1 +
+ poppler/CairoOutputDev.cc  |	2 +-
+ poppler/Gfx.cc		    |	6 +-
+ poppler/PSOutputDev.cc     |	6 +-
+ poppler/TextOutputDev.cc   | 360
+ ++++++++++++++++++++++++++++-----------------
+ poppler/TextOutputDev.h    |  18 ++-
+ qt4/src/poppler-page.cc    |  12 +-
+ test/perf-test.cc	    |	2 +-
+ utils/pdftotext.1	    |	4 +
+ utils/pdftotext.cc	    |  10 +-
  12 files changed, 270 insertions(+), 166 deletions(-)
 
 commit 548648bf29dc1551443eb1925814342e7aadee46
@@ -7489,7 +10678,7 @@ Date:	Sun Feb 5 23:08:44 2012 +0100
 
     [xpdf303] Merge PDFDoc encryption related code
 
- poppler/PDFDoc.cc |	5 ++++-
+ poppler/PDFDoc.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 6ee907f291427b8751a872b31210bf32e8d2b722
@@ -7532,10 +10721,10 @@ Date:	Sun Feb 5 15:55:39 2012 +0100
 
 	utils/HtmlOutputDev.cc
 
- utils/HtmlOutputDev.cc |  197
- ++++++++++++++++++++++++++----------------------
- utils/HtmlOutputDev.h	|    6 +-
- utils/pdftohtml.cc	|    3 +-
+ utils/HtmlOutputDev.cc | 197
+ ++++++++++++++++++++++++++-----------------------
+ utils/HtmlOutputDev.h	|   6 +-
+ utils/pdftohtml.cc	|   3 +-
  3 files changed, 112 insertions(+), 94 deletions(-)
 
 commit 38ec58ed1cb54722aece875287b847643aa2c4b8
@@ -7546,7 +10735,7 @@ Date:	Sat Feb 4 17:13:30 2012 +1030
 
     Bug 45605
 
- poppler/Lexer.cc |    6 ++++--
+ poppler/Lexer.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit df89de61b7d01f0f816e773cdb809faa3053e962
@@ -7557,8 +10746,8 @@ Date:	Tue Jan 31 20:01:30 2012 +0100
 
     Fixes bug #45455.
 
- glib/CMakeLists.txt |	  2 +-
- glib/Makefile.am    |	  2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 88cb6d9360bc943fc2cdda262dc46bf831641541
@@ -7567,9 +10756,9 @@ Date:	Sat Feb 4 12:04:03 2012 +0100
 
     glib: Update gtk-doc makefile and m4 file
 
- gtk-doc.make  |  112
- ++++++++++++++++++++++++++++++++-------------------------
- m4/gtk-doc.m4 |    6 ++++
+ gtk-doc.make  | 112
+ +++++++++++++++++++++++++++++++++-------------------------
+ m4/gtk-doc.m4 |   6 ++++
  2 files changed, 70 insertions(+), 48 deletions(-)
 
 commit 3f4164f84bbf748a2f919741669ef20db0fbda9f
@@ -7580,7 +10769,7 @@ Date:	Wed Feb 1 10:44:17 2012 +0100
 
     Bug #45549.
 
- glib/reference/Makefile.am |	10 +++++-----
+ glib/reference/Makefile.am | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 8daeb82f982eba25fe8c7d07358f0a6593ddc89a
@@ -7594,7 +10783,7 @@ Date:	Thu Feb 2 13:01:45 2012 +0100
 
     Bug #45549.
 
- glib/poppler-page.cc |    4 ++--
+ glib/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f8ce9966e4f480949799a26c01bd861f4011b587
@@ -7605,7 +10794,7 @@ Date:	Sat Feb 4 11:51:34 2012 +0100
 
     Bug #45549.
 
- glib/poppler-document.cc |    7 +++----
+ glib/poppler-document.cc | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit f58f3525f135bc47e89c23c33e96e43db10d4853
@@ -7618,7 +10807,7 @@ Date:	Thu Feb 2 15:59:47 2012 +0100
 
     Bug #45549.
 
- glib/poppler-document.h |   26 +++++++++++++-------------
+ glib/poppler-document.h | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 commit 080247f6a47bc929b25f6e000f4474801af74b1f
@@ -7629,8 +10818,8 @@ Date:	Thu Feb 2 15:45:37 2012 +0100
 
     Bug #45549.
 
- glib/poppler-page.cc		     |	  6 ++----
- glib/reference/poppler-sections.txt |	  4 ----
+ glib/poppler-page.cc		     | 6 ++----
+ glib/reference/poppler-sections.txt | 4 ----
  2 files changed, 2 insertions(+), 8 deletions(-)
 
 commit 47780d9ed1fd69068fdb9b9782e2cb37e2a5b217
@@ -7643,7 +10832,7 @@ Date:	Thu Feb 2 15:43:30 2012 +0100
 
     Bug #45549.
 
- glib/reference/Makefile.am |	 2 +-
+ glib/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e320f335cc6e54c60bd2436799dd1f05beb060ba
@@ -7654,13 +10843,13 @@ Date:	Sat Feb 4 11:32:50 2012 +0100
 
     Bug #45549.
 
- glib/poppler-annot.cc		     |	  6 +++---
- glib/poppler-annot.h		     |	  2 +-
- glib/poppler-document.cc	     |	  2 +-
- glib/poppler-media.cc		     |	  2 +-
- glib/poppler-page.cc		     |	  3 +--
- glib/poppler-page.h		     |	  4 ++--
- glib/reference/poppler-sections.txt |	  4 +++-
+ glib/poppler-annot.cc		     | 6 +++---
+ glib/poppler-annot.h		     | 2 +-
+ glib/poppler-document.cc	     | 2 +-
+ glib/poppler-media.cc		     | 2 +-
+ glib/poppler-page.cc		     | 3 +--
+ glib/poppler-page.h		     | 4 ++--
+ glib/reference/poppler-sections.txt | 4 +++-
  7 files changed, 12 insertions(+), 11 deletions(-)
 
 commit 1fe27b07975e9a9455708563118fb73cce696f81
@@ -7671,7 +10860,7 @@ Date:	Tue Jan 31 12:49:01 2012 +0100
 
     Fixes bug #45442.
 
- poppler/CairoFontEngine.cc |	 3 +--
+ poppler/CairoFontEngine.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit e3d80c79815ce46daf3c3f2b944f49eaf19bfea5
@@ -7682,7 +10871,7 @@ Date:	Tue Jan 31 14:42:04 2012 +0100
 
     Fixes bug #45441.
 
- poppler/CairoRescaleBox.cc |	 2 +-
+ poppler/CairoRescaleBox.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e074e526fa206403b84da5ce0f27d7357223c7ac
@@ -7693,7 +10882,7 @@ Date:	Tue Jan 31 13:02:16 2012 +0100
 
     Fixes bug #45440.
 
- glib/poppler-attachment.cc |	 2 +-
+ glib/poppler-attachment.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bc389cff91c350d7da186d4cf707c389c77bbc29
@@ -7704,7 +10893,7 @@ Date:	Tue Jan 31 14:03:08 2012 +0100
 
     Bug #45439
 
- glib/demo/main.c |    2 ++
+ glib/demo/main.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit e52e3c24663edaa630d9187e832223b474b74089
@@ -7715,10 +10904,10 @@ Date:	Tue Jan 31 13:39:05 2012 +0100
 
     Bug #45439.
 
- glib/demo/annots.c	|    6 ++++++
- glib/demo/print.c	|    9 ++++++++-
- glib/demo/render.c	|   16 ++++++++++++++++
- glib/demo/selections.c |    8 ++++++++
+ glib/demo/annots.c	|  6 ++++++
+ glib/demo/print.c	|  9 ++++++++-
+ glib/demo/render.c	| 16 ++++++++++++++++
+ glib/demo/selections.c |  8 ++++++++
  4 files changed, 38 insertions(+), 1 deletion(-)
 
 commit 165ab4ec122d0e1a6f30dcfba80aefc422cd83b7
@@ -7729,7 +10918,7 @@ Date:	Tue Jan 31 12:15:51 2012 +0100
 
     Fixes bug #45434.
 
- glib/Makefile.am |    2 +-
+ glib/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e424a13bb516464d59ad76fd0933e92f3307b21b
@@ -7738,7 +10927,7 @@ Date:	Fri Feb 3 00:12:10 2012 +0100
 
     pdfseparate fixes by Thomas after his last commit
 
- poppler/PDFDoc.cc |	8 +++++++-
+ poppler/PDFDoc.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 4fcd42cfa4424992cd4b36af38bc6230ce0706c9
@@ -7749,27 +10938,27 @@ Date:	Wed Feb 1 22:53:03 2012 +0100
 
     Basically fonts related and some other small stuff
 
- poppler/Annot.cc	     |	  6 +-
- poppler/ArthurOutputDev.cc  |	 47 +--
- poppler/CMap.cc	     |	153 ++++++++
- poppler/CMap.h		     |	 16 +
- poppler/CairoFontEngine.cc  |	 43 +--
- poppler/CharCodeToUnicode.h |	  1 +
- poppler/FontInfo.cc	     |	  8 +-
- poppler/Gfx.cc		     |	363 +++++++++++--------
- poppler/GfxFont.cc	     |	831
- +++++++++++++++++++++++++++++--------------
- poppler/GfxFont.h	     |	 34 +-
- poppler/GfxState.cc	     |	 81 +++--
- poppler/GfxState.h	     |	  2 +
- poppler/GlobalParams.cc     |	738 ++++++++++++++++++++++----------------
- poppler/GlobalParams.h      |	112 +++---
- poppler/GlobalParamsWin.cc  |	180 ++++++++--
- poppler/PSOutputDev.cc      |	591 +++++++++++++++---------------
- poppler/PSOutputDev.h	     |	 12 +-
- poppler/PreScanOutputDev.cc |	 10 +-
- poppler/SplashOutputDev.cc  |	 59 ++-
- poppler/XRef.cc	     |	 16 +-
+ poppler/Annot.cc	     |	 6 +-
+ poppler/ArthurOutputDev.cc  |	47 +--
+ poppler/CMap.cc	     | 153 ++++++++
+ poppler/CMap.h		     |	16 +
+ poppler/CairoFontEngine.cc  |	43 +--
+ poppler/CharCodeToUnicode.h |	 1 +
+ poppler/FontInfo.cc	     |	 8 +-
+ poppler/Gfx.cc		     | 363 +++++++++++--------
+ poppler/GfxFont.cc	     | 831
+ +++++++++++++++++++++++++++++---------------
+ poppler/GfxFont.h	     |	34 +-
+ poppler/GfxState.cc	     |	81 +++--
+ poppler/GfxState.h	     |	 2 +
+ poppler/GlobalParams.cc     | 738 ++++++++++++++++++++++-----------------
+ poppler/GlobalParams.h      | 112 +++---
+ poppler/GlobalParamsWin.cc  | 180 ++++++++--
+ poppler/PSOutputDev.cc      | 591 +++++++++++++++----------------
+ poppler/PSOutputDev.h	     |	12 +-
+ poppler/PreScanOutputDev.cc |	10 +-
+ poppler/SplashOutputDev.cc  |	59 ++--
+ poppler/XRef.cc	     |	16 +-
  20 files changed, 2008 insertions(+), 1295 deletions(-)
 
 commit 0089357de8ea96f3e394ea9cb37e8182ccf15ae2
@@ -7779,10 +10968,10 @@ Date:	Wed Feb 1 19:17:38 2012 +0100
     pdfseparate: Produce PDF/X conformant pdf pages if the original PDF
     was PDF/X conformant.
 
- poppler/PDFDoc.cc |   63
- +++++++++++++++++++++++++++++++++--------------------
- poppler/XRef.cc   |	9 +++++++-
- poppler/XRef.h    |	5 ++++-
+ poppler/PDFDoc.cc | 63
+ ++++++++++++++++++++++++++++++++++---------------------
+ poppler/XRef.cc   |  9 +++++++-
+ poppler/XRef.h    |  5 ++++-
  3 files changed, 51 insertions(+), 26 deletions(-)
 
 commit be62a4f2e7d5db3b6d85d1b3026979f9561e6e15
@@ -7794,8 +10983,8 @@ Date:	Mon Jan 30 17:07:28 2012 +0100
     Fixes bug #45407.
     (cherry picked from commit 58c17c3a61f18a6808ec9ba37e82734a655090ac)
 
- glib/poppler-annot.cc	  |    1 +
- glib/poppler-document.cc |    1 +
+ glib/poppler-annot.cc	  | 1 +
+ glib/poppler-document.cc | 1 +
  2 files changed, 2 insertions(+)
 
 commit acbc63348ce5e279e4d66ed4f240dc8d61df4e57
@@ -7804,7 +10993,7 @@ Date:	Mon Jan 30 20:46:04 2012 +1030
 
     pdftocairo/automake: link with lcms
 
- utils/Makefile.am |	5 +++++
+ utils/Makefile.am | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 9548573a16629fecdbd44c9aac8b626ec6f53b81
@@ -7816,7 +11005,7 @@ Date:	Mon Jan 30 00:32:52 2012 +0100
     "port" to CMake of the automake equivalents of
     4765c3289635fe4fb006e7df4f83d7056eb42855
 
- glib/CMakeLists.txt |	  3 +++
+ glib/CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 commit bf2ffb1cc76bcf569419ac495f524c41bb6f1650
@@ -7825,7 +11014,7 @@ Date:	Mon Jan 30 00:21:31 2012 +0100
 
     cmake: support $(gir_name)_EXPORT_PACKAGES for g-ir-scanner
 
- cmake/modules/GObjectIntrospectionMacros.cmake |    2 ++
+ cmake/modules/GObjectIntrospectionMacros.cmake | 2 ++
  1 file changed, 2 insertions(+)
 
 commit cbe7131e63c5896010e7e1ad5c0c3aa91611704d
@@ -7837,10 +11026,10 @@ Date:	Fri Jan 27 00:36:18 2012 +0100
     Fixes/workarounds bug 43414 with openjpeg 1.5 (unreleased)
     (cherry picked from commit de6415af1a39ec7dfa4f149c6c5e311b86352cec)
 
- cmake/modules/FindLIBOPENJPEG.cmake |	 13 +++++++++++++
- config.h.cmake			     |	  3 +++
- configure.ac			     |	  8 ++++++++
- poppler/JPEG2000Stream.cc	     |	  7 ++++++-
+ cmake/modules/FindLIBOPENJPEG.cmake | 13 +++++++++++++
+ config.h.cmake			     |	3 +++
+ configure.ac			     |	8 ++++++++
+ poppler/JPEG2000Stream.cc	     |	7 ++++++-
  4 files changed, 30 insertions(+), 1 deletion(-)
 
 commit 641526d1a7e8032ea8f7b8ac42c5ad8c20448d9b
@@ -7858,7 +11047,7 @@ Date:	Wed Jan 25 22:44:27 2012 +1030
 
     Bug 45224
 
- goo/JpegWriter.cc |	6 ++++--
+ goo/JpegWriter.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit f7356a88fe983c2ddd7d5a50400768310a26c4d2
@@ -7867,7 +11056,7 @@ Date:	Thu Jan 26 11:33:28 2012 +1030
 
     glib: add section in docs for new symbols in 0.18
 
- glib/reference/poppler-docs.sgml |    4 ++++
+ glib/reference/poppler-docs.sgml | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit b42c171de93dba56859beb21cfe5312d825fedd6
@@ -7878,8 +11067,8 @@ Date:	Mon Jan 23 22:07:15 2012 +0100
 
     Bug 44905
 
- splash/SplashXPath.cc |   69
- +++++++++++++++++++++++++++++++++++--------------
+ splash/SplashXPath.cc | 69
+ ++++++++++++++++++++++++++++++++++++---------------
  1 file changed, 49 insertions(+), 20 deletions(-)
 
 commit a04fca6266bda6d04068f38f16fe492cb6b8677b
@@ -7892,7 +11081,7 @@ Date:	Sat Jan 21 09:41:12 2012 +1030
 
     Bug 43441
 
- poppler/CairoOutputDev.cc |	2 +-
+ poppler/CairoOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ce1b6c7ca16847f07eeafc29c6503be6fa5a9a3d
@@ -7903,7 +11092,7 @@ Date:	Thu Jan 19 14:54:48 2012 +0100
 
     Fixes bug #14619.
 
- poppler/CairoOutputDev.cc |	8 +++++++-
+ poppler/CairoOutputDev.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 4765c3289635fe4fb006e7df4f83d7056eb42855
@@ -7914,12 +11103,12 @@ Date:	Sun Jan 15 11:02:50 2012 -0800
 
     Bug 44790
 
- glib/Makefile.am	   |	4 +++-
- glib/poppler-annot.cc	   |	8 ++++----
- glib/poppler-attachment.h |	7 ++++---
- glib/poppler-document.cc  |	6 ++++--
- glib/poppler-media.h	   |	7 ++++---
- glib/poppler-page.cc	   |   23 +++++++++++++++--------
+ glib/Makefile.am	   |  4 +++-
+ glib/poppler-annot.cc	   |  8 ++++----
+ glib/poppler-attachment.h |  7 ++++---
+ glib/poppler-document.cc  |  6 ++++--
+ glib/poppler-media.h	   |  7 ++++---
+ glib/poppler-page.cc	   | 23 +++++++++++++++--------
  6 files changed, 34 insertions(+), 21 deletions(-)
 
 commit e8e42988c5cebab2ffa5fe020f30a3a645e90b5f
@@ -7931,8 +11120,8 @@ Date:	Mon Jan 16 21:25:19 2012 +1030
 
     Bug 29968
 
- poppler/CairoOutputDev.cc |	8 ++++++--
- poppler/CairoOutputDev.h  |	1 +
+ poppler/CairoOutputDev.cc | 8 ++++++--
+ poppler/CairoOutputDev.h  | 1 +
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit f6c7aa752f9455bba1aa3c72e0998e7911c1d43e
@@ -7941,7 +11130,7 @@ Date:	Wed Jan 18 21:19:43 2012 +1030
 
     configure.ac: print the glib version required if not found
 
- configure.ac |   10 ++++++++--
+ configure.ac | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 100488ec7db2d1f3e25bfda42c1603ca86696195
@@ -7954,7 +11143,7 @@ Date:	Sun Jan 15 23:52:28 2012 +1030
     The clip is only used to clip the paint to the fill path so it should
     be moved inside the save/restore.
 
- poppler/CairoOutputDev.cc |	2 +-
+ poppler/CairoOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9c092e17e8f0cf0335b431a223e6e44bddc27e64
@@ -8043,7 +11232,7 @@ Date:	Sun Jan 15 15:07:18 2012 +0100
 
     Bug 44660
 
- poppler/PDFDoc.cc |	4 +++-
+ poppler/PDFDoc.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit cdb56567c60b492ad08befff54f2ff70620b86fe
@@ -8052,7 +11241,7 @@ Date:	Sun Jan 15 15:04:51 2012 +0100
 
     Correctly initialize globalParams
 
- utils/pdfseparate.cc |    5 ++++-
+ utils/pdfseparate.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 4e205a6625431dcf95375de009b4354746a4f0b7
@@ -8068,7 +11257,7 @@ Date:	Sun Jan 15 22:18:30 2012 +1030
     CALC_STRING_LEN default argument indicating the string length is to be
     calculated with strlen.
 
- utils/parseargs.cc |	 3 +--
+ utils/parseargs.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit a7210a7ebc3d3ca88643bfbc2f0d660a5553a668
@@ -8079,7 +11268,7 @@ Date:	Fri Jan 13 18:52:17 2012 +0100
 
     Bug 44659
 
- utils/pdfunite.cc |	4 ++++
+ utils/pdfunite.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit baaf93f0e47a1978f9ea80e9394543a25b763d77
@@ -8090,7 +11279,7 @@ Date:	Thu Jan 12 01:05:07 2012 +1030
 
     Bug 44619
 
- configure.ac |    9 +++++++--
+ configure.ac | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 9b8b4232587831fdada37de033c272a3c5049c34
@@ -8101,7 +11290,7 @@ Date:	Thu Jan 12 00:26:03 2012 +1030
 
     Bug 44002
 
- poppler/CairoOutputDev.cc |   21 ++++++++++++---------
+ poppler/CairoOutputDev.cc | 21 ++++++++++++---------
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 commit efe115f22f8f00a2863ef265ad6f4e7cc2e0336c
@@ -8110,7 +11299,7 @@ Date:	Tue Jan 10 23:41:54 2012 +0100
 
     compile
 
- poppler/ArthurOutputDev.cc |	 1 +
+ poppler/ArthurOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 52d190d8ff962a57a59218f6871c3a63a443ea53
@@ -8120,23 +11309,23 @@ Date:	Tue Jan 10 23:33:40 2012 +0100
     [xpdf303] tiling "merges" from Thomas, using mostly our "old" code
     instead of xpdf's
 
- poppler/CairoOutputDev.cc   |	  2 +-
- poppler/CairoOutputDev.h    |	  4 ++--
- poppler/Gfx.cc		     |	 45
- +++++++++++++++++++++++++++++++------------
- poppler/Gfx.h		     |	 15 +++++++++------
- poppler/GfxState.cc	     |	  5 ++++-
- poppler/GfxState.h	     |	  7 ++++---
- poppler/OutputDev.h	     |	  3 ++-
- poppler/PSOutputDev.cc      |	  2 +-
- poppler/PSOutputDev.h	     |	  2 +-
- poppler/PreScanOutputDev.cc |	 15 +++++++--------
- poppler/PreScanOutputDev.h  |	  2 +-
- poppler/SplashOutputDev.cc  |	  8 ++++++--
- poppler/SplashOutputDev.h   |	  3 ++-
- splash/Splash.cc	     |	 32 ++++++++++++++++++++++--------
- utils/ImageOutputDev.cc     |	  2 +-
- utils/ImageOutputDev.h      |	  2 +-
+ poppler/CairoOutputDev.cc   |	2 +-
+ poppler/CairoOutputDev.h    |	4 ++--
+ poppler/Gfx.cc		     | 45
+ +++++++++++++++++++++++++++++++++------------
+ poppler/Gfx.h		     | 15 +++++++++------
+ poppler/GfxState.cc	     |	5 ++++-
+ poppler/GfxState.h	     |	7 ++++---
+ poppler/OutputDev.h	     |	3 ++-
+ poppler/PSOutputDev.cc      |	2 +-
+ poppler/PSOutputDev.h	     |	2 +-
+ poppler/PreScanOutputDev.cc | 15 +++++++--------
+ poppler/PreScanOutputDev.h  |	2 +-
+ poppler/SplashOutputDev.cc  |	8 ++++++--
+ poppler/SplashOutputDev.h   |	3 ++-
+ splash/Splash.cc	     | 32 ++++++++++++++++++++++++--------
+ utils/ImageOutputDev.cc     |	2 +-
+ utils/ImageOutputDev.h      |	2 +-
  16 files changed, 99 insertions(+), 50 deletions(-)
 
 commit bf75a957650dd5208ecf1f6db1555a3d00b7949c
@@ -8145,7 +11334,7 @@ Date:	Tue Jan 10 23:31:27 2012 +0100
 
     [xpdf303] Splash::blitTransparent merges from Thomas
 
- splash/Splash.cc |   10 +++++++---
+ splash/Splash.cc | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 commit 296244ab74e56b2781daae0a664617d1da30527c
@@ -8154,7 +11343,7 @@ Date:	Tue Jan 10 23:30:34 2012 +0100
 
     [xpdf303] Merge xpath Splash stuff from Thomas
 
- splash/SplashXPath.cc |   22 +++++++++++++---------
+ splash/SplashXPath.cc | 22 +++++++++++++---------
  1 file changed, 13 insertions(+), 9 deletions(-)
 
 commit e1ae7b900b01db7c7703da68ad94aa9bda1938f6
@@ -8163,16 +11352,16 @@ Date:	Tue Jan 10 23:29:38 2012 +0100
 
     [xpdf303] Merge splash font stuff from Thomas
 
- poppler/GlobalParams.cc      |   17 +++++++++++++++++
- poppler/GlobalParams.h       |    3 +++
- poppler/SplashOutputDev.cc   |    3 +++
- poppler/SplashOutputDev.h    |    1 +
- splash/SplashFTFont.cc       |   34 ++++++++++++++++++++++++++++------
- splash/SplashFTFont.h	      |    1 +
- splash/SplashFTFontEngine.cc |    7 ++++---
- splash/SplashFTFontEngine.h  |    5 +++--
- splash/SplashFontEngine.cc   |    3 ++-
- splash/SplashFontEngine.h    |    1 +
+ poppler/GlobalParams.cc      | 17 +++++++++++++++++
+ poppler/GlobalParams.h       |  3 +++
+ poppler/SplashOutputDev.cc   |  3 +++
+ poppler/SplashOutputDev.h    |  1 +
+ splash/SplashFTFont.cc       | 34 ++++++++++++++++++++++++++++------
+ splash/SplashFTFont.h	      |  1 +
+ splash/SplashFTFontEngine.cc |  7 ++++---
+ splash/SplashFTFontEngine.h  |  5 +++--
+ splash/SplashFontEngine.cc   |  3 ++-
+ splash/SplashFontEngine.h    |  1 +
  10 files changed, 63 insertions(+), 12 deletions(-)
 
 commit d46b673c46a72132fb3918b64733be552e35952f
@@ -8192,7 +11381,7 @@ Date:	Sun Jan 8 21:35:41 2012 +1030
 
     Fix typo in pdffonts man page
 
- utils/pdffonts.1 |    2 +-
+ utils/pdffonts.1 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 34ae382915d9d9b2b3c015fee3c24907a6b52b8b
@@ -8245,7 +11434,7 @@ Date:	Sat Jan 7 11:47:19 2012 +0100
     subprocess
     ends, will remove this deadlock.
 
- regtest/backends/__init__.py |    8 ++++----
+ regtest/backends/__init__.py | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit da6bfacb0f858f27bd47f247a25d6bc9ab778411
@@ -8257,13 +11446,13 @@ Date:	Sat Jan 7 10:35:17 2012 +1030
 
     Bug 44416
 
- poppler/FontInfo.cc	 |    8 ++++--
- poppler/FontInfo.h	 |    2 ++
- poppler/GlobalParams.cc |   29 ++++++++++++++++++--
- poppler/GlobalParams.h  |    3 ++-
- utils/pdffonts.1	 |    3 +++
- utils/pdffonts.cc	 |   67
- +++++++++++++++++++++++++++++++++--------------
+ poppler/FontInfo.cc	 |  8 ++++--
+ poppler/FontInfo.h	 |  2 ++
+ poppler/GlobalParams.cc | 29 +++++++++++++++++++--
+ poppler/GlobalParams.h  |  3 ++-
+ utils/pdffonts.1	 |  3 +++
+ utils/pdffonts.cc	 | 67
+ +++++++++++++++++++++++++++++++++++--------------
  6 files changed, 88 insertions(+), 24 deletions(-)
 
 commit 9979b1b3e36dc8085d8c684692fece463fa474b1
@@ -8274,8 +11463,8 @@ Date:	Sat Jan 7 09:44:42 2012 +1030
 
     Bug 44412
 
- poppler/GfxFont.cc	 |    2 +-
- poppler/GlobalParams.cc |    2 +-
+ poppler/GfxFont.cc	 | 2 +-
+ poppler/GlobalParams.cc | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit ebfab832ab4f2642b9ab2ededd25de670a3c7147
@@ -8289,8 +11478,8 @@ Date:	Fri Dec 23 09:55:20 2011 +1030
 
     Bug 43969
 
- configure.ac	   |   14 ++++++++++++--
- utils/Makefile.am |	4 ++--
+ configure.ac	   | 14 ++++++++++++--
+ utils/Makefile.am |  4 ++--
  2 files changed, 14 insertions(+), 4 deletions(-)
 
 commit 51ca2b7c7dec5430d29860fd887ad5c5d9b3f574
@@ -8299,7 +11488,7 @@ Date:	Thu Dec 15 00:26:09 2011 +0100
 
     [xpdf303] Some more changes in TextOutputDev
 
- poppler/TextOutputDev.cc |   23 ++++++++++++++++-------
+ poppler/TextOutputDev.cc | 23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 
 commit c5ce12993a4d2bcd3b3e95b1f08d00dc8960678c
@@ -8310,9 +11499,9 @@ Date:	Wed Dec 14 22:49:33 2011 +0100
 
     Yes, this is the best commit log i could think of
 
- poppler/TextOutputDev.cc |  268
- +++++++++++++++++++++++++++++-----------------
- poppler/TextOutputDev.h  |   19 ++--
+ poppler/TextOutputDev.cc | 268
+ ++++++++++++++++++++++++++++++-----------------
+ poppler/TextOutputDev.h  |  19 ++--
  2 files changed, 180 insertions(+), 107 deletions(-)
 
 commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b
@@ -8323,7 +11512,7 @@ Date:	Tue Dec 6 23:21:15 2011 +0100
 
     Fixes bug 43558
 
- goo/PNGWriter.cc |    3 ++-
+ goo/PNGWriter.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 743f70f594bf3c9a58d1ff0738b9a2bc3ea03382
@@ -8336,14 +11525,14 @@ Date:	Tue Dec 6 20:27:03 2011 +0100
     of arrays one inside the other [[[[[[[[[[[[[[[[[[[
     So go to this more crude "fix" used in xpdf
 
- poppler/Dict.cc   |	4 ++--
- poppler/Dict.h    |	2 +-
- poppler/Object.cc |	4 ++--
- poppler/Object.h  |	8 ++++----
- poppler/Parser.cc |   32 +++++++++++++++-----------------
- poppler/Parser.h  |   10 +++-------
- poppler/XRef.cc   |   33 +++++++--------------------------
- poppler/XRef.h    |	2 +-
+ poppler/Dict.cc   |  4 ++--
+ poppler/Dict.h    |  2 +-
+ poppler/Object.cc |  4 ++--
+ poppler/Object.h  |  8 ++++----
+ poppler/Parser.cc | 32 +++++++++++++++-----------------
+ poppler/Parser.h  | 10 +++-------
+ poppler/XRef.cc   | 33 +++++++--------------------------
+ poppler/XRef.h    |  2 +-
  8 files changed, 35 insertions(+), 60 deletions(-)
 
 commit 63c942a45227ef28fb94ef4765171d9812fffafa
@@ -8355,8 +11544,7 @@ Date:	Sun Dec 4 17:29:45 2011 +0100
 
     Fixes KDE bug #288045
 
- poppler/PDFDoc.cc |   49
- +++++++++++++++++++++++++++++--------------------
+ poppler/PDFDoc.cc | 49 +++++++++++++++++++++++++++++--------------------
  1 file changed, 29 insertions(+), 20 deletions(-)
 
 commit 0937d775e59a963b72fa7924e0f7be484f8345fc
@@ -8366,7 +11554,7 @@ Date:	Sun Dec 4 15:37:20 2011 +0100
     update name and copyright
     (cherry picked from commit 22601c2a64f094ede8085a3ccca3de9daaa556e7)
 
- utils/pdftocairo.cc |	  3 ++-
+ utils/pdftocairo.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit bdb439ac5a751d6146204ae0d61fdbf7828c89c3
@@ -8376,7 +11564,7 @@ Date:	Thu Nov 24 22:32:57 2011 +0100
     Fix typo/regression introduced in
     f6d026bfa18624ccd321e102bb39ba744998de1e
 
- poppler/Gfx.cc |    3 ++-
+ poppler/Gfx.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 74e11d8c912dd95d235e44e7b34b8ea1be082b9f
@@ -8385,7 +11573,7 @@ Date:	Thu Nov 24 18:54:27 2011 +0100
 
     Fix typo
 
- qt4/src/poppler-qt4.h |    4 ++--
+ qt4/src/poppler-qt4.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ec2a1c3fca92a28c56911729927838f7aacf1078
@@ -8394,7 +11582,7 @@ Date:	Wed Nov 16 23:13:52 2011 +0100
 
     xpdf303: Use the correct sizeof() for the greallocn
 
- poppler/XRef.cc |    2 +-
+ poppler/XRef.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 544440b9d19ce99f3a7fcacdea70999b1efc217f
@@ -8403,7 +11591,7 @@ Date:	Wed Nov 16 23:09:23 2011 +0100
 
     xpdf303: Add XRef::getPermFlags
 
- poppler/XRef.h |    1 +
+ poppler/XRef.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit b2e43e531edcecaeacf02a627c98cf7ef57f3e3c
@@ -8412,7 +11600,7 @@ Date:	Wed Nov 16 23:04:04 2011 +0100
 
     xpdf303: make strToUnsigned "safer"
 
- poppler/PDFDoc.cc |   11 +++++++----
+ poppler/PDFDoc.cc | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit bd1513742182ed4c80d21401dd30180981879f24
@@ -8422,7 +11610,7 @@ Date:	Wed Nov 16 22:59:12 2011 +0100
     xpdf303: Check xrefEntryCompressed entries to be of correct type
     and in bounds
 
- poppler/XRef.cc |    5 +++++
+ poppler/XRef.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 3bf3e82d1f3eb19a454239d8c7641fc68ff4e462
@@ -8432,7 +11620,7 @@ Date:	Wed Nov 16 22:54:17 2011 +0100
     xpdf303: Adobe apparently ignores the generation number on compressed
     objects
 
- poppler/XRef.cc |    2 ++
+ poppler/XRef.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 73e6f19c4e76762eb5131b168e3b24167ba126cb
@@ -8441,8 +11629,8 @@ Date:	Wed Nov 16 22:29:11 2011 +0100
 
     xpdf303: Add PDFDoc::fileNameU to windows builds
 
- poppler/PDFDoc.cc |   43 +++++++++++++++++++++++++++++++++++--------
- poppler/PDFDoc.h  |	6 ++++++
+ poppler/PDFDoc.cc | 43 +++++++++++++++++++++++++++++++++++--------
+ poppler/PDFDoc.h  |  6 ++++++
  2 files changed, 41 insertions(+), 8 deletions(-)
 
 commit 65388b1aaf9a78efcf9486d5e2d4bdce76f11194
@@ -8453,9 +11641,9 @@ Date:	Tue Nov 15 21:53:40 2011 +0100
 
     Comes with an attached update to pdf2xml.dtd
 
- utils/HtmlOutputDev.cc |   48
+ utils/HtmlOutputDev.cc | 48
  ++++++++++++++++++++++++++++++++++++++++--------
- utils/pdf2xml.dtd	|   22 +++++++++++++++++-----
+ utils/pdf2xml.dtd	| 22 +++++++++++++++++-----
  2 files changed, 57 insertions(+), 13 deletions(-)
 
 commit a4c78946bc1fc3d52152af2e319051050ab05e28
@@ -8464,7 +11652,7 @@ Date:	Mon Nov 14 13:22:53 2011 +0100
 
     Make GfxColorSpace::parse accept dicts too
 
- poppler/GfxState.cc |	 14 +++++++++++++-
+ poppler/GfxState.cc | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 commit f6d026bfa18624ccd321e102bb39ba744998de1e
@@ -8475,8 +11663,7 @@ Date:	Fri Nov 11 16:37:27 2011 +0100
 
     Fixes bug 42793
 
- poppler/Gfx.cc |   52
- +++++++++++++++++++++++++++++-----------------------
+ poppler/Gfx.cc | 52 +++++++++++++++++++++++++++++-----------------------
  1 file changed, 29 insertions(+), 23 deletions(-)
 
 commit c9da140bb476dcbb3928950ae9b506de82695cd2
@@ -8490,7 +11677,7 @@ Date:	Thu Oct 20 11:31:10 2011 +0200
 
     Fixes bug #42036.
 
- glib/demo/main.c |    3 +++
+ glib/demo/main.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit a0db250bbdefff6361551cf9db344bd5268fea11
@@ -8499,7 +11686,7 @@ Date:	Wed Nov 9 20:07:58 2011 +0100
 
     pdfinfo: report page rotation
 
- utils/pdfinfo.cc |    8 ++++++++
+ utils/pdfinfo.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit e7dbd17ff07afa465636a90f526cd7ac8c731862
@@ -8510,7 +11697,7 @@ Date:	Wed Nov 9 12:39:41 2011 +0100
 
     If resizing from "long" to shorter
 
- goo/GooString.cc |    3 +++
+ goo/GooString.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 6a4f0c32b6723b127034d59a34bf076942e9935f
@@ -8521,8 +11708,8 @@ Date:	Sun Nov 6 15:44:06 2011 +0100
 
     Not only tests that have md5, but also crashed or failed tests.
 
- regtest/TestReferences.py    |    4 ++--
- regtest/backends/__init__.py |    3 +++
+ regtest/TestReferences.py    | 4 ++--
+ regtest/backends/__init__.py | 3 +++
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit eab952d121c7ab88a0d41587cfa449c0978bea04
@@ -8531,7 +11718,7 @@ Date:	Thu Nov 3 21:58:11 2011 +0100
 
     qt4: remove unused variable
 
- qt4/src/poppler-embeddedfile.cc |    1 -
+ qt4/src/poppler-embeddedfile.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 85615f04e040dd38792533a4522e437644e97548
@@ -8543,8 +11730,8 @@ Date:	Thu Nov 3 16:15:40 2011 +0100
     no more useful now, as they are available either directly or as
     parsed values in both Annot and FormField
 
- qt4/src/poppler-form.cc   |   16 ----------------
- qt4/src/poppler-private.h |	4 +---
+ qt4/src/poppler-form.cc   | 16 ----------------
+ qt4/src/poppler-private.h |  4 +---
  2 files changed, 1 insertion(+), 19 deletions(-)
 
 commit 43347b43eeb66b5c8dc9637c36436baacc626bc4
@@ -8553,7 +11740,7 @@ Date:	Thu Nov 3 16:10:57 2011 +0100
 
     qt4: use the flags of the associated Annot object
 
- qt4/src/poppler-form.cc |    2 +-
+ qt4/src/poppler-form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6c9492202de9b3b43da9eac3e40dc7fe218f21da
@@ -8562,7 +11749,7 @@ Date:	Thu Nov 3 16:03:11 2011 +0100
 
     qt4: remove old commented code
 
- qt4/src/poppler-form.cc |    1 -
+ qt4/src/poppler-form.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit f0eca54131f7cdf6c1e0e78a18be0bf642567af4
@@ -8573,7 +11760,7 @@ Date:	Thu Nov 3 15:46:33 2011 +0100
 
     ... instead of reading it again
 
- qt4/src/poppler-form.cc |   24 ++++++++----------------
+ qt4/src/poppler-form.cc | 24 ++++++++----------------
  1 file changed, 8 insertions(+), 16 deletions(-)
 
 commit d92bce1ae87d2f351bb1b972c64466502fb212aa
@@ -8582,7 +11769,7 @@ Date:	Thu Nov 3 15:30:45 2011 +0100
 
     qt4: include <QFile>
 
- qt4/src/poppler-private.h |	1 +
+ qt4/src/poppler-private.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 955cd0c7bd3a72340deba098f4242a4904adc60f
@@ -8591,7 +11778,7 @@ Date:	Wed Nov 2 20:20:41 2011 +0100
 
     Compile with MSVC needed for last change in the qt4 frontend
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit e0f5bc1deebaa9861baffd7c9ba31ea31585cd1d
@@ -8602,8 +11789,8 @@ Date:	Tue Nov 1 14:15:09 2011 +0100
 
     Bug 35378
 
- qt4/src/poppler-document.cc |	  6 +++---
- qt4/src/poppler-private.h   |	 17 +++++++++++++++--
+ qt4/src/poppler-document.cc |	6 +++---
+ qt4/src/poppler-private.h   | 17 +++++++++++++++--
  2 files changed, 18 insertions(+), 5 deletions(-)
 
 commit 52c1e9c5109299255d13b5b1e7d3eedaab512084
@@ -8614,9 +11801,9 @@ Date:	Tue Nov 1 14:13:10 2011 +0100
 
     It allows to update the references of failing tests.
 
- regtest/TestRun.py	       |    2 +-
- regtest/backends/__init__.py  |   34 ++++++++++++++++++++++++++++++++--
- regtest/commands/run-tests.py |    4 ++++
+ regtest/TestRun.py	       |  2 +-
+ regtest/backends/__init__.py  | 34 ++++++++++++++++++++++++++++++++--
+ regtest/commands/run-tests.py |  4 ++++
  3 files changed, 37 insertions(+), 3 deletions(-)
 
 commit b4896a416b1df14a81b944b3c577fec85c9c7f7d
@@ -8627,10 +11814,10 @@ Date:	Tue Nov 1 09:40:53 2011 +0100
 
     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 +-
+ 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 53f1b0c5edfdbef817bff31566893ac4e111516a
@@ -8642,7 +11829,7 @@ Date:	Sun Oct 30 16:02:19 2011 +0100
     This fixes a crash when rendering only odd/even pages in a printing
     format.
 
- utils/pdftocairo.cc |	  4 ++++
+ utils/pdftocairo.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 8b0dfe9537082eaccd982530f1eddc2fcfc92f8e
@@ -8652,9 +11839,9 @@ Date:	Thu Oct 27 19:58:31 2011 +0200
     xpdf303: Use splashDist instead of splashSqrt and USE_FIXEDPOINT
     enhacements
 
- splash/SplashFTFont.cc |   70
- +++++++++++++++++++++++++++++++++++++++++++-----
- splash/SplashFTFont.h	|    2 +-
+ splash/SplashFTFont.cc | 70
+ +++++++++++++++++++++++++++++++++++++++++++++-----
+ splash/SplashFTFont.h	|  2 +-
  2 files changed, 65 insertions(+), 7 deletions(-)
 
 commit b021bce2583c8e1e3a4c129106d80e7a4e223600
@@ -8663,7 +11850,7 @@ Date:	Thu Oct 27 19:54:22 2011 +0200
 
     xpdf303: wops, make it compile
 
- poppler/Lexer.cc |    2 +-
+ poppler/Lexer.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 76295f4d401c36bdef3b2a20d18ac57a3b976410
@@ -8672,7 +11859,7 @@ Date:	Thu Oct 27 19:42:42 2011 +0200
 
     xpdf303: Adopt xpdf solution for the name too long problem
 
- poppler/Lexer.cc |   37 +++++++++++++++++--------------------
+ poppler/Lexer.cc | 37 +++++++++++++++++--------------------
  1 file changed, 17 insertions(+), 20 deletions(-)
 
 commit be6d4c19b8ce1515ce995eee408dc5752012c649
@@ -8681,7 +11868,7 @@ Date:	Thu Oct 27 19:34:38 2011 +0200
 
     xpdf303: Add brackets
 
- poppler/Lexer.cc |    6 ++++--
+ poppler/Lexer.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 904ae1385e93155a55008977c89aa664b7c8cb9b
@@ -8690,9 +11877,9 @@ Date:	Wed Oct 26 14:22:28 2011 +0200
 
     Expose POPPLER_VERSION in poppler-config.h
 
- configure.ac			|    3 +++
- poppler/poppler-config.h.cmake |    5 +++++
- poppler/poppler-config.h.in	|    5 +++++
+ configure.ac			| 3 +++
+ poppler/poppler-config.h.cmake | 5 +++++
+ poppler/poppler-config.h.in	| 5 +++++
  3 files changed, 13 insertions(+)
 
 commit aa83d4fe942ef0685c5990ddf3eccc2fbdf82292
@@ -8701,7 +11888,7 @@ Date:	Thu Oct 20 00:59:57 2011 +0200
 
     xpdf303: Add readFromStream
 
- poppler/GfxFont.cc |	 6 ++++++
+ poppler/GfxFont.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 74d771d58a4d1868669117709eb6811ec28bf840
@@ -8710,7 +11897,7 @@ Date:	Thu Oct 20 00:56:58 2011 +0200
 
     xpdf303: Add base14SubstFonts
 
- poppler/GfxFont.cc |	24 ++++++++++++++++++++++++
+ poppler/GfxFont.cc | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit 71260f987161d5b122caced6af14e9d64be46e4d
@@ -8719,7 +11906,7 @@ Date:	Thu Oct 20 00:55:42 2011 +0200
 
     xpdf303: GfxFontLoc implementation
 
- poppler/GfxFont.cc |	20 ++++++++++++++++++++
+ poppler/GfxFont.cc | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit 586430137985fd303ce87bdb9b902ee9a01341e8
@@ -8728,7 +11915,7 @@ Date:	Thu Oct 20 00:54:09 2011 +0200
 
     xpdf303: More stuff into base14FontMap
 
- poppler/GfxFont.cc |	16 +++++++++++++++-
+ poppler/GfxFont.cc | 16 +++++++++++++++-
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 commit c0affb1845c339f89ca67608cb9fd9134ff902f5
@@ -8737,11 +11924,11 @@ Date:	Thu Oct 20 00:51:31 2011 +0200
 
     xpdf303: GfxFont::getOrignName/getName rework
 
- poppler/FontInfo.cc	  |    4 ++--
- poppler/GfxFont.cc	  |    4 ----
- poppler/GfxFont.h	  |    6 +-----
- poppler/PSOutputDev.cc   |    8 ++++----
- poppler/TextOutputDev.cc |    5 ++---
+ poppler/FontInfo.cc	  | 4 ++--
+ poppler/GfxFont.cc	  | 4 ----
+ poppler/GfxFont.h	  | 6 +-----
+ poppler/PSOutputDev.cc   | 8 ++++----
+ poppler/TextOutputDev.cc | 5 ++---
  5 files changed, 9 insertions(+), 18 deletions(-)
 
 commit c5c513b5b72e03f6f0a94d04f7d8a22fe9bdaa80
@@ -8750,7 +11937,7 @@ Date:	Thu Oct 20 00:45:30 2011 +0200
 
     xpdf303: GfxFontLoc
 
- poppler/GfxFont.h |   35 +++++++++++++++++++++++++++++++++++
+ poppler/GfxFont.h | 35 +++++++++++++++++++++++++++++++++++
  1 file changed, 35 insertions(+)
 
 commit 4ec5e5e6d4785eb7a60744ae7e33c7ba3f603e8e
@@ -8759,8 +11946,8 @@ Date:	Thu Oct 20 00:34:10 2011 +0200
 
     xpdf303: StdFontMapEntry renaming
 
- poppler/GfxFont.cc |	26 +++++++++++---------------
- poppler/GfxFont.h  |	 2 ++
+ poppler/GfxFont.cc | 26 +++++++++++---------------
+ poppler/GfxFont.h  |  2 ++
  2 files changed, 13 insertions(+), 15 deletions(-)
 
 commit e71088dc5087303b1ae5f3e72af287ec4e0a1342
@@ -8769,7 +11956,7 @@ Date:	Mon Oct 17 13:42:06 2011 +0200
 
     remove useless #if
 
- poppler/Page.cc |    4 +---
+ poppler/Page.cc | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 40b56994dda79653c902977423f349efa55cf21e
@@ -8781,9 +11968,9 @@ Date:	Mon Oct 17 20:33:03 2011 +1030
     <sys/param.h> and MAXPATHLEN is not available on windows. Avoid the
     need to know the max path length by using GooString for the path.
 
- utils/parseargs.cc  |	 12 ++++++++++++
- utils/parseargs.h   |	  2 ++
- utils/pdftocairo.cc |	 17 ++++++++---------
+ utils/parseargs.cc  | 12 ++++++++++++
+ utils/parseargs.h   |	2 ++
+ utils/pdftocairo.cc | 17 ++++++++---------
  3 files changed, 22 insertions(+), 9 deletions(-)
 
 commit 4bb34757dbbff780baba053371274c05b29771e1
@@ -8808,9 +11995,9 @@ Date:	Mon Sep 19 21:11:44 2011 +0930
 
     Bug 41005
 
- poppler/CairoOutputDev.cc |   97
- ++++++++++++++++++++++++++++-----------------
- poppler/CairoOutputDev.h  |	6 ++-
+ poppler/CairoOutputDev.cc | 97
+ +++++++++++++++++++++++++++++------------------
+ poppler/CairoOutputDev.h  |  6 ++-
  2 files changed, 65 insertions(+), 38 deletions(-)
 
 commit 50adbed183e9bf70eb4c41e8858cf464c3042e45
@@ -8823,11 +12010,11 @@ Date:	Sun Oct 16 12:40:27 2011 +0200
     depend on
     the dynamic library.
 
- CMakeLists.txt			|    1 -
- configure.ac			|    2 --
- poppler-glib-uninstalled.pc.in |    2 +-
- poppler-glib.pc.cmake		|    2 +-
- poppler-glib.pc.in		|    2 +-
+ CMakeLists.txt			| 1 -
+ configure.ac			| 2 --
+ poppler-glib-uninstalled.pc.in | 2 +-
+ poppler-glib.pc.cmake		| 2 +-
+ poppler-glib.pc.in		| 2 +-
  5 files changed, 3 insertions(+), 6 deletions(-)
 
 commit acd8ecc9121db58851f73764f046a4f54bd80581
@@ -8846,8 +12033,8 @@ Date:	Sat Oct 8 15:03:24 2011 +1030
 
     Bug 41462
 
- poppler/PSOutputDev.cc |   41 +++++++++++++++++++++++++++++++++++++++++
- poppler/PSOutputDev.h	|    1 +
+ poppler/PSOutputDev.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ poppler/PSOutputDev.h	|  1 +
  2 files changed, 42 insertions(+)
 
 commit 6e1326b11f98f2b277e53a6cdbcb373ce6c29958
@@ -8859,7 +12046,7 @@ Date:	Fri Oct 7 20:29:36 2011 +1030
     instead of falling back to Gfx. This avoids emitting the image data
     twice.
 
- poppler/PSOutputDev.cc |   23 +++++++++++++++++++++++
+ poppler/PSOutputDev.cc | 23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
 
 commit ed05fcb8c442b716c5e382c98f2625701926c86a
@@ -8876,7 +12063,7 @@ Date:	Sat Oct 1 20:19:19 2011 +0930
 
     Bug 41374
 
- poppler/PSOutputDev.cc |    9 ++-------
+ poppler/PSOutputDev.cc | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 commit 087757866de13b6164967a1d241d3c0e47065f1a
@@ -8885,7 +12072,7 @@ Date:	Thu Oct 13 12:18:52 2011 +0200
 
     xpdf303: Merge SplashT1Font::getGlyphPath changes
 
- splash/SplashT1Font.cc |   39 +++++++++++++++++++++------------------
+ splash/SplashT1Font.cc | 39 +++++++++++++++++++++------------------
  1 file changed, 21 insertions(+), 18 deletions(-)
 
 commit c84f46ee16a8dcc6e2cad2359df621cc6cdb8fa5
@@ -8894,8 +12081,8 @@ Date:	Thu Oct 13 12:16:14 2011 +0200
 
     xpdf303: Add GBool type1 to SplashFTFontFile
 
- splash/SplashFTFontFile.cc |	 9 +++++----
- splash/SplashFTFontFile.h  |	 3 ++-
+ splash/SplashFTFontFile.cc | 9 +++++----
+ splash/SplashFTFontFile.h  | 3 ++-
  2 files changed, 7 insertions(+), 5 deletions(-)
 
 commit d845da2c3c1acbeaa4b9bb3125f9143e785210ff
@@ -8906,7 +12093,7 @@ Date:	Thu Oct 6 14:49:19 2011 +0200
 
     Fix URLs in poppler-qt4 documentation
 
- qt4/src/Mainpage.dox |    6 +++---
+ qt4/src/Mainpage.dox | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit bb40c980f7ab7a6eb9735af17103f87bc65893d6
@@ -8919,7 +12106,7 @@ Date:	Thu Oct 6 14:49:08 2011 +0200
     installed in
     non-standard location.
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 776ca137984556530ba938265714934bdc3d6443
@@ -8931,7 +12118,7 @@ Date:	Thu Oct 6 14:48:46 2011 +0200
     Relocatable build does *not* (was missing in docs) hardcode library
     location.
 
- CMakeLists.txt |    2 +-
+ CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ab8616dcb637ac1aeb4d5f142c3c4bff9aecd041
@@ -8940,7 +12127,7 @@ Date:	Thu Oct 6 14:21:10 2011 +0200
 
     close the file or flush stdout
 
- utils/pdftocairo.cc |	  2 ++
+ utils/pdftocairo.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 72c2d563684ab6937a98a0c1c79be3639d29c9ce
@@ -8954,7 +12141,7 @@ Date:	Tue Oct 4 17:46:11 2011 +0200
     the index is out of range but let's merge it for the sake of being
     more closer to xpdf
 
- poppler/GfxState.cc |	  2 +-
+ poppler/GfxState.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c814c2452c7f60623fdd0fee6f915adeaf5b49e3
@@ -8966,8 +12153,8 @@ Date:	Tue Oct 4 17:40:27 2011 +0200
     I think we could do it better, but it'd take more time and it's not
     what we are doing in this branch anyway
 
- poppler/GfxState.cc |	 43 +++++++++++++++++++++++++++----------------
- poppler/GfxState.h  |	 14 +++++++-------
+ poppler/GfxState.cc | 43 +++++++++++++++++++++++++++----------------
+ poppler/GfxState.h  | 14 +++++++-------
  2 files changed, 34 insertions(+), 23 deletions(-)
 
 commit 0e53ba5709296dc2ba1399f885af200d2041f0cd
@@ -8976,8 +12163,8 @@ Date:	Sat Oct 1 15:41:51 2011 +0200
 
     qt4: Add the option of PSConverter creating EPS
 
- qt4/src/poppler-ps-converter.cc |    3 ++-
- qt4/src/poppler-qt4.h		 |    6 ++++--
+ qt4/src/poppler-ps-converter.cc | 3 ++-
+ qt4/src/poppler-qt4.h		 | 6 ++++--
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit 04e271a0c10807c9c3967daa1f656e87b97b9901
@@ -8989,7 +12176,7 @@ Date:	Sat Oct 1 14:34:50 2011 +0200
     Reported by Glad Deschrijver
     (cherry picked from commit 1346caac6c564035d368617a329b361d0253fbf6)
 
- qt4/src/poppler-qt4.h |    2 +-
+ qt4/src/poppler-qt4.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9855529e8e1a83c6d77a9e4221ea2132d44e9fb1
@@ -9001,7 +12188,7 @@ Date:	Sat Oct 1 14:27:44 2011 +0200
     Discussed with Adrian Johnson
     Problem found by Glad Deschrijver
 
- poppler/PSOutputDev.cc |    4 ++--
+ poppler/PSOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8e8cde6f374b59222d834e2e7f08fb4a6a4d55a5
@@ -9010,7 +12197,7 @@ Date:	Wed Sep 28 23:32:24 2011 +0200
 
     xpdf303: More manpage merging
 
- utils/pdftotext.1 |	9 +++++----
+ utils/pdftotext.1 | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit f798f00c9ec55bff2eb93938424c436ba2663e7a
@@ -9019,8 +12206,8 @@ Date:	Wed Sep 28 23:30:55 2011 +0200
 
     xpdf303: mention pdfdetach in non xpdf tools
 
- utils/pdftocairo.1 |	 1 +
- utils/pdftohtml.1  |	 1 +
+ utils/pdftocairo.1 | 1 +
+ utils/pdftohtml.1  | 1 +
  2 files changed, 2 insertions(+)
 
 commit 3fc46ac1c046460ccf46ba4b8a92f728e775694a
@@ -9029,7 +12216,7 @@ Date:	Wed Sep 28 23:30:00 2011 +0200
 
     xpdf303: Fix pdfdetach man page references
 
- utils/pdfdetach.1 |   14 ++++++--------
+ utils/pdfdetach.1 | 14 ++++++--------
  1 file changed, 6 insertions(+), 8 deletions(-)
 
 commit 79e1d77fb00a7c7f0bda4ae76328c4211c7f16e6
@@ -9038,8 +12225,8 @@ Date:	Wed Sep 28 23:27:53 2011 +0200
 
     xpdf303: Merge some more manpages
 
- utils/pdfinfo.1  |   15 +++++++++++----
- utils/pdftoppm.1 |    9 +++++----
+ utils/pdfinfo.1  | 15 +++++++++++----
+ utils/pdftoppm.1 |  9 +++++----
  2 files changed, 16 insertions(+), 8 deletions(-)
 
 commit 841c96be59ddad32f51d4d114ba1dcc42285ab55
@@ -9048,9 +12235,9 @@ Date:	Wed Sep 28 23:23:25 2011 +0200
 
     xpdf303: Merge some man pages
 
- utils/pdffonts.1  |	9 +++++----
- utils/pdfimages.1 |	9 +++++----
- utils/pdftops.1   |	9 +++++----
+ utils/pdffonts.1  | 9 +++++----
+ utils/pdfimages.1 | 9 +++++----
+ utils/pdftops.1   | 9 +++++----
  3 files changed, 15 insertions(+), 12 deletions(-)
 
 commit d2706a05513134f961e2500e0e596f2769707ce5
@@ -9059,7 +12246,7 @@ Date:	Wed Sep 28 21:20:23 2011 +0930
 
     cairo: fix crash when using poppler_page_get_image()
 
- poppler/CairoOutputDev.h |    1 +
+ poppler/CairoOutputDev.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0c0591fa23441c54c9443072615273ea65482d76
@@ -9068,14 +12255,14 @@ Date:	Tue Sep 27 00:45:59 2011 +0200
 
     0.18.0
 
- CMakeLists.txt      |	  6 +--
- NEWS		     |	 14 +++++++
- configure.ac	     |	  4 +-
- cpp/Doxyfile	     |	  2 +-
- gtk-doc.make	     |	102
- +++++++++++++++++++++------------------------------
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	 6 ++--
+ NEWS		     |	14 ++++++++
+ configure.ac	     |	 4 +--
+ cpp/Doxyfile	     |	 2 +-
+ gtk-doc.make	     | 102
+ ++++++++++++++++++++++------------------------------
+ poppler/Makefile.am |	 2 +-
+ qt4/src/Doxyfile    |	 2 +-
  7 files changed, 64 insertions(+), 68 deletions(-)
 
 commit 19f5db7acd64330d198f18695175df02141794d7
@@ -9084,7 +12271,7 @@ Date:	Tue Sep 27 00:15:15 2011 +0200
 
     Update Carlos (C) year
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6d34d4af90b8b41360de4dabb000bbcc894775d0
@@ -9095,19 +12282,19 @@ Date:	Tue Sep 27 00:09:54 2011 +0200
 
     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
- ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 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
@@ -9118,10 +12305,10 @@ Date:	Mon Sep 26 15:54:46 2011 +0200
 
     Since it does exactly the same as getNextStream
 
- poppler/DCTStream.h	 |    1 -
- poppler/Stream.h	 |    1 -
- utils/HtmlOutputDev.cc  |    7 ++-----
- utils/ImageOutputDev.cc |    9 +++------
+ poppler/DCTStream.h	 | 1 -
+ poppler/Stream.h	 | 1 -
+ utils/HtmlOutputDev.cc  | 7 ++-----
+ utils/ImageOutputDev.cc | 9 +++------
  4 files changed, 5 insertions(+), 13 deletions(-)
 
 commit bba57e588fd1ee3a61f18405d1d1bf89fceb5b96
@@ -9135,13 +12322,13 @@ Date:	Sun Sep 25 12:21:02 2011 +0200
     code to use our code and return also embedded files of file attachment
     annotations to match what xpdf does.
 
- poppler/FileSpec.cc  |   22 ++++
- poppler/FileSpec.h   |    3 +
- utils/CMakeLists.txt |    9 ++
- utils/Makefile.am    |    6 +
- utils/pdfdetach.1    |  105 +++++++++++++++++
- utils/pdfdetach.cc   |  318
- ++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/FileSpec.cc  |  22 ++++
+ poppler/FileSpec.h   |   3 +
+ utils/CMakeLists.txt |   9 ++
+ utils/Makefile.am    |   6 +
+ utils/pdfdetach.1    | 105 +++++++++++++++++
+ utils/pdfdetach.cc   | 318
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
  6 files changed, 463 insertions(+)
 
 commit f62c2f002c782d3a7887525f031d266aca6eb582
@@ -9159,14 +12346,14 @@ Date:	Sat Sep 24 11:20:13 2011 +0200
     is not
     an exact merge of xpdf code, I've tried to keep our implementation.
 
- poppler/CairoOutputDev.cc |	8 +--
- poppler/CairoOutputDev.h  |	6 +-
- poppler/Gfx.cc		   |   40 +++++++++----
- poppler/OutputDev.cc	   |	6 --
- poppler/OutputDev.h	   |	4 +-
- poppler/TextOutputDev.cc  |  145
- +++++++++++++++++++--------------------------
- poppler/TextOutputDev.h   |   21 ++++---
+ poppler/CairoOutputDev.cc |   8 +--
+ poppler/CairoOutputDev.h  |   6 +-
+ poppler/Gfx.cc		   |  40 +++++++++----
+ poppler/OutputDev.cc	   |   6 --
+ poppler/OutputDev.h	   |   4 +-
+ poppler/TextOutputDev.cc  | 145
+ +++++++++++++++++++---------------------------
+ poppler/TextOutputDev.h   |  21 ++++---
  7 files changed, 108 insertions(+), 122 deletions(-)
 
 commit a097447ed13cb021003425f85597e2628935feb2
@@ -9175,7 +12362,7 @@ Date:	Sat Sep 24 09:43:05 2011 +0200
 
     Use new error syntax in pdfextract
 
- utils/pdfextract.cc |	  2 +-
+ utils/pdfextract.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 718c735aed540aa49b8dde250ca886c6ad93f5b6
@@ -9191,8 +12378,8 @@ Date:	Mon Sep 19 22:00:34 2011 +0930
 
     Update .gitignore
 
- regtest/.gitignore |	 1 +
- utils/.gitignore   |	 2 ++
+ regtest/.gitignore | 1 +
+ utils/.gitignore   | 2 ++
  2 files changed, 3 insertions(+)
 
 commit 0de477817e424078cfcfcae114e7745809f0848d
@@ -9201,8 +12388,8 @@ 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 ++-
+ utils/pdfextract.1 | 3 ++-
+ utils/pdfmerge.1   | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit ce7372db64ee807dc2b491e121fbe557dbf697e8
@@ -9214,7 +12401,7 @@ Date:	Mon Sep 19 22:04:27 2011 +0930
     For consistency with splash. It is faster and easier to compare with
     splash results.
 
- regtest/backends/cairo.py |	4 ++--
+ regtest/backends/cairo.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6cf7330089c4dcc1099906d9c37c3607a2a1eeba
@@ -9226,7 +12413,7 @@ Date:	Mon Sep 19 18:42:35 2011 +0200
     They shouldn't have a checksum, but it might happen with md5 files
     generated with previous versions.
 
- regtest/backends/__init__.py |    6 +++---
+ regtest/backends/__init__.py | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 6512bf1c5dab37058460882fec3407b396830981
@@ -9235,7 +12422,7 @@ Date:	Sun Sep 18 18:38:32 2011 +0200
 
     Render at 72 instead of 150, it's faster :D
 
- regtest/backends/splash.py |	 4 ++--
+ regtest/backends/splash.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit b828f63ed3896a22f3fe7ddbe2ec2f549d7a2c62
@@ -9244,7 +12431,7 @@ Date:	Sun Sep 18 18:20:47 2011 +0200
 
     install pdfextract and pdfmerge manpages
 
- utils/CMakeLists.txt |    2 ++
+ utils/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 986759dfbe85998c85ee9b0825c7522395567531
@@ -9253,10 +12440,9 @@ 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 ++++++++++++++++++++++++++++++++
+ utils/Makefile.am  |  2 ++
+ utils/pdfextract.1 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ utils/pdfmerge.1   | 32 ++++++++++++++++++++++++++++++++
  3 files changed, 82 insertions(+)
 
 commit 90da1af542fd7f3cecef31b15da6971345b38209
@@ -9265,7 +12451,7 @@ Date:	Sun Sep 18 18:19:04 2011 +0200
 
     Complain if %d is not present and it should
 
- utils/pdfextract.cc |	  4 ++++
+ utils/pdfextract.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 40e066a84ddb3a5c41805c095659af5f5704d6d8
@@ -9274,7 +12460,7 @@ Date:	Sun Sep 18 18:16:14 2011 +0200
 
     qt_subdir is unneeded
 
- Makefile.am |	  2 +-
+ Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6721916c92d720947b3285c85fdbe6610c6bf013
@@ -9293,7 +12479,7 @@ 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 +++++++++++-
+ regtest/backends/__init__.py | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit 110b8be1d9f2694b42bd12dcb6af02bfca9866dd
@@ -9302,7 +12488,7 @@ Date:	Sun Sep 18 16:26:58 2011 +0200
 
     Fix memory leak
 
- poppler/Gfx.cc |    3 ++-
+ poppler/Gfx.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 8456a6e1354126dc98357fb806595bd3bc198522
@@ -9314,9 +12500,9 @@ Date:	Sun Sep 18 16:07:54 2011 +0200
     It's not used by poppler yet, but we might want to use it from the
     frontends after the merge.
 
- poppler/OptionalContent.cc |  127
- ++++++++++++++++++++++++++++++++++++++++++++
- poppler/OptionalContent.h  |	36 ++++++++++++-
+ poppler/OptionalContent.cc | 127
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/OptionalContent.h  |  36 ++++++++++++-
  2 files changed, 162 insertions(+), 1 deletion(-)
 
 commit 06c6660dc9fe326f185ff323e643af6714b32ec8
@@ -9325,8 +12511,8 @@ Date:	Sun Sep 18 15:08:44 2011 +0200
 
     xpdf303: Parse usage dictionary of optional content groups
 
- poppler/OptionalContent.cc |	28 ++++++++++++++++++++++++++++
- poppler/OptionalContent.h  |	14 +++++++++++++-
+ poppler/OptionalContent.cc | 28 ++++++++++++++++++++++++++++
+ poppler/OptionalContent.h  | 14 +++++++++++++-
  2 files changed, 41 insertions(+), 1 deletion(-)
 
 commit 528d5b0d40302b3fee3aec69b85bdd1daa4db568
@@ -9335,7 +12521,7 @@ Date:	Sun Sep 18 14:03:36 2011 +0200
 
     xpdf303: Image XObjects can have a OC entry too
 
- poppler/Gfx.cc |   11 ++++++++++-
+ poppler/Gfx.cc | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit c40353d3bb761f5be8ddbd2bf5341e83901fb132
@@ -9344,7 +12530,7 @@ Date:	Sun Sep 18 13:32:07 2011 +0200
 
     xpdf303: OC entry is specific to form XObjects
 
- poppler/Gfx.cc |   17 +++++++++--------
+ poppler/Gfx.cc | 17 +++++++++--------
  1 file changed, 9 insertions(+), 8 deletions(-)
 
 commit 6ddb51d81b064346dc85d2ae72570a956a184d74
@@ -9353,8 +12539,8 @@ Date:	Sun Sep 18 12:59:28 2011 +0200
 
     xpdf303: The spec doesn't say OC must be null or ref
 
- poppler/Annot.cc |    5 +----
- poppler/Gfx.cc   |   22 +++++++---------------
+ poppler/Annot.cc |  5 +----
+ poppler/Gfx.cc   | 22 +++++++---------------
  2 files changed, 8 insertions(+), 19 deletions(-)
 
 commit 434bb9b38319edc7282be22044bd7761403a38a6
@@ -9365,7 +12551,7 @@ Date:	Sun Sep 18 12:45:12 2011 +0200
 
     Not only an optional content membership dictionary.
 
- poppler/OptionalContent.cc |	10 ++++++++++
+ poppler/OptionalContent.cc | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 56410b80fdabb99e2de0c6589de6ee745936c523
@@ -9374,7 +12560,7 @@ Date:	Sun Sep 18 12:44:02 2011 +0200
 
     xpdf303: Not finding an oc group is not necessarily a syntax error
 
- poppler/OptionalContent.cc |	 2 --
+ poppler/OptionalContent.cc | 2 --
  1 file changed, 2 deletions(-)
 
 commit 4bb4439450e342479375cb56d10561457475bd13
@@ -9385,7 +12571,7 @@ Date:	Sun Sep 18 12:42:15 2011 +0200
 
     We use an enum, not a boolean.
 
- poppler/OptionalContent.cc |	 2 +-
+ poppler/OptionalContent.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d737e3098e02e46525c0edf2165462e03ac7a0e6
@@ -9394,9 +12580,9 @@ Date:	Sun Sep 18 11:36:11 2011 +0200
 
     xpdf303: Add support for visibility expressions in OptContent
 
- poppler/OptionalContent.cc |  113
- ++++++++++++++++++++++++++++++++++----------
- poppler/OptionalContent.h  |	 3 +-
+ poppler/OptionalContent.cc | 113
+ +++++++++++++++++++++++++++++++++++----------
+ poppler/OptionalContent.h  |	3 +-
  2 files changed, 91 insertions(+), 25 deletions(-)
 
 commit 258d56ba85902a8ab50eec3fe66dd6425226fa59
@@ -9412,7 +12598,7 @@ Date:	Sun Sep 18 11:08:06 2011 +0200
 
     regtest: Fix checksum check for tests containing spaces in filename
 
- regtest/backends/__init__.py |    2 +-
+ regtest/backends/__init__.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 72a7736389cbe36c1f8a526f1a659cae1a3f85a3
@@ -9421,8 +12607,8 @@ Date:	Sun Sep 18 10:47:51 2011 +0200
 
     xpdf303: No need to cache optContentConfig object in Annot
 
- poppler/Annot.cc |    2 +-
- poppler/Annot.h  |    2 --
+ poppler/Annot.cc | 2 +-
+ poppler/Annot.h  | 2 --
  2 files changed, 1 insertion(+), 3 deletions(-)
 
 commit 93ba92db0a3af35f197a4faa5a528af98ea0f624
@@ -9431,15 +12617,15 @@ 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 +-
+ 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
@@ -9455,10 +12641,10 @@ Date:	Tue Sep 13 20:09:56 2011 +0200
     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 +++++-
+ 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
@@ -9470,9 +12656,9 @@ Date:	Tue Sep 13 19:04:04 2011 +0200
     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 +-
+ 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
@@ -9481,9 +12667,9 @@ 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 +++++++++++++++++++++++++++++++++++
+ regtest/TestReferences.py | 20 ++++++++------------
+ regtest/TestRun.py	   | 21 ++++++++++-----------
+ regtest/Utils.py	   | 35 +++++++++++++++++++++++++++++++++++
  3 files changed, 53 insertions(+), 23 deletions(-)
 
 commit 10801b6faee9037af054fe74cc4a03620ea41d45
@@ -9492,21 +12678,21 @@ 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 ++
+ 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(+)
 
 commit 245e331a14e11a615bf47abbeb34a3561e393b41
@@ -9515,11 +12701,11 @@ 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 +-
+ CMakeLists.txt   | 2 +-
+ NEWS		  | 5 +++++
+ configure.ac	  | 2 +-
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
  5 files changed, 9 insertions(+), 4 deletions(-)
 
 commit 194b2413eb2c6a1641508aec63336aaf89ec3b51
@@ -9528,8 +12714,8 @@ Date:	Mon Sep 12 13:43:35 2011 +0200
 
     gir 0.18
 
- glib/CMakeLists.txt |	 12 ++++++------
- glib/Makefile.am    |	 12 ++++++------
+ glib/CMakeLists.txt | 12 ++++++------
+ glib/Makefile.am    | 12 ++++++------
  2 files changed, 12 insertions(+), 12 deletions(-)
 
 commit 61c06d2efad20880e1e0b399cf797dd55f6c8dab
@@ -9538,7 +12724,7 @@ Date:	Mon Sep 12 00:32:38 2011 +0200
 
     xpdf303: Useless NULL assignments
 
- poppler/SplashOutputDev.cc |	 2 ++
+ poppler/SplashOutputDev.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 4fbcbf1ffb8a98fe8c12643fdab2cbd90b4e60f9
@@ -9547,7 +12733,7 @@ Date:	Mon Sep 12 00:30:52 2011 +0200
 
     xpdf303: Set size to 64 instead of 100
 
- poppler/SplashOutputDev.cc |	 4 ++--
+ poppler/SplashOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 1c7203e57e9c7c264f5cada6362a6b449dd8689c
@@ -9556,7 +12742,7 @@ Date:	Mon Sep 12 00:21:03 2011 +0200
 
     xpdf303: Avoid calling a "slow" function
 
- poppler/PSOutputDev.cc |    9 ++++++---
+ poppler/PSOutputDev.cc | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit db4c5789bf95af9f45a7911153acc20a26a447f1
@@ -9565,7 +12751,7 @@ Date:	Mon Sep 12 00:19:49 2011 +0200
 
     xpdf303: fix spacing
 
- poppler/PSOutputDev.cc |    2 +-
+ poppler/PSOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 10c3d15f841865929d2f66353cb01d0d321e8b82
@@ -9574,7 +12760,7 @@ Date:	Mon Sep 12 00:03:13 2011 +0200
 
     xpdf303: make limit smaller
 
- poppler/PSOutputDev.cc |    2 +-
+ poppler/PSOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1d4e6e739701ba817576752ced169b24c5e95156
@@ -9583,7 +12769,7 @@ Date:	Sun Sep 11 23:57:22 2011 +0200
 
     xpdf303: Remove 512 limit in pdftoppm
 
- utils/pdftoppm.cc |   13 ++++++-------
+ utils/pdftoppm.cc | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
 
 commit e4e843f1115d95c54967f0386bfb28f685d6c88d
@@ -9592,7 +12778,7 @@ Date:	Sun Sep 11 22:49:34 2011 +0200
 
     xpdf303: Rework nComps != colorSpace->getNComps() handling
 
- poppler/GfxState.cc |	  6 +++++-
+ poppler/GfxState.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit dda45b6a67f3f97705e5d806eaf7d37171789e66
@@ -9601,7 +12787,7 @@ Date:	Sun Sep 11 22:46:51 2011 +0200
 
     xpdf303: NULL GfxICCBasedColorSpace if array does not have 2 elements
 
- poppler/GfxState.cc |	  4 ++++
+ poppler/GfxState.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 760e814a6d26db8eba567520aad771002e11357a
@@ -9610,7 +12796,7 @@ Date:	Sun Sep 11 22:21:40 2011 +0200
 
     xpdf303: increase formDepth limit
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 59442e5994f3b94d5221cbc90f79fad235fe2611
@@ -9619,9 +12805,9 @@ Date:	Sun Sep 11 22:10:41 2011 +0200
 
     xpdf303: Remove flags that were never used
 
- splash/Splash.cc      |    6 +-----
- splash/SplashXPath.cc |   34 ++++------------------------------
- splash/SplashXPath.h  |   13 ++++---------
+ splash/Splash.cc      |  6 +-----
+ splash/SplashXPath.cc | 34 ++++------------------------------
+ splash/SplashXPath.h  | 13 ++++---------
  3 files changed, 9 insertions(+), 44 deletions(-)
 
 commit 41a620ef60507ceda42a14d06d6587ed10016468
@@ -9630,9 +12816,9 @@ Date:	Thu Sep 8 16:18:01 2011 +0200
 
     xpdf303: Adapt use of getBlock to our use of getChars
 
- poppler/Stream.cc |   58
- ++++++++++++++++++++++++++++++++---------------------
- poppler/Stream.h  |	2 ++
+ poppler/Stream.cc | 58
+ +++++++++++++++++++++++++++++++++----------------------
+ poppler/Stream.h  |  2 ++
  2 files changed, 37 insertions(+), 23 deletions(-)
 
 commit 2f7701fe730a648d0a1d181c5b20e4802640dc52
@@ -9641,11 +12827,11 @@ Date:	Thu Sep 8 15:59:27 2011 +0200
 
     xpdf303: Adapt xpdf getBlock to our getChars
 
- poppler/JBIG2Stream.cc |   17 ++++++++
- poppler/JBIG2Stream.h	|    2 +
- poppler/Stream.cc	|  113
- +++++++++++++++++++++++++++++++++++++++++++-----
- poppler/Stream.h	|   55 ++++++++++++-----------
+ poppler/JBIG2Stream.cc |  17 ++++++++
+ poppler/JBIG2Stream.h	|   2 +
+ poppler/Stream.cc	| 113
+ ++++++++++++++++++++++++++++++++++++++++++++-----
+ poppler/Stream.h	|  55 +++++++++++++-----------
  4 files changed, 152 insertions(+), 35 deletions(-)
 
 commit 3a1988db40def1655ec638cd521ed40eadc0acca
@@ -9655,7 +12841,7 @@ Date:	Thu Sep 8 15:40:12 2011 +0200
     xpdf303: empty pages need to call dump to do any setup required by
     the OutputDev
 
- poppler/Page.cc |    4 ++++
+ poppler/Page.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 4cddaed21592ac491519a81a003035bc4e618705
@@ -9670,8 +12856,8 @@ Date:	Thu Sep 8 15:35:33 2011 +0200
     I think we already had that change, we checked isPage before clipping,
     I've merged this way just to make future merges a bit easier.
 
- poppler/Page.cc |   16 ++++++++--------
- poppler/Page.h  |    3 +++
+ poppler/Page.cc | 16 ++++++++--------
+ poppler/Page.h  |  3 +++
  2 files changed, 11 insertions(+), 8 deletions(-)
 
 commit 3538ac89bfea750de8907847d1d5e3515d0b8be7
@@ -9680,7 +12866,7 @@ Date:	Thu Sep 8 15:07:21 2011 +0200
 
     xpdf303: compile
 
- poppler/ArthurOutputDev.cc |	12 +++++++++++-
+ poppler/ArthurOutputDev.cc | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit 89d95d0f254a828d28d943b698eeaec51f03686f
@@ -9690,11 +12876,11 @@ Date:	Thu Sep 8 12:38:36 2011 +0200
     xpdf303: Add codeToGID and codeToGIDLen params to
     loadOpenTypeCFFFont()
 
- poppler/SplashOutputDev.cc   |   12 +++++++++++-
- splash/SplashFTFontEngine.cc |   29 +++++++++++++++++------------
- splash/SplashFTFontEngine.h  |    3 ++-
- splash/SplashFontEngine.cc   |    6 ++++--
- splash/SplashFontEngine.h    |    3 ++-
+ poppler/SplashOutputDev.cc   | 12 +++++++++++-
+ splash/SplashFTFontEngine.cc | 29 +++++++++++++++++------------
+ splash/SplashFTFontEngine.h  |  3 ++-
+ splash/SplashFontEngine.cc   |  6 ++++--
+ splash/SplashFontEngine.h    |  3 ++-
  5 files changed, 36 insertions(+), 17 deletions(-)
 
 commit d768204e51e6bdbcac4d6b43537297616cbedbf3
@@ -9705,9 +12891,9 @@ Date:	Tue Sep 6 21:56:43 2011 +0200
 
     Breaks bug164568-2.pdf so our fix was better :-)
 
- poppler/JBIG2Stream.cc |   91
- +++++++++++++++++++++---------------------------
- poppler/JBIG2Stream.h	|    1 -
+ poppler/JBIG2Stream.cc | 91
+ ++++++++++++++++++++++----------------------------
+ poppler/JBIG2Stream.h	|  1 -
  2 files changed, 40 insertions(+), 52 deletions(-)
 
 commit 2230b8f2128edf4994d8a742f562e1b5acf96b74
@@ -9727,8 +12913,8 @@ Date:	Mon Sep 5 23:20:09 2011 +0200
 
     xpdf303: Add BufStream
 
- poppler/Stream.cc |   46 ++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Stream.h  |   25 +++++++++++++++++++++++++
+ poppler/Stream.cc | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Stream.h  | 25 +++++++++++++++++++++++++
  2 files changed, 71 insertions(+)
 
 commit 8a9d92fcf05285c1f06bc153aa79d0200d05bbd9
@@ -9737,7 +12923,7 @@ Date:	Mon Sep 5 22:57:02 2011 +0200
 
     xpdf303: CCITTFaxStream header misc fixes
 
- poppler/Stream.h |    6 +++---
+ poppler/Stream.h | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 22d370c0a1f8c016ebc5a6d8320fe55bfd31c8a7
@@ -9746,7 +12932,7 @@ Date:	Mon Sep 5 22:53:45 2011 +0200
 
     xpdf303: DCTStream misc fixes
 
- poppler/Stream.cc |   32 ++++++++++++++++++++++++++------
+ poppler/Stream.cc | 32 ++++++++++++++++++++++++++------
  1 file changed, 26 insertions(+), 6 deletions(-)
 
 commit 36d3057546b5a1d717c71b8dcb9773f91e3b5960
@@ -9755,7 +12941,7 @@ Date:	Mon Sep 5 22:46:59 2011 +0200
 
     xpdf303: Add some {}
 
- poppler/Stream.cc |	3 ++-
+ poppler/Stream.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 308654eb5dfbb783f29bd645f60c79d5b5fe42c9
@@ -9764,7 +12950,7 @@ Date:	Mon Sep 5 22:45:50 2011 +0200
 
     xpdf303: code1 changed to int in CCITTFaxStream::reset
 
- poppler/Stream.cc |	2 +-
+ poppler/Stream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f097dc1f9d580eb1cdc8180d3920fe795493cf89
@@ -9773,7 +12959,7 @@ Date:	Mon Sep 5 22:43:16 2011 +0200
 
     xpdf303: Use 32 bits in CCITTFaxStream::lookBits
 
- poppler/Stream.cc |	4 ++--
+ poppler/Stream.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit b5417659042c95891aa549cae396ba4cc6604030
@@ -9782,7 +12968,7 @@ Date:	Mon Sep 5 22:40:02 2011 +0200
 
     xpdf303: Check against lookBits returning EOF
 
- poppler/Stream.cc |   17 ++++++++++-------
+ poppler/Stream.cc | 17 ++++++++++-------
  1 file changed, 10 insertions(+), 7 deletions(-)
 
 commit eaf9d31c97a3cc06f4ce94d9190ae1a337634749
@@ -9791,7 +12977,7 @@ Date:	Mon Sep 5 22:38:05 2011 +0200
 
     xpdf303: Set endOfLine to true if code1 is 1
 
- poppler/Stream.cc |	1 +
+ poppler/Stream.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit a654a77e26a6c7d76c318636303f8c636a3d2495
@@ -9800,8 +12986,8 @@ Date:	Mon Sep 5 22:36:58 2011 +0200
 
     xpdf303: Tweaks to CCITTFaxStream::lookChar
 
- poppler/Stream.cc |   55
- +++++++++++++++++++++++++++++++++++++++++------------
+ poppler/Stream.cc | 55
+ +++++++++++++++++++++++++++++++++++++++++++------------
  1 file changed, 43 insertions(+), 12 deletions(-)
 
 commit abdf828449cd543e66f326ba862efcb3ca6d342d
@@ -9810,7 +12996,7 @@ Date:	Mon Sep 5 22:19:30 2011 +0200
 
     xpdf303: Remove cygwin workaround
 
- poppler/Stream.cc |	4 ----
+ poppler/Stream.cc | 4 ----
  1 file changed, 4 deletions(-)
 
 commit 05ef4227d09381e3a9e8050e447770f44d532386
@@ -9819,7 +13005,7 @@ Date:	Mon Sep 5 22:18:33 2011 +0200
 
     xpdf303: Return false if getLine fails
 
- poppler/Stream.cc |	4 +++-
+ poppler/Stream.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit c2d6158bd56328754d77ab8f1bf84d46e6ede773
@@ -9828,7 +13014,7 @@ Date:	Mon Sep 5 22:14:39 2011 +0200
 
     xpdf303: Return NULL if size < 0
 
- poppler/Stream.cc |	2 +-
+ poppler/Stream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 04947e1dca858b890302a5a1005b84b34255d670
@@ -9837,7 +13023,7 @@ Date:	Mon Sep 5 22:11:24 2011 +0200
 
     xpdf303: Add -rawdates and print Form information
 
- utils/pdfinfo.cc |   30 +++++++++++++++++++++++++++---
+ utils/pdfinfo.cc | 30 +++++++++++++++++++++++++++---
  1 file changed, 27 insertions(+), 3 deletions(-)
 
 commit 9529e776e53e71069ba4215cdb8b84592d37b555
@@ -9846,7 +13032,7 @@ Date:	Mon Sep 5 21:19:58 2011 +0200
 
     xpdf303: Other fixes in PostScriptFunction
 
- poppler/Function.cc |	  5 +++--
+ poppler/Function.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 071f983f461ba0b872dd93d7f1a24d325312799d
@@ -9858,7 +13044,7 @@ Date:	Mon Sep 5 21:19:13 2011 +0200
     Real numbers that start with a decimal point weren't being handled
     correctly.
 
- poppler/Function.cc |	  2 +-
+ poppler/Function.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit da0eff1aaa31c2bf357a64b6275645100c9629d4
@@ -9867,7 +13053,7 @@ Date:	Mon Sep 5 21:12:02 2011 +0200
 
     xpdf303: Fixes in StitchingFunction
 
- poppler/Function.cc |	  6 ++----
+ poppler/Function.cc | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit b655316706ec394fa6c8ad076d9d9d96ac8ed563
@@ -9876,7 +13062,7 @@ Date:	Mon Sep 5 21:05:55 2011 +0200
 
     xpdf303: Rework LinkURI decoding
 
- poppler/Link.cc |   35 +++++++++++++++++++----------------
+ poppler/Link.cc | 35 +++++++++++++++++++----------------
  1 file changed, 19 insertions(+), 16 deletions(-)
 
 commit abad9b4e44d81a206bccff8a109ceb9a7effa2ad
@@ -9885,8 +13071,8 @@ Date:	Mon Sep 5 21:00:31 2011 +0200
 
     xpdf303: Cache the last transform for PostScript-type functions
 
- poppler/Function.cc |	 37 ++++++++++++++++++++++++++++++++++---
- poppler/Function.h  |	  2 ++
+ poppler/Function.cc | 37 ++++++++++++++++++++++++++++++++++---
+ poppler/Function.h  |	2 ++
  2 files changed, 36 insertions(+), 3 deletions(-)
 
 commit e1c6b4c6e6df0854b040c9af9ef2d3f6789e24b2
@@ -9895,7 +13081,7 @@ Date:	Mon Sep 5 21:02:31 2011 +0200
 
     xpdf303: Only call getNum if isNum
 
- poppler/Link.cc |    5 +++--
+ poppler/Link.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit e5661e1a08c38d4c8d69976a8c1c02c1102bc88c
@@ -9907,9 +13093,9 @@ Date:	Mon Sep 5 20:49:13 2011 +0200
     Pull index computation code out of the transform function; cache the
     last transform.
 
- poppler/Function.cc |	 87
- ++++++++++++++++++++++++++++++++++++++++++---------
- poppler/Function.h  |	  4 ++-
+ poppler/Function.cc | 87
+ ++++++++++++++++++++++++++++++++++++++++++++---------
+ poppler/Function.h  |	4 ++-
  2 files changed, 75 insertions(+), 16 deletions(-)
 
 commit b36d150931cd555b84ee996d505e8b91e2afde19
@@ -9918,9 +13104,9 @@ Date:	Mon Sep 5 20:52:05 2011 +0200
 
     xpdf303: Take xpdf way of handling bug 6500
 
- poppler/JBIG2Stream.cc |   91
- +++++++++++++++++++++++++++---------------------
- poppler/JBIG2Stream.h	|    1 +
+ poppler/JBIG2Stream.cc | 91
+ ++++++++++++++++++++++++++++----------------------
+ poppler/JBIG2Stream.h	|  1 +
  2 files changed, 52 insertions(+), 40 deletions(-)
 
 commit 065565a67c7826b64d89fac9719049d0a57da721
@@ -9929,8 +13115,8 @@ Date:	Mon Sep 5 20:39:50 2011 +0200
 
     xpdf303: Merge ¿speed? improvements in JBIG2Stream::readGenericBitmap
 
- poppler/JBIG2Stream.cc |  586
- ++++++++++++++++++++++++++++++++++++++----------
+ poppler/JBIG2Stream.cc | 586
+ +++++++++++++++++++++++++++++++++++++++----------
  1 file changed, 471 insertions(+), 115 deletions(-)
 
 commit 28adb3884dafcf1d36aae1ec05855b10b22aa4ae
@@ -9939,7 +13125,7 @@ Date:	Mon Sep 5 20:26:57 2011 +0200
 
     xpdf303: Change bpp calculation
 
- poppler/JBIG2Stream.cc |   16 +++++++++++-----
+ poppler/JBIG2Stream.cc | 16 +++++++++++-----
  1 file changed, 11 insertions(+), 5 deletions(-)
 
 commit c163a82f45d869b7c35a1a7141ab237507671f82
@@ -9948,7 +13134,7 @@ Date:	Mon Sep 5 20:25:04 2011 +0200
 
     xpdf303: Change symCodeLen calculation
 
- poppler/JBIG2Stream.cc |   16 +++++++++++-----
+ poppler/JBIG2Stream.cc | 16 +++++++++++-----
  1 file changed, 11 insertions(+), 5 deletions(-)
 
 commit 1d1a985101c26f90bde8340dcfae3d6a1e0a08ba
@@ -9957,7 +13143,7 @@ Date:	Mon Sep 5 20:20:03 2011 +0200
 
     xpdf303: symCodeLen calculation fix
 
- poppler/JBIG2Stream.cc |   12 ++++++++----
+ poppler/JBIG2Stream.cc | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit 5c0274572c65972434293a30f3ba5afd3905005f
@@ -9966,7 +13152,7 @@ Date:	Mon Sep 5 20:07:54 2011 +0200
 
     xpdf303: add line accessor
 
- poppler/JBIG2Stream.cc |    1 +
+ poppler/JBIG2Stream.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 7b77a264b5c21ba693677b1249a2122743e4e395
@@ -9975,7 +13161,7 @@ Date:	Mon Sep 5 19:46:16 2011 +0200
 
     xpdf303: segments with unspecified length
 
- poppler/JBIG2Stream.cc |    8 +++++++-
+ poppler/JBIG2Stream.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 23066e8e8309babd61ade9f50ef7d82c9e275055
@@ -9984,7 +13170,7 @@ Date:	Mon Sep 5 19:41:16 2011 +0200
 
     xpdf303: More EOF detection
 
- poppler/JBIG2Stream.cc |   12 +++++++++---
+ poppler/JBIG2Stream.cc | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 commit bc6eded798d6e5dc7a58f88afbe4ab2904698db5
@@ -9993,7 +13179,7 @@ Date:	Mon Sep 5 19:38:29 2011 +0200
 
     xpdf303: Comment++
 
- poppler/JBIG2Stream.cc |    2 ++
+ poppler/JBIG2Stream.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit adb98856a745340b4ffb34ffd2ed701600cfc82f
@@ -10002,7 +13188,7 @@ Date:	Mon Sep 5 19:38:02 2011 +0200
 
     xpdf303: Exit loop in case of EOF
 
- poppler/JBIG2Stream.cc |   11 ++++++++---
+ poppler/JBIG2Stream.cc | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 commit 112154567ebcab63959294533b00075d6ca6ea65
@@ -10011,7 +13197,7 @@ Date:	Mon Sep 5 19:33:27 2011 +0200
 
     xpdf303: Initialize to NULL
 
- poppler/JBIG2Stream.cc |    5 +++++
+ poppler/JBIG2Stream.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit b9ecfdf4cb27a19e65817af51c048e8030825035
@@ -10020,9 +13206,9 @@ Date:	Mon Sep 5 19:27:36 2011 +0200
 
     xpdf303: Delay memory allocation up to when it is really needed
 
- poppler/CMap.cc |   58
- ++++++++-----------------------------------------------
- poppler/CMap.h  |    2 --
+ poppler/CMap.cc | 58
+ ++++++++-------------------------------------------------
+ poppler/CMap.h  |  2 --
  2 files changed, 8 insertions(+), 52 deletions(-)
 
 commit 7af7b4b2d1941ee9dcd575535d4fc31f29026d8d
@@ -10035,8 +13221,8 @@ Date:	Mon Sep 5 19:05:31 2011 +0200
     entry is
     missing and the AP contains one or more subdictionaries.
 
- poppler/Annot.cc |   62
- ++++++++++++++++++++++++++++++------------------------
+ poppler/Annot.cc | 62
+ +++++++++++++++++++++++++++++++-------------------------
  1 file changed, 34 insertions(+), 28 deletions(-)
 
 commit f7d307b818bca9553a05b5d43deb429abbf04824
@@ -10047,8 +13233,8 @@ Date:	Sun Sep 4 13:56:35 2011 +0200
 
     It was not handling non-rectangular transforms correctly.
 
- poppler/Gfx.cc |  143
- +++++++++++++++++++++++++++++---------------------------
+ poppler/Gfx.cc | 143
+ ++++++++++++++++++++++++++++++---------------------------
  1 file changed, 75 insertions(+), 68 deletions(-)
 
 commit 4609f9feeca22620c6e143962a3717784a843a68
@@ -10057,8 +13243,7 @@ Date:	Sun Sep 4 13:09:50 2011 +0200
 
     xpdf303: Implement rotation in the form field appearance regeneration
 
- poppler/Annot.cc |   51
- ++++++++++++++++++++++++++++++++++++++-------------
+ poppler/Annot.cc | 51 ++++++++++++++++++++++++++++++++++++++-------------
  1 file changed, 38 insertions(+), 13 deletions(-)
 
 commit ca7d77a27e2f3a692842968f08dcb9fa5379bf0f
@@ -10067,9 +13252,9 @@ Date:	Sun Sep 4 11:53:40 2011 +0200
 
     Create forms with a PDFDoc instead of XRef too
 
- poppler/Form.cc |   79
- ++++++++++++++++++++++++++++---------------------------
- poppler/Form.h  |   28 +++++++++++---------
+ poppler/Form.cc | 79
+ +++++++++++++++++++++++++++++----------------------------
+ poppler/Form.h  | 28 ++++++++++----------
  2 files changed, 55 insertions(+), 52 deletions(-)
 
 commit ec52e46e309a0307fdf12113a1b7d41a760f9d6c
@@ -10078,16 +13263,16 @@ Date:	Sun Sep 4 11:32:38 2011 +0200
 
     xpdf303: Create annots with a doc instead of xref + catalog
 
- glib/poppler-action.cc |    2 +-
- glib/poppler-annot.cc	|    4 +-
- poppler/Annot.cc	|  364
- ++++++++++++++++++++++++------------------------
- poppler/Annot.h	|  128 ++++++++---------
- poppler/Catalog.cc	|    9 +-
- poppler/Form.cc	|   22 +--
- poppler/Form.h		|   11 +-
- poppler/PSOutputDev.cc |    2 +-
- poppler/Page.cc	|    2 +-
+ glib/poppler-action.cc |   2 +-
+ glib/poppler-annot.cc	|   4 +-
+ poppler/Annot.cc	| 364
+ +++++++++++++++++++++++++------------------------
+ poppler/Annot.h	| 128 ++++++++---------
+ poppler/Catalog.cc	|   9 +-
+ poppler/Form.cc	|  22 +--
+ poppler/Form.h		|  11 +-
+ poppler/PSOutputDev.cc |   2 +-
+ poppler/Page.cc	|   2 +-
  9 files changed, 274 insertions(+), 270 deletions(-)
 
 commit ce5e620f07e984927610866467705bb526f9ad8d
@@ -10096,7 +13281,7 @@ Date:	Sat Sep 3 11:05:42 2011 +0200
 
     xpdf303: Handle the case where sid < 0
 
- fofi/FoFiType1C.cc |	 4 +++-
+ fofi/FoFiType1C.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 9d77f999de973f3c547245bca0568f8984faa5d7
@@ -10105,7 +13290,7 @@ Date:	Sat Sep 3 11:02:55 2011 +0200
 
     xpdf303: Initialize nFDs in FoFiType1C::parse()
 
- fofi/FoFiType1C.cc |	 1 +
+ fofi/FoFiType1C.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit d9594c95713ac79b46e313ecf2875196ea076ef4
@@ -10114,7 +13299,7 @@ Date:	Sat Sep 3 11:01:28 2011 +0200
 
     xpdf303: Check whether fdSelect is NULL before using it
 
- fofi/FoFiType1C.cc |	10 ++++++----
+ fofi/FoFiType1C.cc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 4e4a8ec52c5662e21036f219636a39fc97a32353
@@ -10123,9 +13308,9 @@ Date:	Sat Sep 3 10:52:14 2011 +0200
 
     xpdf303: Add writePSString() helper function to FoFiType1C
 
- fofi/FoFiType1C.cc |	68
- ++++++++++++++++++++++++++++++++++++++--------------
- fofi/FoFiType1C.h  |	 1 +
+ fofi/FoFiType1C.cc | 68
+ +++++++++++++++++++++++++++++++++++++++---------------
+ fofi/FoFiType1C.h  |  1 +
  2 files changed, 51 insertions(+), 18 deletions(-)
 
 commit ff03811db1ef833df4bab12fe3bf3a8c1534c174
@@ -10134,7 +13319,7 @@ Date:	Sat Sep 3 10:40:15 2011 +0200
 
     xpdf303: More checks in GooString
 
- goo/GooString.cc |    5 ++++-
+ goo/GooString.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 0029efbe2a8a97ff34353f8028ac649b2fd07013
@@ -10143,7 +13328,7 @@ Date:	Sat Sep 3 10:32:14 2011 +0200
 
     xpdf303: Use a double instead of an int with a cast
 
- goo/GooString.cc |    2 +-
+ goo/GooString.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 419ee8c30ba0df02e9f0281b321fbe38387e5a21
@@ -10152,9 +13337,9 @@ Date:	Fri Sep 2 18:44:04 2011 +0200
 
     xpdf303: Add more formats to GooString
 
- goo/GooString.cc |  102
- +++++++++++++++++++++++++++++++++++++++++++++++++-----
- goo/GooString.h  |   21 +++++++++--
+ goo/GooString.cc | 102
+ ++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ goo/GooString.h  |  21 ++++++++++--
  2 files changed, 111 insertions(+), 12 deletions(-)
 
 commit 738a6954da01fd3fc8c1cd5baa49fc7b8c959169
@@ -10163,8 +13348,8 @@ Date:	Fri Sep 2 18:24:04 2011 +0200
 
     xpdf303: Add getGlyphName() to FoFiType1C
 
- fofi/FoFiType1C.cc |	12 ++++++++++++
- fofi/FoFiType1C.h  |	 4 ++++
+ fofi/FoFiType1C.cc | 12 ++++++++++++
+ fofi/FoFiType1C.h  |  4 ++++
  2 files changed, 16 insertions(+)
 
 commit 39b77a193996b0916690a246f4a9874dad596b2f
@@ -10173,8 +13358,8 @@ Date:	Fri Sep 2 18:17:51 2011 +0200
 
     xpdf303: Improvements in FoFiType1 parser
 
- fofi/FoFiType1.cc |   75
- +++++++++++++++++++++++++----------------------------
+ fofi/FoFiType1.cc | 75
+ ++++++++++++++++++++++++++-----------------------------
  1 file changed, 35 insertions(+), 40 deletions(-)
 
 commit 44dbb28a07125f92a0835aea7ad3403310bc451d
@@ -10183,8 +13368,8 @@ Date:	Fri Sep 2 18:08:39 2011 +0200
 
     xpdf303: Handle PFB headers in Type 1 font files
 
- fofi/FoFiType1.cc |   36 ++++++++++++++++++++++++++++++++++++
- fofi/FoFiType1.h  |	1 +
+ fofi/FoFiType1.cc | 36 ++++++++++++++++++++++++++++++++++++
+ fofi/FoFiType1.h  |  1 +
  2 files changed, 37 insertions(+)
 
 commit 9531a52b227a994ab8e0d66aeaff2b21358ca73e
@@ -10194,12 +13379,12 @@ Date:	Fri Sep 2 18:01:35 2011 +0200
     xpdf303: New signature of methods convertToCIDType0() and
     convertToType0()
 
- fofi/FoFiTrueType.cc	|    8 ++---
- fofi/FoFiTrueType.h	|    4 +--
- fofi/FoFiType1C.cc	|   84
- ++++++++++++++++++++++++++++++++++--------------
- fofi/FoFiType1C.h	|   19 ++++++++---
- poppler/PSOutputDev.cc |   13 ++++++--
+ fofi/FoFiTrueType.cc	|  8 ++---
+ fofi/FoFiTrueType.h	|  4 +--
+ fofi/FoFiType1C.cc	| 84
+ +++++++++++++++++++++++++++++++++++---------------
+ fofi/FoFiType1C.h	| 19 +++++++++---
+ poppler/PSOutputDev.cc | 13 ++++++--
  5 files changed, 91 insertions(+), 37 deletions(-)
 
 commit 830d2b40770333489a08f23a3b16a372770a8d19
@@ -10208,8 +13393,8 @@ Date:	Thu Sep 1 23:23:57 2011 +0200
 
     xpdf303: Use openFile
 
- poppler/CharCodeToUnicode.cc |    4 ++--
- poppler/GlobalParams.cc      |   10 +++++-----
+ poppler/CharCodeToUnicode.cc |  4 ++--
+ poppler/GlobalParams.cc      | 10 +++++-----
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 commit ddf9d6e35b40b902519cbaa8cb664ba6dfdfd510
@@ -10218,9 +13403,9 @@ Date:	Thu Sep 1 23:21:26 2011 +0200
 
     xpdf303: openFile + minor fixes for openTempFile in Windows
 
- goo/gfile.cc |  108
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- goo/gfile.h  |   13 +++++++
+ goo/gfile.cc | 108
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ goo/gfile.h  |  13 +++++++
  2 files changed, 118 insertions(+), 3 deletions(-)
 
 commit 68e8fa9ff4f13b6703148b3eb6ea628418211243
@@ -10229,7 +13414,7 @@ Date:	Thu Sep 1 23:17:59 2011 +0200
 
     xpdf303: make gcc happy
 
- fofi/FoFiType1C.cc |	 2 ++
+ fofi/FoFiType1C.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 876021b1aa16ad38767a91e1be31c392f368fde2
@@ -10238,13 +13423,13 @@ Date:	Thu Sep 1 19:07:01 2011 +0200
 
     xpdf303: Add getFontMatrix()
 
- fofi/FoFiTrueType.cc |   76
- ++++++++++++++++++++++++++++++--------------------
- fofi/FoFiTrueType.h  |    9 ++++++
- fofi/FoFiType1.cc    |   37 ++++++++++++++++++++++++
- fofi/FoFiType1.h     |    4 +++
- fofi/FoFiType1C.cc   |   29 +++++++++++++++++++
- fofi/FoFiType1C.h    |    3 ++
+ fofi/FoFiTrueType.cc | 76
+ +++++++++++++++++++++++++++++++---------------------
+ fofi/FoFiTrueType.h  |  9 +++++++
+ fofi/FoFiType1.cc    | 37 +++++++++++++++++++++++++
+ fofi/FoFiType1.h     |  4 +++
+ fofi/FoFiType1C.cc   | 29 ++++++++++++++++++++
+ fofi/FoFiType1C.h    |  3 +++
  6 files changed, 127 insertions(+), 31 deletions(-)
 
 commit 1369862ed61ef8b0f81c52fce36f6c1602d82ddb
@@ -10253,7 +13438,7 @@ Date:	Thu Sep 1 18:27:51 2011 +0200
 
     xpdf303: Ignore entries that have an invalid tag too
 
- fofi/FoFiTrueType.cc |    8 ++++++--
+ fofi/FoFiTrueType.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 0fe7cc82e84dc2a3b79248b111656e5e7df9fdc2
@@ -10262,7 +13447,7 @@ Date:	Thu Sep 1 18:21:33 2011 +0200
 
     xpdf303: Update cmap, name, post and os2 tables in FoFiTrueType
 
- fofi/FoFiTrueType.cc |   29 ++++++++++++++++-------------
+ fofi/FoFiTrueType.cc | 29 ++++++++++++++++-------------
  1 file changed, 16 insertions(+), 13 deletions(-)
 
 commit 0feebf5f3c9da8d7a1154456a00492a623340cec
@@ -10276,7 +13461,7 @@ Date:	Thu Sep 1 18:16:59 2011 +0200
     tables array, I've kept that but doing it only when the size actually
     changes.
 
- fofi/FoFiTrueType.cc |   25 +++++++++++++------------
+ fofi/FoFiTrueType.cc | 25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)
 
 commit 68c6ebc78b89eec94a9c3538fe6e27561a21b680
@@ -10285,9 +13470,9 @@ Date:	Thu Sep 1 17:49:46 2011 +0200
 
     xpdf303: codeToGID items can be < 0 now
 
- fofi/FoFiTrueType.cc	|   12 ++++++++++--
- poppler/PSOutputDev.cc |    2 +-
- splash/SplashFTFont.cc |    2 +-
+ fofi/FoFiTrueType.cc	| 12 ++++++++++--
+ poppler/PSOutputDev.cc |  2 +-
+ splash/SplashFTFont.cc |  2 +-
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 commit 19204ed5cd5cb64809f1a1f51dd5ffdef2b9417a
@@ -10296,9 +13481,9 @@ Date:	Thu Sep 1 17:28:39 2011 +0200
 
     xpdf303: CMap::getCID signature change
 
- poppler/CMap.cc    |	47 +++++++++++++++++++++++++++++++----------------
- poppler/CMap.h     |	 8 +++++---
- poppler/GfxFont.cc |	 6 ++++--
+ poppler/CMap.cc    | 47 +++++++++++++++++++++++++++++++----------------
+ poppler/CMap.h     |  8 +++++---
+ poppler/GfxFont.cc |  6 ++++--
  3 files changed, 40 insertions(+), 21 deletions(-)
 
 commit 9c74bef77e7e1d7a8464dff43cae16bb1206665e
@@ -10307,7 +13492,7 @@ Date:	Thu Sep 1 17:04:04 2011 +0200
 
     xpdf303: Use splashDist instead of splashSqrt
 
- splash/SplashT1Font.cc |    2 +-
+ splash/SplashT1Font.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0568d0dc3c42b68b715226e5ce0ff98d73a94ac7
@@ -10318,7 +13503,7 @@ Date:	Thu Sep 1 17:01:30 2011 +0200
 
     No idea why :-D
 
- splash/SplashFTFont.cc |    8 ++++----
+ splash/SplashFTFont.cc | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 3c0da502aa1d5b1acae01cf1e43fb96f5ecc11da
@@ -10327,7 +13512,7 @@ Date:	Thu Sep 1 17:00:31 2011 +0200
 
     xpdf303: Use splashCheckDet isntead of splashAbs
 
- splash/SplashFontEngine.cc |	 2 +-
+ splash/SplashFontEngine.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2b4303c66f8de9a267413465898897fd6b0ebb17
@@ -10336,7 +13521,7 @@ Date:	Thu Sep 1 16:51:53 2011 +0200
 
     xpdf303: Bigger fileKey
 
- poppler/XRef.h |    2 +-
+ poppler/XRef.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 53060857e31a01413936fbe33b7032a0a325b384
@@ -10345,9 +13530,9 @@ Date:	Thu Sep 1 16:50:08 2011 +0200
 
     xpdf303: Merge JArithmeticDecoder.*
 
- poppler/JArithmeticDecoder.cc |   47
- +++++++++++++++++++++++++++++++++++------
- poppler/JArithmeticDecoder.h  |    4 ++++
+ poppler/JArithmeticDecoder.cc | 47
+ ++++++++++++++++++++++++++++++++++++-------
+ poppler/JArithmeticDecoder.h  |  4 ++++
  2 files changed, 44 insertions(+), 7 deletions(-)
 
 commit 0722960b4cf4ce40b6bd278ac7287d64a1d70bf2
@@ -10356,7 +13541,7 @@ Date:	Thu Sep 1 16:48:31 2011 +0200
 
     xpdf303: Do not crash if imgStr->getLine() is NULL
 
- utils/ImageOutputDev.cc |   21 ++++++++++++++-------
+ utils/ImageOutputDev.cc | 21 ++++++++++++++-------
  1 file changed, 14 insertions(+), 7 deletions(-)
 
 commit f848edab849910b8291c7974e484ef5d02b2234c
@@ -10365,8 +13550,8 @@ Date:	Thu Sep 1 16:42:30 2011 +0200
 
     xpdf303: Do not extract the million tiles of a pattern
 
- utils/ImageOutputDev.cc |    9 +++++++++
- utils/ImageOutputDev.h  |   12 ++++++++++++
+ utils/ImageOutputDev.cc |  9 +++++++++
+ utils/ImageOutputDev.h  | 12 ++++++++++++
  2 files changed, 21 insertions(+)
 
 commit 01adb7ef6a524d7313a45e7c5f441da4fd0250bd
@@ -10375,8 +13560,8 @@ Date:	Thu Sep 1 16:31:50 2011 +0200
 
     xpdf303: Assembler for some functions
 
- splash/SplashMath.h |	110
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ splash/SplashMath.h | 110
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 110 insertions(+)
 
 commit 4f87a3163f133565e8774ef416e67d05f906723d
@@ -10385,7 +13570,7 @@ Date:	Thu Sep 1 16:25:19 2011 +0200
 
     xpdf303: Add splashAvg
 
- splash/SplashMath.h |	  8 ++++++++
+ splash/SplashMath.h | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 64cf42f89939763d105be4948a20e9ecb81a64c1
@@ -10394,7 +13579,7 @@ Date:	Thu Sep 1 16:23:08 2011 +0200
 
     xpdf303: Add getters to SplashClip
 
- splash/SplashClip.h |	  6 ++++++
+ splash/SplashClip.h | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 28c6a55742f55a719ef63b8e0eff7c242653cf36
@@ -10403,7 +13588,7 @@ Date:	Thu Sep 1 16:17:56 2011 +0200
 
     xpdf303: unneeded forward declare
 
- poppler/Page.h |    1 -
+ poppler/Page.h | 1 -
  1 file changed, 1 deletion(-)
 
 commit 38ebe8c568aafbe5f248f9e0a654f46829e0b659
@@ -10412,24 +13597,24 @@ Date:	Thu Sep 1 16:13:53 2011 +0200
 
     xpdf303: Page functions do not need Catalog * anymore
 
- glib/poppler-document.cc		  |    2 +-
- glib/poppler-page.cc			  |   11 ++++-----
- poppler/FontInfo.cc			  |    2 +-
- poppler/OutputDev.h			  |    4 ++--
- poppler/PDFDoc.cc			  |    8 +++----
- poppler/PSOutputDev.cc			  |    6 ++---
- poppler/PSOutputDev.h			  |    2 +-
- poppler/Page.cc			  |   36
- +++++++++++++++---------------
- poppler/Page.h				  |   16 ++++++-------
- poppler/TextOutputDev.cc		  |    2 +-
- poppler/TextOutputDev.h		  |    2 +-
- qt4/src/poppler-link-extractor-private.h |    2 +-
- qt4/src/poppler-link-extractor.cc	  |    4 ++--
- qt4/src/poppler-page.cc		  |    4 ++--
- utils/HtmlOutputDev.cc			  |    9 ++++----
- utils/HtmlOutputDev.h			  |    7 +++---
- utils/pdftohtml.cc			  |    2 +-
+ glib/poppler-document.cc		  |  2 +-
+ glib/poppler-page.cc			  | 11 ++++------
+ poppler/FontInfo.cc			  |  2 +-
+ poppler/OutputDev.h			  |  4 ++--
+ poppler/PDFDoc.cc			  |  8 +++----
+ poppler/PSOutputDev.cc			  |  6 +++---
+ poppler/PSOutputDev.h			  |  2 +-
+ poppler/Page.cc			  | 36
+ ++++++++++++++++----------------
+ poppler/Page.h				  | 16 +++++++-------
+ poppler/TextOutputDev.cc		  |  2 +-
+ poppler/TextOutputDev.h		  |  2 +-
+ qt4/src/poppler-link-extractor-private.h |  2 +-
+ qt4/src/poppler-link-extractor.cc	  |  4 ++--
+ qt4/src/poppler-page.cc		  |  4 ++--
+ utils/HtmlOutputDev.cc			  |  9 ++++----
+ utils/HtmlOutputDev.h			  |  7 +++----
+ utils/pdftohtml.cc			  |  2 +-
  17 files changed, 58 insertions(+), 61 deletions(-)
 
 commit 7d794f6411499fb8f26778bf2b54cb9734d004af
@@ -10438,35 +13623,35 @@ Date:	Thu Sep 1 15:47:32 2011 +0200
 
     xpdf303: API rework, Gfx wants a PDFDoc instead of an XRef
 
- cpp/poppler-page-renderer.cpp	 |    2 +-
- glib/poppler-document.cc	 |    2 +-
- glib/poppler-page.cc		 |    2 --
- poppler/CairoFontEngine.cc	 |   28 ++++++++++++----------------
- poppler/CairoFontEngine.h	 |   13 ++++++-------
- poppler/CairoOutputDev.cc	 |   12 +++++-------
- poppler/CairoOutputDev.h	 |    6 +++---
- poppler/Catalog.cc		 |    8 +++++---
- poppler/Catalog.h		 |    4 +++-
- poppler/Gfx.cc			 |   15 +++++++++------
- poppler/Gfx.h			 |    6 ++++--
- poppler/PDFDoc.cc		 |    6 +++---
- poppler/PSOutputDev.cc		 |   29 +++++++++++++++--------------
- poppler/PSOutputDev.h		 |    9 ++++-----
- poppler/Page.cc		 |    8 +++++---
- poppler/Page.h			 |    4 +++-
- poppler/PreScanOutputDev.cc	 |    6 +++---
- poppler/PreScanOutputDev.h	 |    4 ++--
- poppler/SplashOutputDev.cc	 |   13 +++++++------
- poppler/SplashOutputDev.h	 |    5 +++--
- qt4/src/poppler-private.h	 |    2 +-
- qt4/src/poppler-ps-converter.cc |    2 --
- test/gtk-test.cc		 |    2 +-
- test/pdf-inspector.cc		 |    2 +-
- test/perf-test.cc		 |    2 +-
- utils/pdftocairo.cc		 |    2 +-
- utils/pdftohtml.cc		 |    6 +++---
- utils/pdftoppm.cc		 |    2 +-
- utils/pdftops.cc		 |    4 ++--
+ cpp/poppler-page-renderer.cpp	 |  2 +-
+ glib/poppler-document.cc	 |  2 +-
+ glib/poppler-page.cc		 |  2 --
+ poppler/CairoFontEngine.cc	 | 28 ++++++++++++----------------
+ poppler/CairoFontEngine.h	 | 13 ++++++-------
+ poppler/CairoOutputDev.cc	 | 12 +++++-------
+ poppler/CairoOutputDev.h	 |  6 +++---
+ poppler/Catalog.cc		 |  8 +++++---
+ poppler/Catalog.h		 |  4 +++-
+ poppler/Gfx.cc			 | 15 +++++++++------
+ poppler/Gfx.h			 |  6 ++++--
+ poppler/PDFDoc.cc		 |  6 +++---
+ poppler/PSOutputDev.cc		 | 29 +++++++++++++++--------------
+ poppler/PSOutputDev.h		 |  9 ++++-----
+ poppler/Page.cc		 |  8 +++++---
+ poppler/Page.h			 |  4 +++-
+ poppler/PreScanOutputDev.cc	 |  6 +++---
+ poppler/PreScanOutputDev.h	 |  4 ++--
+ poppler/SplashOutputDev.cc	 | 13 +++++++------
+ poppler/SplashOutputDev.h	 |  5 +++--
+ qt4/src/poppler-private.h	 |  2 +-
+ qt4/src/poppler-ps-converter.cc |  2 --
+ test/gtk-test.cc		 |  2 +-
+ test/pdf-inspector.cc		 |  2 +-
+ test/perf-test.cc		 |  2 +-
+ utils/pdftocairo.cc		 |  2 +-
+ utils/pdftohtml.cc		 |  6 +++---
+ utils/pdftoppm.cc		 |  2 +-
+ utils/pdftops.cc		 |  4 ++--
  29 files changed, 105 insertions(+), 101 deletions(-)
 
 commit 52fb80a7b3f98eb8322a7ba84e2900f044b3a18a
@@ -10475,7 +13660,7 @@ Date:	Thu Sep 1 13:27:01 2011 +0200
 
     xpdf303: compile++
 
- poppler/ArthurOutputDev.cc |	 4 ++--
+ poppler/ArthurOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 37ca8dc4215693ec657d165ebdb6c315a0ae92c9
@@ -10484,22 +13669,22 @@ Date:	Thu Sep 1 12:34:32 2011 +0200
 
     xpdf303: Use int instead of Gushort for gid/cid maps
 
- fofi/FoFiTrueType.cc	      |   18 +++++++++---------
- fofi/FoFiTrueType.h	      |   14 +++++++-------
- fofi/FoFiType1C.cc	      |    8 ++++----
- fofi/FoFiType1C.h	      |    2 +-
- poppler/CairoFontEngine.cc   |   22 +++++++++++-----------
- poppler/CairoFontEngine.h    |    8 ++++----
- poppler/GfxFont.cc	      |   22 +++++++++++-----------
- poppler/GfxFont.h	      |   10 +++++-----
- poppler/PSOutputDev.cc       |   14 +++++++-------
- poppler/SplashOutputDev.cc   |    6 +++---
- splash/SplashFTFontEngine.cc |    6 +++---
- splash/SplashFTFontEngine.h  |    2 +-
- splash/SplashFTFontFile.cc   |   12 ++++++------
- splash/SplashFTFontFile.h    |    8 ++++----
- splash/SplashFontEngine.cc   |    2 +-
- splash/SplashFontEngine.h    |    2 +-
+ fofi/FoFiTrueType.cc	      | 18 +++++++++---------
+ fofi/FoFiTrueType.h	      | 14 +++++++-------
+ fofi/FoFiType1C.cc	      |  8 ++++----
+ fofi/FoFiType1C.h	      |  2 +-
+ poppler/CairoFontEngine.cc   | 22 +++++++++++-----------
+ poppler/CairoFontEngine.h    |  8 ++++----
+ poppler/GfxFont.cc	      | 22 +++++++++++-----------
+ poppler/GfxFont.h	      | 10 +++++-----
+ poppler/PSOutputDev.cc       | 14 +++++++-------
+ poppler/SplashOutputDev.cc   |  6 +++---
+ splash/SplashFTFontEngine.cc |  6 +++---
+ splash/SplashFTFontEngine.h  |  2 +-
+ splash/SplashFTFontFile.cc   | 12 ++++++------
+ splash/SplashFTFontFile.h    |  8 ++++----
+ splash/SplashFontEngine.cc   |  2 +-
+ splash/SplashFontEngine.h    |  2 +-
  16 files changed, 78 insertions(+), 78 deletions(-)
 
 commit df942e25bff9b014bde0ff69c8a01fa3c1963015
@@ -10508,7 +13693,7 @@ Date:	Thu Sep 1 01:08:10 2011 +0200
 
     xpdf303: More parsing flexibility
 
- poppler/CharCodeToUnicode.cc |   18 ++++++------------
+ poppler/CharCodeToUnicode.cc | 18 ++++++------------
  1 file changed, 6 insertions(+), 12 deletions(-)
 
 commit 5305dfc5702e8004e5ae35697c6aebd0b1a5c96e
@@ -10517,7 +13702,7 @@ Date:	Thu Sep 1 01:05:02 2011 +0200
 
     xpdf303: Make sure codes are inside the range
 
- poppler/CharCodeToUnicode.cc |   17 ++++++++++++++++-
+ poppler/CharCodeToUnicode.cc | 17 ++++++++++++++++-
  1 file changed, 16 insertions(+), 1 deletion(-)
 
 commit 45212483572c68abd612b5c62b21cbb545e10143
@@ -10526,7 +13711,7 @@ Date:	Thu Sep 1 01:01:13 2011 +0200
 
     xpdf303: change mapLen growing stragegy
 
- poppler/CharCodeToUnicode.cc |    5 ++++-
+ poppler/CharCodeToUnicode.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 75d70f190e97f69047cdbe97a872a936788392d9
@@ -10535,7 +13720,7 @@ Date:	Thu Sep 1 01:00:23 2011 +0200
 
     xpdf303: Limit code to  0xffffff
 
- poppler/CharCodeToUnicode.cc |    5 +++++
+ poppler/CharCodeToUnicode.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit b4180a187f9246b6390df112e5536ead9ef9bcbe
@@ -10544,7 +13729,7 @@ Date:	Thu Sep 1 00:59:09 2011 +0200
 
     xpdf303: Use parseHex instead of sscanf
 
- poppler/CharCodeToUnicode.cc |   18 ++++++++----------
+ poppler/CharCodeToUnicode.cc | 18 ++++++++----------
  1 file changed, 8 insertions(+), 10 deletions(-)
 
 commit 121f648f233adcdc631c7e29d67b60baa922e29a
@@ -10553,7 +13738,7 @@ Date:	Thu Sep 1 00:28:40 2011 +0200
 
     Add helper parseHex function
 
- poppler/CharCodeToUnicode.cc |   35 +++++++++++++++++++++++++++++++++++
+ poppler/CharCodeToUnicode.cc | 35 +++++++++++++++++++++++++++++++++++
  1 file changed, 35 insertions(+)
 
 commit be0436ace671070bab4304efee607f40c959bc55
@@ -10562,8 +13747,8 @@ Date:	Thu Sep 1 00:26:57 2011 +0200
 
     xpdf303: CharCodeToUnicode::makeIdentityMapping & friends
 
- poppler/CharCodeToUnicode.cc |   25 +++++++++++++++++++++++++
- poppler/CharCodeToUnicode.h  |    4 ++++
+ poppler/CharCodeToUnicode.cc | 25 +++++++++++++++++++++++++
+ poppler/CharCodeToUnicode.h  |  4 ++++
  2 files changed, 29 insertions(+)
 
 commit 5dd94447b14db1894f06ad0590187dae7575e33a
@@ -10572,8 +13757,8 @@ Date:	Thu Sep 1 00:15:59 2011 +0200
 
     xpdf303: Remove unused constructor
 
- splash/SplashXPath.cc |    5 -----
- splash/SplashXPath.h  |    1 -
+ splash/SplashXPath.cc | 5 -----
+ splash/SplashXPath.h  | 1 -
  2 files changed, 6 deletions(-)
 
 commit d00d56e4a46e8534378534de0d94ce0551d75d84
@@ -10585,9 +13770,9 @@ Date:	Thu Sep 1 00:11:49 2011 +0200
     By using << instead of * and by putting some functions on the header
     so they can be inlined
 
- splash/SplashScreen.cc |   89
- ++++++++++++++++--------------------------------
- splash/SplashScreen.h	|   14 ++++++--
+ splash/SplashScreen.cc | 89
+ +++++++++++++++++---------------------------------
+ splash/SplashScreen.h	| 14 ++++++--
  2 files changed, 42 insertions(+), 61 deletions(-)
 
 commit 5e8debf96ab1bb9db31a0332a482d08c181d52ea
@@ -10596,7 +13781,7 @@ Date:	Wed Aug 31 23:56:52 2011 +0200
 
     xpdf303: Add splashCheckDet helper
 
- splash/SplashMath.h |	 10 ++++++++++
+ splash/SplashMath.h | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 4cef5a52b33b1afba28d890bbe48000b734ac357
@@ -10605,7 +13790,7 @@ Date:	Wed Aug 31 21:09:50 2011 +0200
 
     xpdf303: Protect against NULL from lexer->getStream()
 
- poppler/Parser.cc |	5 ++++-
+ poppler/Parser.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 2547ec60db6d954e5c8318e30fcc54f70bcfa95c
@@ -10614,8 +13799,8 @@ Date:	Wed Aug 31 21:05:11 2011 +0200
 
     xpdf303: Add GBool force = gFalse to SplashPath::close
 
- splash/SplashPath.cc |    5 +++--
- splash/SplashPath.h  |    6 ++++--
+ splash/SplashPath.cc | 5 +++--
+ splash/SplashPath.h  | 6 ++++--
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 commit 9370f9640a24c7b944f3da7c10e070a960bdd8f9
@@ -10624,7 +13809,7 @@ Date:	Wed Aug 31 21:01:32 2011 +0200
 
     xpdf303: Add guards to the header
 
- poppler/Stream-CCITT.h |    5 +++++
+ poppler/Stream-CCITT.h | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit ab9dea663a4df5af8f54c1ff5149254adfd72ce9
@@ -10634,8 +13819,8 @@ Date:	Wed Aug 31 20:34:17 2011 +0200
     xpdf303: Add SplashBitmap::writeAlphaPGMFile and
     SplashBitmap::takeData
 
- splash/SplashBitmap.cc |   22 ++++++++++++++++++++++
- splash/SplashBitmap.h	|    6 ++++++
+ splash/SplashBitmap.cc | 22 ++++++++++++++++++++++
+ splash/SplashBitmap.h	|  6 ++++++
  2 files changed, 28 insertions(+)
 
 commit 6558d735c65a3dca9b9e16de5588c8b8c482f04f
@@ -10644,7 +13829,7 @@ Date:	Wed Aug 31 20:30:27 2011 +0200
 
     xpdf303: Write faster
 
- splash/SplashBitmap.cc |   14 ++------------
+ splash/SplashBitmap.cc | 14 ++------------
  1 file changed, 2 insertions(+), 12 deletions(-)
 
 commit a9b26d9c35fccc7b46a96acdb2064a9976bd49bd
@@ -10653,7 +13838,7 @@ Date:	Wed Aug 31 20:29:58 2011 +0200
 
     xpdf303: Only free data if there is data to free
 
- splash/SplashBitmap.cc |   11 ++++++-----
+ splash/SplashBitmap.cc | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 8f6e0285d7e80d8c1a8defaad9d0f87a2e054151
@@ -10665,7 +13850,7 @@ Date:	Wed Aug 31 20:20:47 2011 +0200
     This overwrites Michael Vrable's changes of using U+FFFD to actually
     using the order, i'm taking Derek's change here
 
- poppler/PDFDocEncoding.cc |	6 +++---
+ poppler/PDFDocEncoding.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 9c8f30fb4a2a0dd2cf359610e33749e1682921c7
@@ -10674,7 +13859,7 @@ Date:	Wed Aug 31 20:17:38 2011 +0200
 
     xpdf303: comment changes
 
- poppler/Link.h |    6 ++++--
+ poppler/Link.h | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit b78046057657b44c5cc9353d9e3dde356eb7fcbd
@@ -10683,8 +13868,8 @@ Date:	Wed Aug 31 19:32:03 2011 +0200
 
     xpdf303: Introduce unicodeTypeNum and unicodeTypeAlphaNum
 
- poppler/UnicodeTypeTable.cc |	 11 +++++++++++
- poppler/UnicodeTypeTable.h  |	  4 ++++
+ poppler/UnicodeTypeTable.cc | 11 +++++++++++
+ poppler/UnicodeTypeTable.h  |	4 ++++
  2 files changed, 15 insertions(+)
 
 commit 0ec4b390ddb7fa7d028b8f0515ecd3e61c488c9f
@@ -10693,7 +13878,7 @@ Date:	Wed Aug 31 19:30:55 2011 +0200
 
     xpdf303: UnicodeTypeTable tables changes
 
- poppler/UnicodeTypeTable.cc |	 28 ++++++++++++++--------------
+ poppler/UnicodeTypeTable.cc | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
 
 commit f331c009f94703d6007fce9570ee19c6e4822339
@@ -10702,9 +13887,9 @@ Date:	Wed Aug 31 19:20:12 2011 +0200
 
     xpdf303: Remove warning() from Error.h
 
- poppler/CairoOutputDev.cc |	6 +++---
- poppler/Error.cc	   |	7 -------
- poppler/Error.h	   |	1 -
+ poppler/CairoOutputDev.cc | 6 +++---
+ poppler/Error.cc	   | 7 -------
+ poppler/Error.h	   | 1 -
  3 files changed, 3 insertions(+), 11 deletions(-)
 
 commit 53f94df2ce21793914ccc153ba6b2fe5cbeb8371
@@ -10713,11 +13898,11 @@ Date:	Wed Aug 31 19:17:13 2011 +0200
 
     Port to setErrorCallback
 
- cpp/poppler-document.cpp   |	 2 +-
- cpp/poppler-private.cpp    |	 6 ++----
- cpp/poppler-private.h	    |	 3 ++-
- qt4/src/poppler-private.cc |	 8 +++-----
- test/perf-test.cc	    |	 4 ++--
+ cpp/poppler-document.cpp   | 2 +-
+ cpp/poppler-private.cpp    | 6 ++----
+ cpp/poppler-private.h	    | 3 ++-
+ qt4/src/poppler-private.cc | 8 +++-----
+ test/perf-test.cc	    | 4 ++--
  5 files changed, 10 insertions(+), 13 deletions(-)
 
 commit 95a52f06a98f49f7c8f2b92634b75af96b4eee1d
@@ -10726,7 +13911,7 @@ Date:	Wed Aug 31 19:07:22 2011 +0200
 
     xpdf303: Forgot this when doing the char * -> const char *
 
- poppler/JPXStream.cc |    2 +-
+ poppler/JPXStream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 00549400f155d8e36b4ac718603fc945858fe50d
@@ -10735,69 +13920,69 @@ Date:	Wed Aug 31 19:04:14 2011 +0200
 
     xpdf303: error() changes, new param and formatting
 
- fofi/FoFiBase.cc	      |    8 +--
- fofi/FoFiTrueType.cc	      |    2 +-
- fofi/FoFiType1.cc	      |    4 +-
- goo/JpegWriter.cc	      |    2 +-
- goo/PNGWriter.cc	      |   16 ++---
- poppler/Annot.cc	      |   40 +++++------
- poppler/ArthurOutputDev.cc   |   16 ++---
- poppler/CMap.cc	      |   26 +++----
- poppler/CachedFile.cc	      |    2 +-
- poppler/CairoFontEngine.cc   |   10 +--
- poppler/Catalog.cc	      |   50 ++++++-------
- poppler/CharCodeToUnicode.cc |   54 +++++++-------
- poppler/CurlCachedFile.cc    |    2 +-
- poppler/DCTStream.cc	      |    2 +-
- poppler/Decrypt.cc	      |    2 +-
- poppler/Error.cc	      |   55 +++++++++-----
- poppler/Error.h	      |   23 +++++-
- poppler/FileSpec.cc	      |    8 +--
- poppler/Form.cc	      |   44 ++++++------
- poppler/Function.cc	      |  107 ++++++++++++++-------------
- poppler/Gfx.cc		      |  161
- ++++++++++++++++++++---------------------
- poppler/GfxFont.cc	      |  102 +++++++++++++-------------
- poppler/GfxState.cc	      |  128 ++++++++++++++++-----------------
- poppler/GfxState.h	      |    8 +--
- poppler/GlobalParams.cc      |   38 +++++-----
- poppler/GlobalParamsWin.cc   |    4 +-
- poppler/Hints.cc	      |   22 +++---
- poppler/JBIG2Stream.cc       |   88 +++++++++++------------
- poppler/JPEG2000Stream.cc    |   10 +--
- poppler/JPXStream.cc	      |  164
+ fofi/FoFiBase.cc	      |   8 +--
+ fofi/FoFiTrueType.cc	      |   2 +-
+ fofi/FoFiType1.cc	      |   4 +-
+ goo/JpegWriter.cc	      |   2 +-
+ goo/PNGWriter.cc	      |  16 ++---
+ poppler/Annot.cc	      |  40 +++++------
+ poppler/ArthurOutputDev.cc   |  16 ++---
+ poppler/CMap.cc	      |  26 +++----
+ poppler/CachedFile.cc	      |   2 +-
+ poppler/CairoFontEngine.cc   |  10 +--
+ poppler/Catalog.cc	      |  50 ++++++-------
+ poppler/CharCodeToUnicode.cc |  54 +++++++-------
+ poppler/CurlCachedFile.cc    |   2 +-
+ poppler/DCTStream.cc	      |   2 +-
+ poppler/Decrypt.cc	      |   2 +-
+ poppler/Error.cc	      |  55 ++++++++++-----
+ poppler/Error.h	      |  23 +++++-
+ poppler/FileSpec.cc	      |   8 +--
+ poppler/Form.cc	      |  44 ++++++------
+ poppler/Function.cc	      | 107 ++++++++++++++--------------
+ poppler/Gfx.cc		      | 161
  +++++++++++++++++++++---------------------
- poppler/Lexer.cc	      |   24 +++----
- poppler/Linearization.cc     |   20 +++---
- poppler/Link.cc	      |   77 ++++++++++----------
- poppler/Movie.cc	      |    2 +-
- poppler/Object.h	      |    8 +--
- poppler/OptionalContent.cc   |   14 ++--
- poppler/PDFDoc.cc	      |   43 ++++++-----
- poppler/PDFDocFactory.cc     |    2 +-
- poppler/PSOutputDev.cc       |   45 ++++++------
- poppler/Page.cc	      |   12 ++--
- poppler/Parser.cc	      |   10 +--
- poppler/Rendition.cc	      |    6 +-
- poppler/SecurityHandler.cc   |   12 ++--
- poppler/SplashOutputDev.cc   |   28 ++++----
- poppler/Stream.cc	      |  116 +++++++++++++++++-------------
- poppler/TextOutputDev.cc     |    2 +-
- poppler/UnicodeMap.cc	      |   15 ++--
- poppler/XRef.cc	      |   32 ++++-----
- splash/Splash.cc	      |    2 +-
- splash/SplashBitmap.cc       |    6 +-
- test/perf-test.cc	      |    4 +-
- utils/HtmlOutputDev.cc       |   18 ++---
- utils/ImageOutputDev.cc      |   10 +--
- utils/pdfextract.cc	      |    4 +-
- utils/pdfimages.cc	      |    2 +-
- utils/pdfinfo.cc	      |    6 +-
- utils/pdfmerge.cc	      |    6 +-
- utils/pdftocairo.cc	      |    6 +-
- utils/pdftohtml.cc	      |    6 +-
- utils/pdftops.cc	      |    6 +-
- utils/pdftotext.cc	      |   12 ++--
+ poppler/GfxFont.cc	      | 102 ++++++++++++++-------------
+ poppler/GfxState.cc	      | 128 ++++++++++++++++-----------------
+ poppler/GfxState.h	      |   8 +--
+ poppler/GlobalParams.cc      |  38 +++++-----
+ poppler/GlobalParamsWin.cc   |   4 +-
+ poppler/Hints.cc	      |  22 +++---
+ poppler/JBIG2Stream.cc       |  88 +++++++++++------------
+ poppler/JPEG2000Stream.cc    |  10 +--
+ poppler/JPXStream.cc	      | 164
+ ++++++++++++++++++++++---------------------
+ poppler/Lexer.cc	      |  24 +++----
+ poppler/Linearization.cc     |  20 +++---
+ poppler/Link.cc	      |  77 ++++++++++----------
+ poppler/Movie.cc	      |   2 +-
+ poppler/Object.h	      |   8 +--
+ poppler/OptionalContent.cc   |  14 ++--
+ poppler/PDFDoc.cc	      |  43 ++++++------
+ poppler/PDFDocFactory.cc     |   2 +-
+ poppler/PSOutputDev.cc       |  45 ++++++------
+ poppler/Page.cc	      |  12 ++--
+ poppler/Parser.cc	      |  10 +--
+ poppler/Rendition.cc	      |   6 +-
+ poppler/SecurityHandler.cc   |  12 ++--
+ poppler/SplashOutputDev.cc   |  28 ++++----
+ poppler/Stream.cc	      | 116 ++++++++++++++++--------------
+ poppler/TextOutputDev.cc     |   2 +-
+ poppler/UnicodeMap.cc	      |  15 ++--
+ poppler/XRef.cc	      |  32 ++++-----
+ splash/Splash.cc	      |   2 +-
+ splash/SplashBitmap.cc       |   6 +-
+ test/perf-test.cc	      |   4 +-
+ utils/HtmlOutputDev.cc       |  18 ++---
+ utils/ImageOutputDev.cc      |  10 +--
+ utils/pdfextract.cc	      |   4 +-
+ utils/pdfimages.cc	      |   2 +-
+ utils/pdfinfo.cc	      |   6 +-
+ utils/pdfmerge.cc	      |   6 +-
+ utils/pdftocairo.cc	      |   6 +-
+ utils/pdftohtml.cc	      |   6 +-
+ utils/pdftops.cc	      |   6 +-
+ utils/pdftotext.cc	      |  12 ++--
  61 files changed, 912 insertions(+), 842 deletions(-)
 
 commit cd0764921064bfd455e9df52dc9bda6fbd2c2db2
@@ -10806,8 +13991,8 @@ Date:	Wed Aug 31 17:23:28 2011 +0200
 
     xpdf303: Always define at least 256 glyphs for Type 0 fonts
 
- fofi/FoFiTrueType.cc |   41 ++++++++++++++++++++++++++++++++++-------
- fofi/FoFiTrueType.h  |    3 ++-
+ fofi/FoFiTrueType.cc | 41 ++++++++++++++++++++++++++++++++++-------
+ fofi/FoFiTrueType.h  |  3 ++-
  2 files changed, 36 insertions(+), 8 deletions(-)
 
 commit 4d4318e258fb68704b1a51a14fa89134606e2aa7
@@ -10816,7 +14001,7 @@ Date:	Wed Aug 31 17:07:25 2011 +0200
 
     xpdf303: Different growing strategy for vmtxTab in FoFiTrueType
 
- fofi/FoFiTrueType.cc |    2 +-
+ fofi/FoFiTrueType.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c8c7fcef9bc8f802be2d376c9d2099971f159317
@@ -10825,7 +14010,7 @@ Date:	Wed Aug 31 17:05:16 2011 +0200
 
     xpdf303: Fix memory leak in FoFiTrueType
 
- fofi/FoFiTrueType.cc |    4 +++-
+ fofi/FoFiTrueType.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 655b1a97db5449c009e5b63fc7c12233e6fae450
@@ -10835,7 +14020,7 @@ Date:	Wed Aug 31 16:54:05 2011 +0200
     xpdf303: Check for an invalid loca format field in the head table
     in FoFiTrueType
 
- fofi/FoFiTrueType.cc |    7 +++++++
+ fofi/FoFiTrueType.cc | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 9710ab96f1cf26394cc473952a3331d60c149451
@@ -10844,7 +14029,7 @@ Date:	Wed Aug 31 16:49:54 2011 +0200
 
     Fix the build
 
- fofi/FoFiIdentifier.cc |    2 +-
+ fofi/FoFiIdentifier.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 36b733a3165fd26aa8c25ba57faa5d2277aa31ec
@@ -10856,7 +14041,7 @@ Date:	Tue Aug 30 16:31:52 2011 +0200
     where the offset is past the end of the glyf table. This part was
     missing in previous commit.
 
- fofi/FoFiTrueType.cc |    9 +++++++--
+ fofi/FoFiTrueType.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit a288bdb417582f07a5a0cb13d5218946a1d0ccc8
@@ -10865,7 +14050,7 @@ Date:	Tue Aug 30 21:55:43 2011 +0200
 
     xpdf303: Increase max keyLength to 32
 
- poppler/XRef.cc |    4 ++--
+ poppler/XRef.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 12e0acd9d393df76e297bb3fde323092c428be21
@@ -10874,7 +14059,7 @@ Date:	Tue Aug 30 21:03:05 2011 +0200
 
     xpdf303: GfxXXXpath different growing strategy
 
- poppler/GfxState.cc |	 10 +++++-----
+ poppler/GfxState.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 7c5e496715f56498fb1aa08371d2b8d4d0e73d25
@@ -10883,7 +14068,7 @@ Date:	Tue Aug 30 20:59:36 2011 +0200
 
     xpdf303: No need for 4 Guint when 1 is enough
 
- poppler/GfxState.cc |	  6 +++---
+ poppler/GfxState.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit e7e8082901e108130d5c98cc7648f143978c9562
@@ -10892,8 +14077,8 @@ Date:	Tue Aug 30 20:50:17 2011 +0200
 
     xpdf303: GooList::copy, GooList::reverse and GooList::put
 
- goo/GooList.cc |   22 ++++++++++++++++++++++
- goo/GooList.h	|   10 ++++++++++
+ goo/GooList.cc | 22 ++++++++++++++++++++++
+ goo/GooList.h	| 10 ++++++++++
  2 files changed, 32 insertions(+)
 
 commit 8a119cf205467c20269e7beffde9497ffd277c15
@@ -10902,7 +14087,7 @@ Date:	Tue Aug 30 20:48:40 2011 +0200
 
     xpdf303: Inserting with a negative i means prepending
 
- goo/GooList.cc |    3 +++
+ goo/GooList.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 95142a8e63e476324e368785001a23d4f1d462b9
@@ -10911,7 +14096,7 @@ Date:	Tue Aug 30 20:47:12 2011 +0200
 
     xpdf303: If size is 0 reserve 8 anyway
 
- goo/GooList.cc |    2 +-
+ goo/GooList.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bd1076da03f76fb62998a9409d366412f4aa5d13
@@ -10920,7 +14105,7 @@ Date:	Tue Aug 30 20:45:36 2011 +0200
 
     xpdf303: Complain for gmalloc and grealloc < 0
 
- goo/gmem.cc |	 28 ++++++++++++++++++++++++----
+ goo/gmem.cc | 28 ++++++++++++++++++++++++----
  1 file changed, 24 insertions(+), 4 deletions(-)
 
 commit 5a42b3693a9e501a27d790d4aeafcb68f63cb950
@@ -10929,7 +14114,7 @@ Date:	Tue Aug 30 20:38:39 2011 +0200
 
     xpdf303: Honor the deleteKeys setting
 
- goo/GooHash.cc |    8 ++++++--
+ goo/GooHash.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit d584b54eff52c47f983947b2aff0967dfed0ccf9
@@ -10938,7 +14123,7 @@ Date:	Tue Aug 30 20:36:03 2011 +0200
 
     xpdf303: set to NULL on failure
 
- goo/gfile.cc |    2 ++
+ goo/gfile.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit bf2cb5c9c47b4a61192101f0a48771657228e383
@@ -10950,7 +14135,7 @@ Date:	Tue Aug 30 19:08:40 2011 +0930
     libpng 1.5.0 changed one of the types in the png_set_iCCP() function
     prototype.
 
- goo/PNGWriter.cc |    9 ++++++++-
+ goo/PNGWriter.cc | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit 6364c50ffb4053cc30cecbefff7a3142cab8c50b
@@ -10959,13 +14144,13 @@ Date:	Tue Aug 30 18:27:09 2011 +0200
 
     xpdf303: Support for aes256 et all in Decrypt/SecurityHandler
 
- poppler/Decrypt.cc	    |  488
- ++++++++++++++++++++++++++++++++++++++------
- poppler/Decrypt.h	    |	19 +-
- poppler/PDFDoc.cc	    |	 2 +-
- poppler/SecurityHandler.cc |  238 ++++++++++++---------
- poppler/SecurityHandler.h  |	 7 +-
- poppler/Stream.h	    |	 3 +-
+ poppler/Decrypt.cc	    | 488
+ +++++++++++++++++++++++++++++++++++++++------
+ poppler/Decrypt.h	    |  19 +-
+ poppler/PDFDoc.cc	    |	2 +-
+ poppler/SecurityHandler.cc | 238 ++++++++++++----------
+ poppler/SecurityHandler.h  |	7 +-
+ poppler/Stream.h	    |	3 +-
  6 files changed, 595 insertions(+), 162 deletions(-)
 
 commit 39ce4575f96953b499d09074e847d492d18379fa
@@ -10974,11 +14159,11 @@ Date:	Tue Aug 30 17:39:30 2011 +0200
 
     xpdf303: Add FoFiIdentifier
 
- CMakeLists.txt		|    2 +
- fofi/FoFiIdentifier.cc |  630
- ++++++++++++++++++++++++++++++++++++++++++++++++
- fofi/FoFiIdentifier.h	|   42 ++++
- fofi/Makefile.am	|    2 +
+ CMakeLists.txt		|   2 +
+ fofi/FoFiIdentifier.cc | 630
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ fofi/FoFiIdentifier.h	|  42 ++++
+ fofi/Makefile.am	|   2 +
  4 files changed, 676 insertions(+)
 
 commit 33e7d54b4a29d297108ef3dc6008190625125ec8
@@ -10987,7 +14172,7 @@ Date:	Tue Aug 30 17:36:22 2011 +0200
 
     xpdf303: Also check against INT_MAX in FoFiBase
 
- fofi/FoFiBase.cc |   10 +++++-----
+ fofi/FoFiBase.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit fb1f56f091e5329b30279916b182f64134f3b2e6
@@ -10996,8 +14181,8 @@ Date:	Tue Aug 30 17:34:50 2011 +0200
 
     xpdf303: Introduce FoFiBase::getU32LE
 
- fofi/FoFiBase.cc |   15 +++++++++++++++
- fofi/FoFiBase.h  |    1 +
+ fofi/FoFiBase.cc | 15 +++++++++++++++
+ fofi/FoFiBase.h  |  1 +
  2 files changed, 16 insertions(+)
 
 commit a79bc3359586cbc2c235d20dfa934dab1f475561
@@ -11006,7 +14191,7 @@ Date:	Tue Aug 30 16:59:08 2011 +0200
 
     xpdf303: Check for a zero-entry cmap table in FoFiTrueType
 
- fofi/FoFiTrueType.cc |   28 +++++++++++++++++-----------
+ fofi/FoFiTrueType.cc | 28 +++++++++++++++++-----------
  1 file changed, 17 insertions(+), 11 deletions(-)
 
 commit efce014e39d0d13157b21a10ff8d483b5cfc561a
@@ -11015,8 +14200,8 @@ Date:	Tue Aug 30 17:02:16 2011 +0200
 
     xpdf303: upddate xpdfCopyright
 
- poppler/poppler-config.h.cmake |    4 ++--
- poppler/poppler-config.h.in	|    4 ++--
+ poppler/poppler-config.h.cmake | 4 ++--
+ poppler/poppler-config.h.in	| 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 2eb388ccc6c7526e66da804d9d800cf29a027914
@@ -11025,9 +14210,9 @@ Date:	Tue Aug 30 16:50:39 2011 +0200
 
     xpdf303: Merge README
 
- README      |	  2 +-
- README-XPDF |	153
- ++++++++++++++++++++++++++++++++++++++---------------------
+ README      |	 2 +-
+ README-XPDF | 153
+ +++++++++++++++++++++++++++++++++++++++---------------------
  2 files changed, 101 insertions(+), 54 deletions(-)
 
 commit 331b0f1c16c4f636fc616569bab030969aa848f2
@@ -11041,7 +14226,7 @@ Date:	Tue Aug 30 16:42:33 2011 +0200
     header is
     too high.
 
- fofi/FoFiTrueType.cc |   30 +++++++++++++++++++++++++-----
+ fofi/FoFiTrueType.cc | 30 +++++++++++++++++++++++++-----
  1 file changed, 25 insertions(+), 5 deletions(-)
 
 commit faaba717046ba87ef5ded614e2bcab6260a9f7c2
@@ -11050,13 +14235,13 @@ Date:	Tue Aug 30 16:36:24 2011 +0200
 
     xpdf303: FixedPoint improvements
 
- goo/FixedPoint.cc	|   51
- +++++++++++++++++++++++++++++++-----------------
- goo/FixedPoint.h	|   15 ++++++++++++--
- splash/Splash.cc	|   12 ++++++++++++
- splash/SplashFTFont.cc |   16 +++++++--------
- splash/SplashMath.h	|    8 +++++---
- splash/SplashXPath.cc	|    9 +++++++++
+ goo/FixedPoint.cc	| 51
+ ++++++++++++++++++++++++++++++++------------------
+ goo/FixedPoint.h	| 15 +++++++++++++--
+ splash/Splash.cc	| 12 ++++++++++++
+ splash/SplashFTFont.cc | 16 ++++++++--------
+ splash/SplashMath.h	|  8 +++++---
+ splash/SplashXPath.cc	|  9 +++++++++
  6 files changed, 80 insertions(+), 31 deletions(-)
 
 commit 73efc96eef6bd32a7c058b7dda8101f4f23c454f
@@ -11067,7 +14252,7 @@ Date:	Tue Aug 30 16:31:52 2011 +0200
 
     where the offset is past the end of the glyf table.
 
- fofi/FoFiTrueType.cc |    4 ++++
+ fofi/FoFiTrueType.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 1df3489392a77e2b75adbafcc2fa10de829c172e
@@ -11080,11 +14265,11 @@ Date:	Tue Aug 30 16:21:40 2011 +0200
     SplashXPathScanner.cc since they depend on other changes not yet
     merged.
 
- fofi/FoFiTrueType.cc	|   55
- ++++++++++++++++++++++--------------------------
- poppler/GfxFont.cc	|   24 ++++++++++++++-------
- splash/SplashScreen.cc |   12 +++++++----
- splash/SplashXPath.cc	|   44 ++++++++++++++++++--------------------
+ fofi/FoFiTrueType.cc	| 55
+ +++++++++++++++++++++++---------------------------
+ poppler/GfxFont.cc	| 24 ++++++++++++++--------
+ splash/SplashScreen.cc | 12 +++++++----
+ splash/SplashXPath.cc	| 44 ++++++++++++++++++----------------------
  4 files changed, 69 insertions(+), 66 deletions(-)
 
 commit f298e7f844105f2d9a36144e59be86c341e37507
@@ -11100,7 +14285,7 @@ Date:	Tue Aug 30 16:20:17 2011 +0200
 
     Compile when defining USE_FIXEDPOINT
 
- splash/Splash.cc |    5 +++--
+ splash/Splash.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit bd7a53bc2f27fc3979f8de306e2dcaca53d4570a
@@ -11109,7 +14294,7 @@ Date:	Tue Aug 30 16:20:08 2011 +0200
 
     match function definition
 
- poppler/SplashOutputDev.cc |	 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2a6bd7aae37f73a94bf1a84f699f310177661611
@@ -11118,7 +14303,7 @@ Date:	Tue Aug 30 15:13:17 2011 +0200
 
     xpdf303: Expand latin1UnicodeMapRanges and ascii7UnicodeMapRanges
 
- poppler/UnicodeMapTables.h |	10 +++++++---
+ poppler/UnicodeMapTables.h | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 commit 4d31785409e464d0e96dcf11167ecdffd64026d1
@@ -11137,103 +14322,103 @@ Date:	Tue Aug 30 14:49:23 2011 +0200
 
     xpdf303: char * -> const char *
 
- cmake/modules/PopplerMacros.cmake |	2 +-
- configure.ac			   |	2 +-
- cpp/poppler-private.cpp	   |	2 +-
- cpp/poppler-private.h		   |	2 +-
- fofi/FoFiBase.h		   |	2 +-
- fofi/FoFiEncodings.cc		   |	6 ++---
- fofi/FoFiEncodings.h		   |	6 ++---
- fofi/FoFiTrueType.cc		   |   10 ++++----
- fofi/FoFiTrueType.h		   |	4 ++--
- fofi/FoFiType1.cc		   |	4 ++--
- fofi/FoFiType1.h		   |	2 +-
- fofi/FoFiType1C.cc		   |   14 +++++------
- fofi/FoFiType1C.h		   |	6 ++---
- goo/GooHash.cc			   |   16 ++++++-------
- goo/GooHash.h			   |   12 +++++-----
- goo/GooString.cc		   |   22 +++++++++---------
- goo/GooString.h		   |   16 ++++++-------
- goo/gfile.cc			   |	4 ++--
- goo/gfile.h			   |	4 ++--
- goo/gmem.cc			   |	2 +-
- goo/gmem.h			   |	2 +-
- poppler/Annot.cc		   |	8 +++----
- poppler/Annot.h		   |	6 ++---
- poppler/ArthurOutputDev.cc	   |	6 ++---
- poppler/BuiltinFont.cc		   |	6 ++---
- poppler/BuiltinFont.h		   |   10 ++++----
- poppler/DCTStream.cc		   |	2 +-
- poppler/DCTStream.h		   |	2 +-
- poppler/Dict.cc		   |   14 +++++------
- poppler/Dict.h			   |   14 +++++------
- poppler/Error.cc		   |   10 ++++----
- poppler/Error.h		   |	6 ++---
- poppler/FileSpec.cc		   |	2 +-
- poppler/FlateStream.cc		   |	2 +-
- poppler/FlateStream.h		   |	2 +-
- poppler/FontEncodingTables.cc	   |   14 +++++------
- poppler/FontEncodingTables.h	   |   14 +++++------
- poppler/FontInfo.cc		   |	2 +-
- poppler/Form.cc		   |	6 ++---
- poppler/Form.h			   |	4 ++--
- poppler/Gfx.cc			   |	2 +-
- poppler/Gfx.h			   |	2 +-
- poppler/GfxFont.cc		   |   46
- ++++++++++++++++++-------------------
- poppler/GfxFont.h		   |	8 +++----
- poppler/GfxState.cc		   |	6 ++---
- poppler/GfxState.h		   |	2 +-
- poppler/GlobalParams.cc	   |   21 ++++++++---------
- poppler/GlobalParams.h		   |	8 +++----
- poppler/GlobalParamsWin.cc	   |	6 ++---
- poppler/JBIG2Stream.cc		   |	2 +-
- poppler/JBIG2Stream.h		   |	2 +-
- poppler/JPEG2000Stream.cc	   |	2 +-
- poppler/JPEG2000Stream.h	   |	2 +-
- poppler/JPXStream.h		   |	2 +-
- poppler/NameToCharCode.cc	   |	8 +++----
- poppler/NameToCharCode.h	   |	6 ++---
- poppler/NameToUnicodeTable.h	   |	2 +-
- poppler/Object.cc		   |	4 ++--
- poppler/Object.h		   |   28 +++++++++++-----------
- poppler/PDFDoc.cc		   |	2 +-
- poppler/PSOutputDev.cc		   |   24 +++++++++----------
- poppler/PSOutputDev.h		   |	8 +++----
- poppler/Page.cc		   |	2 +-
- poppler/Page.h			   |	2 +-
- poppler/SplashOutputDev.cc	   |	6 ++---
- poppler/Stream.cc		   |   16 ++++++-------
- poppler/Stream.h		   |   28 +++++++++++-----------
- poppler/TextOutputDev.cc	   |	2 +-
- poppler/TextOutputDev.h	   |	2 +-
- poppler/UnicodeMap.cc		   |	4 ++--
- poppler/UnicodeMap.h		   |	4 ++--
- poppler/UnicodeTypeTable.cc	   |	4 ++--
- qt4/src/poppler-private.cc	   |	2 +-
- qt4/src/poppler-ps-converter.cc   |	2 +-
- splash/SplashFTFontEngine.cc	   |	8 +++----
- splash/SplashFTFontEngine.h	   |	6 ++---
- splash/SplashFTFontFile.cc	   |	6 ++---
- splash/SplashFTFontFile.h	   |	2 +-
- splash/SplashFontEngine.cc	   |	6 ++---
- splash/SplashFontEngine.h	   |	6 ++---
- splash/SplashT1FontEngine.cc	   |	6 ++---
- splash/SplashT1FontEngine.h	   |	4 ++--
- splash/SplashT1FontFile.cc	   |   10 ++++----
- splash/SplashT1FontFile.h	   |	6 ++---
- test/pdf-operators.c		   |	4 ++--
- test/perf-test.cc		   |	4 ++--
- utils/HtmlFonts.cc		   |	4 ++--
- utils/HtmlOutputDev.cc		   |   12 +++++-----
- utils/HtmlOutputDev.h		   |	4 ++--
- utils/parseargs.cc		   |	4 ++--
- utils/parseargs.h		   |	6 ++---
- utils/pdffonts.cc		   |	2 +-
- utils/pdfinfo.cc		   |   12 +++++-----
- utils/pdftocairo.cc		   |	4 ++--
- utils/pdftohtml.cc		   |   10 ++++----
- utils/pdftotext.cc		   |   12 +++++-----
+ cmake/modules/PopplerMacros.cmake |  2 +-
+ configure.ac			   |  2 +-
+ cpp/poppler-private.cpp	   |  2 +-
+ cpp/poppler-private.h		   |  2 +-
+ fofi/FoFiBase.h		   |  2 +-
+ fofi/FoFiEncodings.cc		   |  6 ++---
+ fofi/FoFiEncodings.h		   |  6 ++---
+ fofi/FoFiTrueType.cc		   | 10 ++++-----
+ fofi/FoFiTrueType.h		   |  4 ++--
+ fofi/FoFiType1.cc		   |  4 ++--
+ fofi/FoFiType1.h		   |  2 +-
+ fofi/FoFiType1C.cc		   | 14 ++++++------
+ fofi/FoFiType1C.h		   |  6 ++---
+ goo/GooHash.cc			   | 16 +++++++-------
+ goo/GooHash.h			   | 12 +++++-----
+ goo/GooString.cc		   | 22 +++++++++----------
+ goo/GooString.h		   | 16 +++++++-------
+ goo/gfile.cc			   |  4 ++--
+ goo/gfile.h			   |  4 ++--
+ goo/gmem.cc			   |  2 +-
+ goo/gmem.h			   |  2 +-
+ poppler/Annot.cc		   |  8 +++----
+ poppler/Annot.h		   |  6 ++---
+ poppler/ArthurOutputDev.cc	   |  6 ++---
+ poppler/BuiltinFont.cc		   |  6 ++---
+ poppler/BuiltinFont.h		   | 10 ++++-----
+ poppler/DCTStream.cc		   |  2 +-
+ poppler/DCTStream.h		   |  2 +-
+ poppler/Dict.cc		   | 14 ++++++------
+ poppler/Dict.h			   | 14 ++++++------
+ poppler/Error.cc		   | 10 ++++-----
+ poppler/Error.h		   |  6 ++---
+ poppler/FileSpec.cc		   |  2 +-
+ poppler/FlateStream.cc		   |  2 +-
+ poppler/FlateStream.h		   |  2 +-
+ poppler/FontEncodingTables.cc	   | 14 ++++++------
+ poppler/FontEncodingTables.h	   | 14 ++++++------
+ poppler/FontInfo.cc		   |  2 +-
+ poppler/Form.cc		   |  6 ++---
+ poppler/Form.h			   |  4 ++--
+ poppler/Gfx.cc			   |  2 +-
+ poppler/Gfx.h			   |  2 +-
+ poppler/GfxFont.cc		   | 46
+ +++++++++++++++++++--------------------
+ poppler/GfxFont.h		   |  8 +++----
+ poppler/GfxState.cc		   |  6 ++---
+ poppler/GfxState.h		   |  2 +-
+ poppler/GlobalParams.cc	   | 21 +++++++++---------
+ poppler/GlobalParams.h		   |  8 +++----
+ poppler/GlobalParamsWin.cc	   |  6 ++---
+ poppler/JBIG2Stream.cc		   |  2 +-
+ poppler/JBIG2Stream.h		   |  2 +-
+ poppler/JPEG2000Stream.cc	   |  2 +-
+ poppler/JPEG2000Stream.h	   |  2 +-
+ poppler/JPXStream.h		   |  2 +-
+ poppler/NameToCharCode.cc	   |  8 +++----
+ poppler/NameToCharCode.h	   |  6 ++---
+ poppler/NameToUnicodeTable.h	   |  2 +-
+ poppler/Object.cc		   |  4 ++--
+ poppler/Object.h		   | 28 ++++++++++++------------
+ poppler/PDFDoc.cc		   |  2 +-
+ poppler/PSOutputDev.cc		   | 24 ++++++++++----------
+ poppler/PSOutputDev.h		   |  8 +++----
+ poppler/Page.cc		   |  2 +-
+ poppler/Page.h			   |  2 +-
+ poppler/SplashOutputDev.cc	   |  6 ++---
+ poppler/Stream.cc		   | 16 +++++++-------
+ poppler/Stream.h		   | 28 ++++++++++++------------
+ poppler/TextOutputDev.cc	   |  2 +-
+ poppler/TextOutputDev.h	   |  2 +-
+ poppler/UnicodeMap.cc		   |  4 ++--
+ poppler/UnicodeMap.h		   |  4 ++--
+ poppler/UnicodeTypeTable.cc	   |  4 ++--
+ qt4/src/poppler-private.cc	   |  2 +-
+ qt4/src/poppler-ps-converter.cc   |  2 +-
+ splash/SplashFTFontEngine.cc	   |  8 +++----
+ splash/SplashFTFontEngine.h	   |  6 ++---
+ splash/SplashFTFontFile.cc	   |  6 ++---
+ splash/SplashFTFontFile.h	   |  2 +-
+ splash/SplashFontEngine.cc	   |  6 ++---
+ splash/SplashFontEngine.h	   |  6 ++---
+ splash/SplashT1FontEngine.cc	   |  6 ++---
+ splash/SplashT1FontEngine.h	   |  4 ++--
+ splash/SplashT1FontFile.cc	   | 10 ++++-----
+ splash/SplashT1FontFile.h	   |  6 ++---
+ test/pdf-operators.c		   |  4 ++--
+ test/perf-test.cc		   |  4 ++--
+ utils/HtmlFonts.cc		   |  4 ++--
+ utils/HtmlOutputDev.cc		   | 12 +++++-----
+ utils/HtmlOutputDev.h		   |  4 ++--
+ utils/parseargs.cc		   |  4 ++--
+ utils/parseargs.h		   |  6 ++---
+ utils/pdffonts.cc		   |  2 +-
+ utils/pdfinfo.cc		   | 12 +++++-----
+ utils/pdftocairo.cc		   |  4 ++--
+ utils/pdftohtml.cc		   | 10 ++++-----
+ utils/pdftotext.cc		   | 12 +++++-----
  96 files changed, 337 insertions(+), 338 deletions(-)
 
 commit c899d26e0f7a61db99925179330c28df015a676b
@@ -11242,8 +14427,8 @@ Date:	Tue Aug 30 00:31:00 2011 +0200
 
     Add COPYING3 from xpdf3.03
 
- COPYING3 |  674
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ COPYING3 | 674
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 674 insertions(+)
 
 commit 508517a35cb3bc5195682a9cd89fb50a801eddc2
@@ -11252,16 +14437,16 @@ Date:	Mon Aug 29 23:55:42 2011 +0200
 
     0.17.3
 
- CMakeLists.txt		|    4 ++--
- NEWS			|   32 ++++++++++++++++++++++++++++++++
- configure.ac		|    2 +-
- cpp/Doxyfile		|    2 +-
- glib/CMakeLists.txt	|    2 +-
- glib/Makefile.am	|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Doxyfile	|    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		|  4 ++--
+ NEWS			| 32 ++++++++++++++++++++++++++++++++
+ configure.ac		|  2 +-
+ cpp/Doxyfile		|  2 +-
+ glib/CMakeLists.txt	|  2 +-
+ glib/Makefile.am	|  2 +-
+ poppler/Makefile.am	|  2 +-
+ qt4/src/CMakeLists.txt |  2 +-
+ qt4/src/Doxyfile	|  2 +-
+ qt4/src/Makefile.am	|  2 +-
  10 files changed, 42 insertions(+), 10 deletions(-)
 
 commit 1431564f3363a63a8669c8dd15970db814f4969f
@@ -11272,11 +14457,11 @@ Date:	Mon Aug 29 22:22:02 2011 +0200
 
     See "Creating PDF with poppler ?" thread for more info
 
- utils/CMakeLists.txt |   15 +++++
- utils/Makefile.am    |   10 +++
- utils/pdfextract.cc  |  111 +++++++++++++++++++++++++++++++
- utils/pdfmerge.cc    |  176
- ++++++++++++++++++++++++++++++++++++++++++++++++++
+ utils/CMakeLists.txt |  15 +++++
+ utils/Makefile.am    |  10 +++
+ utils/pdfextract.cc  | 111 ++++++++++++++++++++++++++++++++
+ utils/pdfmerge.cc    | 176
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 312 insertions(+)
 
 commit 8ca2f41089bc6402baf9b24428af04314c037b54
@@ -11289,9 +14474,9 @@ Date:	Mon Aug 29 22:20:52 2011 +0200
     See "Creating PDF with poppler ?" thread in the mailing list for
     more info
 
- poppler/PDFDoc.cc |  389
- +++++++++++++++++++++++++++++++++++++++++++++++------
- poppler/PDFDoc.h  |   30 ++++-
+ poppler/PDFDoc.cc | 389
+ ++++++++++++++++++++++++++++++++++++++++++++++++------
+ poppler/PDFDoc.h  |  30 ++++-
  2 files changed, 375 insertions(+), 44 deletions(-)
 
 commit 33da7e270431e8e4c500e7573b3ca0dddd9f237e
@@ -11300,7 +14485,7 @@ Date:	Sun Aug 28 22:07:38 2011 +0200
 
     Fix building static-linked pdftocairo
 
- utils/Makefile.am |	5 +++--
+ utils/Makefile.am | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 91fafce028ca6620c0eb22e370fb4c6fd3404e3c
@@ -11324,8 +14509,8 @@ Date:	Tue Aug 23 21:02:02 2011 +0930
 
     Fixes bug #4536.
 
- poppler/CairoOutputDev.cc |   40 +++++++++++++++++++++++++++++++++++-----
- poppler/CairoOutputDev.h  |	3 +++
+ poppler/CairoOutputDev.cc | 40 +++++++++++++++++++++++++++++++++++-----
+ poppler/CairoOutputDev.h  |  3 +++
  2 files changed, 38 insertions(+), 5 deletions(-)
 
 commit cfc67afe80b963ba662018674cadf3085466bb9f
@@ -11350,8 +14535,8 @@ Date:	Tue Aug 23 20:46:24 2011 +0930
     because integer aligned 1.0 wide lines in cairo are rendered two
     pixels wide which looks too fat.
 
- poppler/CairoOutputDev.cc |   20 +++++++++++++++++++-
- poppler/CairoOutputDev.h  |	1 +
+ poppler/CairoOutputDev.cc | 20 +++++++++++++++++++-
+ poppler/CairoOutputDev.h  |  1 +
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 commit 7a7c932e09796b944dda69df1b339c889ee1d63a
@@ -11360,8 +14545,8 @@ Date:	Thu Aug 25 00:23:40 2011 +0200
 
     Add a way to get the fully qualified name
 
- qt4/src/poppler-form.cc |   12 +++++++++++-
- qt4/src/poppler-form.h  |    8 +++++++-
+ qt4/src/poppler-form.cc | 12 +++++++++++-
+ qt4/src/poppler-form.h  |  8 +++++++-
  2 files changed, 18 insertions(+), 2 deletions(-)
 
 commit e001871d927f9cc86b4327d64e4c66ad00172ad0
@@ -11370,7 +14555,7 @@ Date:	Wed Aug 24 23:44:18 2011 +0200
 
     Clarify ownership
 
- qt4/src/poppler-qt4.h |    3 ++-
+ qt4/src/poppler-qt4.h | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 87c48fdc175be4d852b953778f915ea93cd50194
@@ -11382,7 +14567,7 @@ Date:	Wed Aug 24 19:53:48 2011 +0930
     The unique id string was copied before the object number was appended
     resulting in all images in pdf output being the same.
 
- poppler/CairoOutputDev.cc |	3 +--
+ poppler/CairoOutputDev.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 08a2ba6f1603246651f0d5e697b88d38363d7df2
@@ -11391,7 +14576,7 @@ Date:	Tue Aug 23 20:20:32 2011 +0200
 
     pdftocairo/cmake: need to link to freetype
 
- utils/CMakeLists.txt |    2 +-
+ utils/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 82496b18dc4aff66cc29f2b6607c8f894afe8b49
@@ -11400,7 +14585,7 @@ Date:	Mon Aug 22 16:42:28 2011 +0200
 
     Update Adrian (C)
 
- poppler/GfxFont.h |	1 +
+ poppler/GfxFont.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2576e3a6d9746e2272c620a775e11295932eb5f2
@@ -11412,14 +14597,14 @@ Date:	Mon Aug 22 21:41:36 2011 +0930
     - ensure each man page references all other utils
     - sort list of utils in alphabetical order
 
- utils/pdffonts.1   |	 8 +++++---
- utils/pdfimages.1  |	 8 +++++---
- utils/pdfinfo.1    |	 8 +++++---
- utils/pdftocairo.1 |	 2 +-
- utils/pdftohtml.1  |	 8 ++++++++
- utils/pdftoppm.1   |	 8 +++++---
- utils/pdftops.1    |	 8 +++++---
- utils/pdftotext.1  |	 9 +++++----
+ utils/pdffonts.1   | 8 +++++---
+ utils/pdfimages.1  | 8 +++++---
+ utils/pdfinfo.1    | 8 +++++---
+ utils/pdftocairo.1 | 2 +-
+ utils/pdftohtml.1  | 8 ++++++++
+ utils/pdftoppm.1   | 8 +++++---
+ utils/pdftops.1    | 8 +++++---
+ utils/pdftotext.1  | 9 +++++----
  8 files changed, 39 insertions(+), 20 deletions(-)
 
 commit 23ec5c8d394beb632ee45f6308215646cd1a0195
@@ -11433,9 +14618,9 @@ Date:	Mon Aug 22 21:26:24 2011 +0930
     excessive number of empty text ActualText entries to be written due to
     glyphs that do not have have a mapping.
 
- poppler/CairoOutputDev.cc |   12 ++++++++----
- poppler/CairoOutputDev.h  |	1 +
- poppler/GfxFont.h	   |	3 +++
+ poppler/CairoOutputDev.cc | 12 ++++++++----
+ poppler/CairoOutputDev.h  |  1 +
+ poppler/GfxFont.h	   |  3 +++
  3 files changed, 12 insertions(+), 4 deletions(-)
 
 commit 3a574f13fa22b7c31eda0d0437f4094a5a39ff34
@@ -11452,9 +14637,9 @@ Date:	Fri Aug 19 23:23:24 2011 +0930
     saved stroke.
     Fixes bug #11719.
 
- poppler/CairoOutputDev.cc |   52
- ++++++++++++++++++++++++++++++++++++++++++++-
- poppler/CairoOutputDev.h  |   17 +++++++++++++--
+ poppler/CairoOutputDev.cc | 52
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/CairoOutputDev.h  | 17 ++++++++++++++--
  2 files changed, 66 insertions(+), 3 deletions(-)
 
 commit eb740dac838d2a1e32899327ca6d25c3dca641df
@@ -11463,8 +14648,8 @@ Date:	Mon Aug 22 13:41:56 2011 +0200
 
     glib-demo: Add text attributes information to text demo
 
- glib/demo/text.c |  103
- ++++++++++++++++++++++++++++++++++++++++++++++++++----
+ glib/demo/text.c | 103
+ +++++++++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 97 insertions(+), 6 deletions(-)
 
 commit cda4aefaa136ae07778de3b1593808a5aaa2db5b
@@ -11475,9 +14660,9 @@ Date:	Mon Aug 22 13:40:49 2011 +0200
 
     To get a pixbuf for a given poppler color.
 
- glib/demo/annots.c |	22 +---------------------
- glib/demo/utils.c  |	27 +++++++++++++++++++++++++++
- glib/demo/utils.h  |	 1 +
+ glib/demo/annots.c | 22 +---------------------
+ glib/demo/utils.c  | 27 +++++++++++++++++++++++++++
+ glib/demo/utils.h  |  1 +
  3 files changed, 29 insertions(+), 21 deletions(-)
 
 commit 2a11b2963a548186654722a393db1e19d57828f1
@@ -11493,11 +14678,11 @@ Date:	Mon Aug 22 12:51:50 2011 +0200
     whether text is undrlined and foreground color for a range of text.
     Fixes bug #33269.
 
- glib/poppler-page.cc		     |	202
- +++++++++++++++++++++++++++++++++++
- glib/poppler-page.h		     |	 33 ++++++
- glib/poppler.h			     |	  1 +
- glib/reference/poppler-sections.txt |	  7 ++
+ glib/poppler-page.cc		     | 202
+ ++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h		     |	33 ++++++
+ glib/poppler.h			     |	 1 +
+ glib/reference/poppler-sections.txt |	 7 ++
  4 files changed, 243 insertions(+)
 
 commit 15f99157cf3900bf20cf619e204ae53085af497d
@@ -11508,8 +14693,8 @@ Date:	Mon Aug 22 12:43:12 2011 +0200
 
     It checks whether two TextFontInfo objects contain the same font.
 
- poppler/TextOutputDev.cc |    4 ++++
- poppler/TextOutputDev.h  |    1 +
+ poppler/TextOutputDev.cc | 4 ++++
+ poppler/TextOutputDev.h  | 1 +
  2 files changed, 5 insertions(+)
 
 commit 5b554b39fca634c8ba58915c14522cb2920fe280
@@ -11518,7 +14703,7 @@ Date:	Mon Aug 22 13:16:23 2011 +0200
 
     pdftocairo/cmake: link to lcms library if available
 
- utils/CMakeLists.txt |    3 +++
+ utils/CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 commit f7cd236fea8740ef05635d1fd7917a778cc373f0
@@ -11527,7 +14712,7 @@ Date:	Mon Aug 22 00:00:32 2011 +0200
 
     Ship HtmlUtils.h
 
- utils/Makefile.am |	1 +
+ utils/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit a128a858c50287cfba74c69996276ea44370dc26
@@ -11536,8 +14721,8 @@ Date:	Sun Aug 21 23:52:06 2011 +0200
 
     Update Adrian's (C)
 
- goo/PNGWriter.cc |    2 +-
- goo/PNGWriter.h  |    2 +-
+ goo/PNGWriter.cc | 2 +-
+ goo/PNGWriter.h  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit b78134314107d8344360c3313478115ed291630d
@@ -11548,7 +14733,7 @@ Date:	Sun Aug 21 23:46:09 2011 +0200
 
     c&p is evil
 
- goo/gtypes_p.h |    2 +-
+ goo/gtypes_p.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ade53277546cef4ba19d982518c0cd83a4bb9c12
@@ -11560,12 +14745,12 @@ Date:	Sun Aug 21 23:42:53 2011 +0200
     This way we do not need to expose it in poppler-config.h since
     gtypes.h is a half public header
 
- goo/Makefile.am	    |	 1 +
- goo/gtypes.h		    |	18 ------------------
- goo/gtypes_p.h		    |	30 ++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.cc  |	 1 +
- poppler/CairoRescaleBox.cc |	 1 +
- utils/pdftocairo.cc	    |	 1 +
+ goo/Makefile.am	    |  1 +
+ goo/gtypes.h		    | 18 ------------------
+ goo/gtypes_p.h		    | 30 ++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.cc  |  1 +
+ poppler/CairoRescaleBox.cc |  1 +
+ utils/pdftocairo.cc	    |  1 +
  6 files changed, 34 insertions(+), 18 deletions(-)
 
 commit 6166c3a37a4d6307d4f23ee272ea07c95bbba74a
@@ -11574,7 +14759,7 @@ Date:	Sun Aug 21 23:31:30 2011 +0200
 
     Silence silly gcc
 
- goo/PNGWriter.cc |    5 +++--
+ goo/PNGWriter.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit eb5b228c4c24152e632c931b63c64ffb1e10d45d
@@ -11583,7 +14768,7 @@ Date:	Sat Aug 20 21:13:18 2011 +0930
 
     pdftocairo: fix writing to stdout for ps/pdf/svg
 
- utils/pdftocairo.cc |	 23 ++++++++++++++++++++---
+ utils/pdftocairo.cc | 23 ++++++++++++++++++++---
  1 file changed, 20 insertions(+), 3 deletions(-)
 
 commit 1beac5896a301be68de22240017fef11e7d27d40
@@ -11592,7 +14777,7 @@ Date:	Sat Aug 13 00:23:23 2011 +0930
 
     Add poppler version to PSOutputDev ouput
 
- poppler/PSOutputDev.cc |    1 +
+ poppler/PSOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit b35fd3651fd3dbaa876fc64b8c5cfe77ae67335f
@@ -11604,9 +14789,8 @@ Date:	Fri Aug 5 23:01:51 2011 +0930
     This will allow cairo to setup the correct toUnicode or glyph names to
     ensure text can be extracted.
 
- poppler/CairoOutputDev.cc |   41
- ++++++++++++++++++++++++++++++++++++++---
- poppler/CairoOutputDev.h  |	5 +++++
+ poppler/CairoOutputDev.cc | 41 ++++++++++++++++++++++++++++++++++++++---
+ poppler/CairoOutputDev.h  |  5 +++++
  2 files changed, 43 insertions(+), 3 deletions(-)
 
 commit 51ade078bc1fa737e20120ae4cb3bf693a219823
@@ -11615,7 +14799,7 @@ Date:	Thu Jul 15 16:24:55 2010 +0100
 
     pdftocairo: Added to CMake build system.
 
- utils/CMakeLists.txt |   20 ++++++++++++++++++++
+ utils/CMakeLists.txt | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit 5a8745cdf428e22641937977eedfc1d605f6ff07
@@ -11624,9 +14808,9 @@ Date:	Fri Aug 12 23:57:01 2011 +0930
 
     Add pdftocairo man page
 
- utils/Makefile.am  |	 5 +-
- utils/pdftocairo.1 |  254
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ utils/Makefile.am  |	5 +-
+ utils/pdftocairo.1 | 254
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 258 insertions(+), 1 deletion(-)
 
 commit b67a12b2b26692e2ccec7ff2e6df18fee05be535
@@ -11636,10 +14820,10 @@ Date:	Thu Aug 11 21:34:11 2011 +0930
     pdftocairo - utility for creating png/jpeg/ps/eps/pdf/svg using
     CairoOutputDev
 
- utils/.gitignore    |	  2 +-
- utils/Makefile.am   |	 20 +-
- utils/pdftocairo.cc |	970
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ utils/.gitignore    |	 2 +-
+ utils/Makefile.am   |	20 +-
+ utils/pdftocairo.cc | 970
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 989 insertions(+), 3 deletions(-)
 
 commit 4f2d774826bf7bb7b3825e02c5ca4c2928643950
@@ -11648,8 +14832,8 @@ Date:	Thu Aug 11 21:32:53 2011 +0930
 
     png: add support for embedding ICC profile
 
- goo/PNGWriter.cc |   28 ++++++++++++++++++++++++++++
- goo/PNGWriter.h  |    8 ++++++++
+ goo/PNGWriter.cc | 28 ++++++++++++++++++++++++++++
+ goo/PNGWriter.h  |  8 ++++++++
  2 files changed, 36 insertions(+)
 
 commit 1091f47310bf0fc71bac5dd4ec81dad50b2f2537
@@ -11662,8 +14846,8 @@ Date:	Wed Aug 10 18:48:15 2011 +0930
     allow PNGWriter write more compact PNG files when the images is known
     to be all gray or monochrome.
 
- goo/PNGWriter.cc |   30 ++++++++++++++++++++++++++----
- goo/PNGWriter.h  |   11 ++++++++++-
+ goo/PNGWriter.cc | 30 ++++++++++++++++++++++++++----
+ goo/PNGWriter.h  | 11 ++++++++++-
  2 files changed, 36 insertions(+), 5 deletions(-)
 
 commit c6f26915db568f12892d48005746ad2922c19000
@@ -11676,7 +14860,7 @@ Date:	Wed Aug 10 18:45:24 2011 +0930
     gimp does not show the correct resolution unless PNG_RESOLUTION_METER
     is used
 
- goo/PNGWriter.cc |    3 +--
+ goo/PNGWriter.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 2667d2a5b34e1bbf322aea42876e7e81aa06dc29
@@ -11685,10 +14869,10 @@ Date:	Tue Aug 9 22:05:53 2011 +0930
 
     Use stdint.h instead of assuming the size of types
 
- configure.ac		    |	 1 +
- goo/gtypes.h		    |	18 ++++++++++++++++++
- poppler/CairoOutputDev.cc  |	 2 --
- poppler/CairoRescaleBox.cc |	 2 --
+ configure.ac		    |  1 +
+ goo/gtypes.h		    | 18 ++++++++++++++++++
+ poppler/CairoOutputDev.cc  |  2 --
+ poppler/CairoRescaleBox.cc |  2 --
  4 files changed, 19 insertions(+), 4 deletions(-)
 
 commit c043f298e68bdfffcb7505ec354ec7487b5bd7b2
@@ -11699,7 +14883,7 @@ Date:	Fri Jul 8 21:13:36 2011 +0930
 
     Fixes bug #39067.
 
- poppler/CairoOutputDev.cc |	5 +++++
+ poppler/CairoOutputDev.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 961adf0b767be78d3556b7315de3761d3d46b107
@@ -11710,7 +14894,7 @@ Date:	Thu Aug 18 17:44:35 2011 +0930
 
     Fixes bug #40192.
 
- poppler/CairoOutputDev.cc |	3 +++
+ poppler/CairoOutputDev.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 86271e4810f714d4ba7a2a6651a9b1d04f653262
@@ -11722,12 +14906,12 @@ Date:	Thu Aug 18 18:48:40 2011 +0200
     Includes a few other fixlets.
     See bug 38586 for more info
 
- utils/HtmlFonts.cc	|   64 +++++++++---------
- utils/HtmlFonts.h	|   10 ++-
- utils/HtmlOutputDev.cc |  170
- +++++++++++++++++++++++++++++++++---------------
- utils/HtmlOutputDev.h	|    8 ++-
- utils/HtmlUtils.h	|   51 +++++++++++++++
+ utils/HtmlFonts.cc	|  64 ++++++++++---------
+ utils/HtmlFonts.h	|  10 ++-
+ utils/HtmlOutputDev.cc | 170
+ ++++++++++++++++++++++++++++++++++---------------
+ utils/HtmlOutputDev.h	|   8 ++-
+ utils/HtmlUtils.h	|  51 +++++++++++++++
  5 files changed, 218 insertions(+), 85 deletions(-)
 
 commit 56248b84e2185483dd54704c13838e8f78029d49
@@ -11736,7 +14920,7 @@ Date:	Thu Aug 18 12:40:51 2011 +0200
 
     Only declare overprint if we are going to use it
 
- utils/pdftoppm.cc |	4 +++-
+ utils/pdftoppm.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit a1093aae9f64cb6768164551d50cafaef52876c1
@@ -11745,12 +14929,12 @@ Date:	Thu Aug 18 12:30:29 2011 +0200
 
     Fix Adrian's (C)
 
- poppler/PSOutputDev.cc      |	  2 +-
- poppler/PSOutputDev.h	     |	  3 ++-
- poppler/PreScanOutputDev.cc |	  1 +
- poppler/PreScanOutputDev.h  |	  1 +
- poppler/SplashOutputDev.cc  |	  1 +
- poppler/SplashOutputDev.h   |	  1 +
+ poppler/PSOutputDev.cc      | 2 +-
+ poppler/PSOutputDev.h	     | 3 ++-
+ poppler/PreScanOutputDev.cc | 1 +
+ poppler/PreScanOutputDev.h  | 1 +
+ poppler/SplashOutputDev.cc  | 1 +
+ poppler/SplashOutputDev.h   | 1 +
  6 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 7741b24d05f50c134cf15361d52f5df7ae3c3115
@@ -11762,7 +14946,7 @@ Date:	Sun Aug 14 22:06:22 2011 +0930
 
     this optimization makes pages print faster on my LaserJet
 
- poppler/PSOutputDev.cc |    3 +++
+ poppler/PSOutputDev.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit a60e61ac64634dc59c80d8e6b0288c1269fc0154
@@ -11771,17 +14955,17 @@ Date:	Sun Aug 14 21:55:24 2011 +0930
 
     ps: use PS Patterns for tiling fill when PS level >= 2
 
- poppler/CairoOutputDev.cc   |	  2 +-
- poppler/CairoOutputDev.h    |	  4 +--
- poppler/Gfx.cc		     |	  4 +--
- poppler/OutputDev.h	     |	  2 +-
- poppler/PSOutputDev.cc      |	 59
- +++++++++++++++++++++++++++++++++++++++----
- poppler/PSOutputDev.h	     |	 13 +++++++++-
- poppler/PreScanOutputDev.cc |	  2 +-
- poppler/PreScanOutputDev.h  |	  2 +-
- poppler/SplashOutputDev.cc  |	  2 +-
- poppler/SplashOutputDev.h   |	  2 +-
+ poppler/CairoOutputDev.cc   |	2 +-
+ poppler/CairoOutputDev.h    |	4 +--
+ poppler/Gfx.cc		     |	4 +--
+ poppler/OutputDev.h	     |	2 +-
+ poppler/PSOutputDev.cc      | 59
+ +++++++++++++++++++++++++++++++++++++++++----
+ poppler/PSOutputDev.h	     | 13 +++++++++-
+ poppler/PreScanOutputDev.cc |	2 +-
+ poppler/PreScanOutputDev.h  |	2 +-
+ poppler/SplashOutputDev.cc  |	2 +-
+ poppler/SplashOutputDev.h   |	2 +-
  10 files changed, 76 insertions(+), 16 deletions(-)
 
 commit 9938770e737b2fcec8269147e70663517f848925
@@ -11790,16 +14974,16 @@ Date:	Mon Aug 15 13:17:24 2011 +0200
 
     0.17.2
 
- CMakeLists.txt		|    4 ++--
- NEWS			|   37 +++++++++++++++++++++++++++++++++++++
- configure.ac		|    2 +-
- cpp/Doxyfile		|    2 +-
- glib/CMakeLists.txt	|    2 +-
- glib/Makefile.am	|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Doxyfile	|    2 +-
- qt4/src/Makefile.am	|    5 +++--
+ CMakeLists.txt		|  4 ++--
+ NEWS			| 37 +++++++++++++++++++++++++++++++++++++
+ configure.ac		|  2 +-
+ cpp/Doxyfile		|  2 +-
+ glib/CMakeLists.txt	|  2 +-
+ glib/Makefile.am	|  2 +-
+ poppler/Makefile.am	|  2 +-
+ qt4/src/CMakeLists.txt |  2 +-
+ qt4/src/Doxyfile	|  2 +-
+ qt4/src/Makefile.am	|  5 +++--
  10 files changed, 49 insertions(+), 11 deletions(-)
 
 commit 378fc06c574b85b5c003ca842aa743f0ffe5587e
@@ -11811,7 +14995,7 @@ Date:	Mon Aug 1 22:14:12 2011 +0200
     Similar to commit e2def20a45c1d8307fd62fabb9769121af975abf
     but in the other branch of the if, fixes bug 39637
 
- poppler/OptionalContent.cc |	 4 ++--
+ poppler/OptionalContent.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 861a7bfb9431609e1e148240447f23c8e83b9d0f
@@ -11823,26 +15007,26 @@ Date:	Fri Jul 29 00:30:58 2011 +0200
     See the "Implementing overprint in Splash" thread in the mailing
     list for more info
 
- goo/ImgWriter.h	    |	 2 +
- goo/JpegWriter.cc	    |	54 ++++++--
- goo/JpegWriter.h	    |	 7 +-
- poppler/Gfx.cc		    |	98 ++++++++++++--
- poppler/GfxState.cc	    |	 1 +
- poppler/GfxState.h	    |	 4 +
- poppler/OutputDev.h	    |	 1 +
- poppler/SplashOutputDev.cc |  307
- ++++++++++++++++++++++++++++++++++++++------
- poppler/SplashOutputDev.h  |	51 +++++++-
- splash/Splash.cc	    |	86 ++++++++++---
- splash/Splash.h	    |	 9 +-
- splash/SplashBitmap.cc     |	64 ++++++++-
- splash/SplashBitmap.h	    |	 1 +
- splash/SplashPattern.cc    |	16 ++-
- splash/SplashPattern.h     |	 7 +
- splash/SplashState.cc	    |	11 +-
- splash/SplashState.h	    |	22 ++++
- splash/SplashTypes.h	    |	 5 +-
- utils/pdftoppm.cc	    |	36 +++++-
+ goo/ImgWriter.h	    |	2 +
+ goo/JpegWriter.cc	    |  54 ++++++--
+ goo/JpegWriter.h	    |	7 +-
+ poppler/Gfx.cc		    |  98 +++++++++++++--
+ poppler/GfxState.cc	    |	1 +
+ poppler/GfxState.h	    |	4 +
+ poppler/OutputDev.h	    |	1 +
+ poppler/SplashOutputDev.cc | 307
+ +++++++++++++++++++++++++++++++++++++++------
+ poppler/SplashOutputDev.h  |  51 +++++++-
+ splash/Splash.cc	    |  86 +++++++++----
+ splash/Splash.h	    |	9 +-
+ splash/SplashBitmap.cc     |  64 +++++++++-
+ splash/SplashBitmap.h	    |	1 +
+ splash/SplashPattern.cc    |  16 ++-
+ splash/SplashPattern.h     |	7 ++
+ splash/SplashState.cc	    |  11 +-
+ splash/SplashState.h	    |  22 ++++
+ splash/SplashTypes.h	    |	5 +-
+ utils/pdftoppm.cc	    |  36 +++++-
  19 files changed, 686 insertions(+), 96 deletions(-)
 
 commit e2fa8a2ca8459d19c0f9dca445a2399b9a3d483d
@@ -11851,7 +15035,7 @@ Date:	Thu Jul 28 12:43:57 2011 +0200
 
     Parse the "Medium" modifier when asking fontconfig for a font
 
- poppler/GlobalParams.cc |    2 ++
+ poppler/GlobalParams.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 0a677dd8dc9c55936530ea1fee901cab831c52af
@@ -11864,8 +15048,8 @@ Date:	Thu Jul 28 12:42:16 2011 +0200
     fontconfig configurations
     More info at bug 36474
 
- poppler/GlobalParams.cc |  137
- ++++++++++++++++++++++++++++++-----------------
+ poppler/GlobalParams.cc | 137
+ +++++++++++++++++++++++++++++++-----------------
  1 file changed, 89 insertions(+), 48 deletions(-)
 
 commit e78aff6796a5d5a0a4f2fe8c7ceb33c506e2c8f5
@@ -11877,8 +15061,8 @@ Date:	Tue Jul 26 00:10:34 2011 +0200
     If it is a gray only image
     Bug 39012
 
- poppler/PSOutputDev.cc |   63
- +++++++++++++++++++++++++++++++++++++++++++++---
+ poppler/PSOutputDev.cc | 63
+ +++++++++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 60 insertions(+), 3 deletions(-)
 
 commit ea31309487aab6ed407a086dff1f350b6e4bdbc9
@@ -11887,7 +15071,7 @@ Date:	Tue Jul 26 00:09:27 2011 +0200
 
     Update (C)
 
- poppler/PDFDoc.cc |	2 +-
+ poppler/PDFDoc.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a945641497946a825dc880f94200ea1d5409332b
@@ -11898,7 +15082,7 @@ Date:	Sat Jul 23 08:44:06 2011 +0200
 
     Bug 38209
 
- poppler/PDFDoc.cc |	5 +++--
+ poppler/PDFDoc.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 2c1b25ef2592367f4c18e204ab5d102f15cf272f
@@ -11911,7 +15095,7 @@ Date:	Mon Jul 25 23:43:27 2011 +0200
     of the image
     Bug 37189
 
- splash/Splash.cc |   14 ++++++++++----
+ splash/Splash.cc | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 commit 300900afa2140141748a7571270be5d850274072
@@ -11922,8 +15106,8 @@ Date:	Sat Jul 23 19:49:15 2011 +0200
 
     It also includes a speed optimization. Bug 39361
 
- poppler/JPEG2000Stream.cc |   37 ++++++++++++++++++++++++++++++++++++-
- poppler/JPEG2000Stream.h  |   36 +++++++++++-------------------------
+ poppler/JPEG2000Stream.cc | 37 ++++++++++++++++++++++++++++++++++++-
+ poppler/JPEG2000Stream.h  | 36 +++++++++++-------------------------
  2 files changed, 47 insertions(+), 26 deletions(-)
 
 commit ec6ea621b066a3b332a8099341664889d2ff3743
@@ -11936,7 +15120,7 @@ Date:	Thu Jul 21 23:12:36 2011 +0200
     See "another problem with saving linearized files" in the mailing
     list for more info
 
- poppler/PDFDoc.cc |	9 ++++++---
+ poppler/PDFDoc.cc | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit ce97cfcd6373c98fb8c63e9b3ef6c51738f22a50
@@ -11947,7 +15131,7 @@ Date:	Wed Jul 20 00:24:52 2011 +0200
 
     Bug 34150
 
- splash/Splash.cc |   13 +++++++++++++
+ splash/Splash.cc | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit 42c1b1c4af6b07f488d1b2b02a4700f19b0ab0ef
@@ -11958,7 +15142,7 @@ Date:	Wed Jul 20 00:23:15 2011 +0200
 
     Bug 36693
 
- poppler/DCTStream.cc |    6 +++---
+ poppler/DCTStream.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 091b570c63694e475c24bb8805638ac70c654892
@@ -11969,7 +15153,7 @@ Date:	Wed Jul 20 00:19:43 2011 +0200
 
     Fixes second part of 35925 and 39072
 
- poppler/PDFDoc.cc |	2 +-
+ poppler/PDFDoc.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ac566c887ffae9d384587f7587609642aef7a016
@@ -11978,7 +15162,7 @@ Date:	Wed Jul 20 00:17:49 2011 +0200
 
     Do not crash if can not get page 0 for some reason
 
- qt4/tests/test-poppler-qt4.cpp |    7 +++++--
+ qt4/tests/test-poppler-qt4.cpp | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 6ad95e7b8b9766aa19f01f06f02eb430e4a4a899
@@ -11989,8 +15173,8 @@ Date:	Mon Jul 11 15:04:49 2011 +0100
 
     When using any of the two sanctioned build systems
 
- poppler/poppler-config.h.cmake |    6 ++++--
- poppler/poppler-config.h.in	|    6 ++++--
+ poppler/poppler-config.h.cmake | 6 ++++--
+ poppler/poppler-config.h.in	| 6 ++++--
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit edcc84ef0137a733cf3fab79b919af309d87325c
@@ -11999,7 +15183,7 @@ Date:	Mon Jul 11 15:00:39 2011 +0100
 
     Harmonize all SPLASH_CMYK to use #if
 
- poppler/SplashOutputDev.cc |	24 ++++++++++++------------
+ poppler/SplashOutputDev.cc | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit a8fca630d592941c033ca6a380bf46b6e733a748
@@ -12013,23 +15197,23 @@ Date:	Mon Jul 11 14:57:33 2011 +0100
        configure/cmake process and are used in headers
      * Include poppker-config.h where needed
 
- goo/GooTimer.h			|    2 ++
- goo/ImgWriter.h		|    3 +-
- goo/JpegWriter.h		|    3 +-
- goo/PNGWriter.h		|    4 +--
- goo/TiffWriter.h		|    3 +-
- goo/gfile.h			|    3 +-
- poppler/DCTStream.h		|    5 ++--
- poppler/FlateStream.h		|    5 ++--
- poppler/Gfx.h			|    3 +-
- poppler/GfxState.h		|    2 ++
- poppler/Stream.h		|    3 +-
- poppler/poppler-config.h.cmake |   63
- ++++++++++++++++++++++++++++++++++++++++
- poppler/poppler-config.h.in	|   63
- ++++++++++++++++++++++++++++++++++++++++
- splash/SplashFTFont.h		|    4 ++-
- splash/SplashMath.h		|    4 ++-
+ goo/GooTimer.h			|  2 ++
+ goo/ImgWriter.h		|  3 +-
+ goo/JpegWriter.h		|  3 +-
+ goo/PNGWriter.h		|  4 +--
+ goo/TiffWriter.h		|  3 +-
+ goo/gfile.h			|  3 +-
+ poppler/DCTStream.h		|  5 ++--
+ poppler/FlateStream.h		|  5 ++--
+ poppler/Gfx.h			|  3 +-
+ poppler/GfxState.h		|  2 ++
+ poppler/Stream.h		|  3 +-
+ poppler/poppler-config.h.cmake | 63
+ ++++++++++++++++++++++++++++++++++++++++++
+ poppler/poppler-config.h.in	| 63
+ ++++++++++++++++++++++++++++++++++++++++++
+ splash/SplashFTFont.h		|  4 ++-
+ splash/SplashMath.h		|  4 ++-
  15 files changed, 153 insertions(+), 17 deletions(-)
 
 commit 214322f3c66a9aad4e2a46f6e305a3dacaa4f8b1
@@ -12040,12 +15224,12 @@ Date:	Sun Jul 10 01:20:21 2011 +0100
 
     Now all our changes are GPLv2+
 
- poppler/GfxFont.cc	     |	  3 +++
- poppler/GlobalParams.cc     |	  3 +++
- poppler/TextOutputDev.cc    |	  3 +++
- poppler/TextOutputDev.h     |	  3 +++
- poppler/UnicodeTypeTable.cc |	  3 +++
- poppler/UnicodeTypeTable.h  |	  3 +++
+ poppler/GfxFont.cc	     | 3 +++
+ poppler/GlobalParams.cc     | 3 +++
+ poppler/TextOutputDev.cc    | 3 +++
+ poppler/TextOutputDev.h     | 3 +++
+ poppler/UnicodeTypeTable.cc | 3 +++
+ poppler/UnicodeTypeTable.h  | 3 +++
  6 files changed, 18 insertions(+)
 
 commit 37cc1344672f480d4062aafbd2f3245ca1392279
@@ -12057,7 +15241,7 @@ Date:	Sun Jul 10 01:15:44 2011 +0100
     The file was modified in 2009 and README.contributors stating
     everything is GPLv2+ is from 2008
 
- poppler/XpdfPluginAPI.cc |    3 +++
+ poppler/XpdfPluginAPI.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 230ab66f52a992557464e325d18f88573ec52423
@@ -12066,9 +15250,9 @@ Date:	Sun Jul 10 01:06:41 2011 +0100
 
     make files easier to include by themselves
 
- fofi/FoFiTrueType.h	   |	2 ++
- splash/Splash.h	   |	3 ++-
- splash/SplashFontEngine.h |	3 ++-
+ fofi/FoFiTrueType.h	   | 2 ++
+ splash/Splash.h	   | 3 ++-
+ splash/SplashFontEngine.h | 3 ++-
  3 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 866c6d1b0daa8b28f259e1faba075026cf9007e0
@@ -12077,13 +15261,13 @@ Date:	Sun Jul 10 00:55:25 2011 +0100
 
     Name most of the classes in poppler/ includable by themselves
 
- poppler/Annot.h	      |    4 +++-
- poppler/Catalog.h	      |    2 ++
- poppler/CharCodeToUnicode.h  |    4 +++-
- poppler/CompactFontTables.h  |   16 ++++++++++++++++
- poppler/FontInfo.h	      |    6 +++++-
- poppler/GfxState_helpers.h   |    4 +++-
- poppler/NameToUnicodeTable.h |   18 ++++++++++++++++++
+ poppler/Annot.h	      |  4 +++-
+ poppler/Catalog.h	      |  2 ++
+ poppler/CharCodeToUnicode.h  |  4 +++-
+ poppler/CompactFontTables.h  | 16 ++++++++++++++++
+ poppler/FontInfo.h	      |  6 +++++-
+ poppler/GfxState_helpers.h   |  4 +++-
+ poppler/NameToUnicodeTable.h | 18 ++++++++++++++++++
  7 files changed, 50 insertions(+), 4 deletions(-)
 
 commit 6b62fb7e9bd7de7f79b9b9a6fe36a5f5da099133
@@ -12092,7 +15276,7 @@ Date:	Mon Jun 27 19:38:52 2011 +0100
 
     Remove unused variable
 
- poppler/PSOutputDev.cc |    5 +----
+ poppler/PSOutputDev.cc | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 4bc6c5bd3a001bb4eb9f61488e3d4f356638e391
@@ -12106,9 +15290,9 @@ Date:	Tue Jul 5 15:21:06 2011 +0300
     - qt4/tests/poppler-texts
     - test/gtk-test
 
- cpp/tests/.gitignore |    1 +
- qt4/tests/.gitignore |    1 +
- test/.gitignore      |    1 +
+ cpp/tests/.gitignore | 1 +
+ qt4/tests/.gitignore | 1 +
+ test/.gitignore      | 1 +
  3 files changed, 3 insertions(+)
 
 commit 00076bc308ae320244c47777fe351c1c2bef2da8
@@ -12117,8 +15301,8 @@ Date:	Fri Jun 24 22:51:55 2011 +0100
 
     Forgot William's (C) here
 
- poppler/Stream.cc |	1 +
- poppler/Stream.h  |	1 +
+ poppler/Stream.cc | 1 +
+ poppler/Stream.h  | 1 +
  2 files changed, 2 insertions(+)
 
 commit 7e244fde4ec03da08d81af3402b21646c803bd31
@@ -12129,9 +15313,9 @@ Date:	Fri Jun 24 22:39:13 2011 +0100
 
     If they are only gray of course :D
 
- poppler/PSOutputDev.cc |   34 ++++++++++++++++++++++++++++++----
- poppler/Stream.cc	|   43 +++++++++++++++++++++++++++++++++++++++++++
- poppler/Stream.h	|   29 +++++++++++++++++++++++++++++
+ poppler/PSOutputDev.cc | 34 ++++++++++++++++++++++++++++++----
+ poppler/Stream.cc	| 43 +++++++++++++++++++++++++++++++++++++++++++
+ poppler/Stream.h	| 29 +++++++++++++++++++++++++++++
  3 files changed, 102 insertions(+), 4 deletions(-)
 
 commit abba8140a9972197faaca96ec590af7dc9408fb0
@@ -12140,8 +15324,8 @@ Date:	Fri Jun 24 22:38:33 2011 +0100
 
     patch to make -level2sep and -level3sep write cmyk instead of rgb
 
- poppler/PSOutputDev.cc |   59
- ++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/PSOutputDev.cc | 59
+ +++++++++++++++++++++++++++++++++++++++++++++-----
  1 file changed, 54 insertions(+), 5 deletions(-)
 
 commit 706007431325b1e8c9bf4cba35c89511b10ebf0c
@@ -12150,7 +15334,7 @@ Date:	Mon Jun 20 23:30:50 2011 +0100
 
     (C) for Jim
 
- fofi/FoFiBase.cc |    1 +
+ fofi/FoFiBase.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit e23384fbb3542941d2cf59ce6560913255ca2b01
@@ -12161,7 +15345,7 @@ Date:	Mon Jun 20 11:09:01 2011 +0200
 
     * fofi/FoFiBase.cc: Diagnose ftell failure.
 
- fofi/FoFiBase.cc |    5 +++++
+ fofi/FoFiBase.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit c5601bde9d8f3f56e558a6f63e563c9d337810eb
@@ -12181,8 +15365,8 @@ Date:	Mon Jun 20 23:25:43 2011 +0100
     and character set encoding. This static method had to be made public
     to call it from pdftohtml. See bug #37900.
 
- utils/HtmlFonts.h  |	 3 ++-
- utils/pdftohtml.cc |	41 ++++++++++++++++++++++++++++++++++++++---
+ utils/HtmlFonts.h  |  3 ++-
+ utils/pdftohtml.cc | 41 ++++++++++++++++++++++++++++++++++++++---
  2 files changed, 40 insertions(+), 4 deletions(-)
 
 commit d4af1c4ef46abf1f11b7215c7b144ce7bb7912eb
@@ -12193,8 +15377,8 @@ Date:	Sat Jun 18 13:39:54 2011 +0100
 
     Bug 38019
 
- utils/HtmlFonts.cc	|    3 ++-
- utils/HtmlOutputDev.cc |   21 +++++++++++++++++++--
+ utils/HtmlFonts.cc	|  3 ++-
+ utils/HtmlOutputDev.cc | 21 +++++++++++++++++++--
  2 files changed, 21 insertions(+), 3 deletions(-)
 
 commit 589933ef105b60e8d48854cce15a7548c2850116
@@ -12203,7 +15387,7 @@ Date:	Mon Jun 13 21:24:39 2011 +0100
 
     Forgot my (C)
 
- poppler/PreScanOutputDev.cc |	  2 +-
+ poppler/PreScanOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f5d2ddd13d27078355dee63207671885bf9b0926
@@ -12214,7 +15398,7 @@ Date:	Mon Jun 13 18:57:29 2011 +0100
 
     Fixes crash after patch to fix bug 13518
 
- poppler/PreScanOutputDev.cc |	  2 ++
+ poppler/PreScanOutputDev.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 147ae4bf76a85768c9ed729ca10ee3dae93b8876
@@ -12223,7 +15407,7 @@ Date:	Wed Jun 8 23:36:14 2011 +0100
 
     Do not crash if link does not have an action
 
- utils/HtmlOutputDev.cc |    2 ++
+ utils/HtmlOutputDev.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 5d9489bf566b700ef38e5e33665a2648b535e1e7
@@ -12232,7 +15416,7 @@ Date:	Sat Jun 4 21:46:10 2011 +0100
 
     forgot to update the C
 
- utils/pdftotext.cc |	 1 +
+ utils/pdftotext.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 7b123bf2b11ac81f24a966186a06de739d3c8f02
@@ -12260,7 +15444,7 @@ Date:	Sat Jun 4 20:22:52 2011 +0100
 
     Bug 37900
 
- utils/pdftotext.cc |	 3 ++-
+ utils/pdftotext.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit db2ae1bdbb7fcb64ba4c91dfc574d9f970bebdf6
@@ -12269,7 +15453,7 @@ Date:	Sat Jun 4 13:23:11 2011 +0100
 
     Make sure catDict is a dict
 
- poppler/Catalog.cc |	 5 +++++
+ poppler/Catalog.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 58915affbdf1b5780f25d172a582c69fb2413230
@@ -12280,7 +15464,7 @@ Date:	Sat Jun 4 13:20:02 2011 +0100
 
     KDE Bug 274888 shows it's possible to get aborts because of that
 
- poppler/Catalog.cc |	26 ++++++++++++++++----------
+ poppler/Catalog.cc | 26 ++++++++++++++++----------
  1 file changed, 16 insertions(+), 10 deletions(-)
 
 commit 4ebc7e364409fe303e7a5729b568913e3c92e7d4
@@ -12289,7 +15473,7 @@ Date:	Sat Jun 4 13:19:34 2011 +0100
 
     We need to free catDict on failure
 
- poppler/Catalog.cc |	 1 +
+ poppler/Catalog.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 335a7fc6d98f5facc1ff098a91ac968387473cb3
@@ -12298,7 +15482,7 @@ Date:	Tue May 31 23:18:26 2011 +0100
 
     Make parse() private
 
- poppler/Catalog.h |	4 ++--
+ poppler/Catalog.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 311d69ef2222409859817737c44b8e741289d897
@@ -12309,7 +15493,7 @@ Date:	Sun May 29 16:12:29 2011 +0100
 
     As i said in my last commit comment :D
 
- poppler/PDFDoc.cc |	6 ++++--
+ poppler/PDFDoc.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 66c7d0199b45bc7c81c88a9989c9515398d30d43
@@ -12321,7 +15505,7 @@ Date:	Sat May 28 17:32:02 2011 +0100
     We probably need to free obj4 but i don't have the stamina to properly
     test it
 
- poppler/PDFDoc.cc |   21 ++++++++++-----------
+ poppler/PDFDoc.cc | 21 ++++++++++-----------
  1 file changed, 10 insertions(+), 11 deletions(-)
 
 commit 450934619a1c5b2a58f65649f567274af8d24ea7
@@ -12332,7 +15516,7 @@ Date:	Sat May 28 12:37:08 2011 +0100
 
     Fixes KDE Bug #274055
 
- qt4/src/poppler-page.cc |    4 ++--
+ qt4/src/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 04dfb2c984b3c9949466e2b70e26b58029c5a7d3
@@ -12343,24 +15527,24 @@ Date:	Sat May 7 12:55:34 2011 +0200
 
     Qt and cpp frontends adapted by Pino Toscano
 
- cpp/poppler-document.cpp		|    4 +-
- cpp/poppler-embedded-file-private.h	|   10 +--
- cpp/poppler-embedded-file.cpp		|   42 +++++++----
- glib/poppler-annot.cc			|    6 +-
- glib/poppler-attachment.cc		|   33 ++++----
- glib/poppler-document.cc		|    5 +-
- glib/poppler-private.h			|    3 +-
- poppler/Catalog.cc			|  118
- ++---------------------------
- poppler/Catalog.h			|   55 +-------------
- poppler/FileSpec.cc			|  128
- ++++++++++++++++++++++++++++++++
- poppler/FileSpec.h			|   51 ++++++++++++-
- qt4/src/poppler-embeddedfile-private.h |    6 +-
- qt4/src/poppler-embeddedfile.cc	|   34 +++++----
- qt4/src/poppler-page.cc		|    5 +-
- qt4/src/poppler-private.h		|    4 +-
- qt4/tests/check_attachments.cpp	|   12 +--
+ cpp/poppler-document.cpp		|   4 +-
+ cpp/poppler-embedded-file-private.h	|  10 +--
+ cpp/poppler-embedded-file.cpp		|  42 +++++++----
+ glib/poppler-annot.cc			|   6 +-
+ glib/poppler-attachment.cc		|  33 +++++----
+ glib/poppler-document.cc		|   5 +-
+ glib/poppler-private.h			|   3 +-
+ poppler/Catalog.cc			| 118
+ +++---------------------------
+ poppler/Catalog.h			|  55 +-------------
+ poppler/FileSpec.cc			| 128
+ +++++++++++++++++++++++++++++++++
+ poppler/FileSpec.h			|  51 ++++++++++++-
+ qt4/src/poppler-embeddedfile-private.h |   6 +-
+ qt4/src/poppler-embeddedfile.cc	|  34 +++++----
+ qt4/src/poppler-page.cc		|   5 +-
+ qt4/src/poppler-private.h		|   4 +-
+ qt4/tests/check_attachments.cpp	|  12 ++--
  16 files changed, 284 insertions(+), 232 deletions(-)
 
 commit 74f9befddd4b5848c4af0c1b2848a1322f8cd0a2
@@ -12369,7 +15553,7 @@ Date:	Wed May 25 16:46:15 2011 +0200
 
     [qt4] Page needs to be a friend of EmbeddedFile, too
 
- qt4/src/poppler-qt4.h |    1 +
+ qt4/src/poppler-qt4.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 74853614d617486b7b62e9c08be39a6e58bc7d9b
@@ -12378,9 +15562,9 @@ Date:	Wed May 25 16:40:49 2011 +0200
 
     update copyrights
 
- qt4/src/poppler-embeddedfile-private.h |    2 +-
- qt4/src/poppler-embeddedfile.cc	|    2 +-
- qt4/src/poppler-qt4.h			|    2 +-
+ qt4/src/poppler-embeddedfile-private.h | 2 +-
+ qt4/src/poppler-embeddedfile.cc	| 2 +-
+ qt4/src/poppler-qt4.h			| 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit e6b2dec502c02f9fbaed480f227cf7145249a98e
@@ -12391,7 +15575,7 @@ Date:	Wed May 25 16:39:09 2011 +0200
 
     followup of a264e5385b2d0fee5126b3d0e57d42d34cafa45d
 
- qt4/src/poppler-page.cc |    2 +-
+ qt4/src/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a264e5385b2d0fee5126b3d0e57d42d34cafa45d
@@ -12404,10 +15588,10 @@ Date:	Wed May 25 16:12:02 2011 +0200
     reducing the amount of poppler code API exposed to the outside
     - turn the old private EmbeddedFile(EmbFile*) ctor in a death machine
 
- qt4/src/poppler-embeddedfile-private.h |    3 +++
- qt4/src/poppler-embeddedfile.cc	|   21 ++++++++++++++++++---
- qt4/src/poppler-private.h		|    3 ++-
- qt4/src/poppler-qt4.h			|    2 ++
+ qt4/src/poppler-embeddedfile-private.h |  3 +++
+ qt4/src/poppler-embeddedfile.cc	| 21 ++++++++++++++++++---
+ qt4/src/poppler-private.h		|  3 ++-
+ qt4/src/poppler-qt4.h			|  2 ++
  4 files changed, 25 insertions(+), 4 deletions(-)
 
 commit 232bfa1c59013637fd7e858e22194becb636ad21
@@ -12416,9 +15600,9 @@ Date:	Wed May 25 15:55:48 2011 +0200
 
     [Qt4] split EmbeddedFileData in an own file
 
- qt4/src/poppler-embeddedfile-private.h |   37
- ++++++++++++++++++++++++++++++++
- qt4/src/poppler-embeddedfile.cc	|    7 +-----
+ qt4/src/poppler-embeddedfile-private.h | 37
+ ++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-embeddedfile.cc	|  7 +------
  2 files changed, 38 insertions(+), 6 deletions(-)
 
 commit a7242b78b3c9a64cf38ac150e6a914d7abce3355
@@ -12431,8 +15615,8 @@ Date:	Sat May 7 11:10:11 2011 +0100
     Fixes KDE BUG #268816
     (cherry picked from commit dab9cdf795d6caead555326958e86e844ace067b)
 
- poppler/Catalog.cc |	12 +++++-------
- poppler/Catalog.h  |	 2 +-
+ poppler/Catalog.cc | 12 +++++-------
+ poppler/Catalog.h  |  2 +-
  2 files changed, 6 insertions(+), 8 deletions(-)
 
 commit 4db2452b3d345d9531987998e6b5532a59137e1d
@@ -12441,10 +15625,10 @@ Date:	Fri May 6 14:57:51 2011 +0200
 
     glib: Add poppler_document_get_n_attachments()
 
- glib/poppler-document.cc	     |	 34
+ glib/poppler-document.cc	     | 34
  ++++++++++++++++++++++++----------
- glib/poppler-document.h	     |	  1 +
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-document.h	     |	1 +
+ glib/reference/poppler-sections.txt |	1 +
  3 files changed, 26 insertions(+), 10 deletions(-)
 
 commit 3e3284de3fe1916d7f8161ede7bf49c76d01f303
@@ -12453,8 +15637,8 @@ Date:	Fri May 6 14:49:05 2011 +0200
 
     glib: Update gtk-doc.make
 
- gtk-doc.make |  151
- +++++++++++++++++++++++++++++++++++++---------------------
+ gtk-doc.make | 151
+ ++++++++++++++++++++++++++++++++++++++---------------------
  1 file changed, 98 insertions(+), 53 deletions(-)
 
 commit 9a77bd7706a08d9aeabe600e3500c14493ac8519
@@ -12463,7 +15647,7 @@ Date:	Fri May 6 14:48:38 2011 +0200
 
     glib-demo: Add missing permission flags to info demo
 
- glib/demo/info.cc |   39 ++++++++++++++++++++++++++++++++++++---
+ glib/demo/info.cc | 39 ++++++++++++++++++++++++++++++++++++---
  1 file changed, 36 insertions(+), 3 deletions(-)
 
 commit 091c155f8a7bc79da84cd21877be389de1f2b1a3
@@ -12472,8 +15656,8 @@ Date:	Fri May 6 14:47:36 2011 +0200
 
     glib: Add missing permissions flags to PopplerPermissions
 
- glib/poppler-document.cc |    6 ++++++
- glib/poppler-document.h  |   10 +++++++++-
+ glib/poppler-document.cc |  6 ++++++
+ glib/poppler-document.h  | 10 +++++++++-
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 632d6a40ce3a5d3d8e10bf7e93e8eb578beae907
@@ -12482,12 +15666,12 @@ Date:	Tue May 3 21:54:59 2011 +0100
 
     0.17.1
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 12 ++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 12 ++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 18 insertions(+), 6 deletions(-)
 
 commit ecb136b9927a454df9360a307ccd741eaea3ca93
@@ -12496,8 +15680,8 @@ Date:	Tue May 3 21:42:45 2011 +0100
 
     remove unused vars
 
- poppler/Annot.cc	    |	 9 ++-------
- poppler/ArthurOutputDev.cc |	12 ++----------
+ poppler/Annot.cc	    |  9 ++-------
+ poppler/ArthurOutputDev.cc | 12 ++----------
  2 files changed, 4 insertions(+), 17 deletions(-)
 
 commit ad131763640b2e27dde75c42b514386284b6a60d
@@ -12506,7 +15690,7 @@ Date:	Wed Apr 27 22:36:13 2011 +0200
 
     [qt4/tests] turn some assignments to bool into QVERIFY checks
 
- qt4/tests/check_optcontent.cpp |    6 +++---
+ qt4/tests/check_optcontent.cpp | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit be08dd69d9dd4fcb22400f2f0aea331222e88e4a
@@ -12516,8 +15700,8 @@ Date:	Wed Apr 27 20:45:36 2011 +0100
     update copyright years
     (cherry picked from commit 2fbd493197309de5700f71f09967c9d23add88d3)
 
- poppler/Annot.cc   |	 1 +
- utils/pdftotext.cc |	 1 +
+ poppler/Annot.cc   | 1 +
+ utils/pdftotext.cc | 1 +
  2 files changed, 2 insertions(+)
 
 commit 39bcce0c8ed378aafb1019ffd1ae40330f6bb63f
@@ -12526,9 +15710,9 @@ Date:	Wed Apr 27 19:39:01 2011 +0100
 
     Remove more variables that are set but then unused
 
- poppler/SplashOutputDev.cc |	11 +------
- utils/HtmlOutputDev.cc     |	75
- +-------------------------------------------
+ poppler/SplashOutputDev.cc | 11 +------
+ utils/HtmlOutputDev.cc     | 75
+ +---------------------------------------------
  2 files changed, 2 insertions(+), 84 deletions(-)
 
 commit 6656cf657b62d626910a02dfae9b6a1eb77772dd
@@ -12537,7 +15721,7 @@ Date:	Wed Apr 27 08:46:37 2011 +0100
 
     Remove unused vars
 
- poppler/TextOutputDev.cc |    6 +-----
+ poppler/TextOutputDev.cc | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 commit ce55510f4dd10dfec2fc5b1c211c4a546c6ebc98
@@ -12546,9 +15730,9 @@ Date:	Wed Apr 27 08:42:34 2011 +0100
 
     Remove unused vars
 
- splash/Splash.cc	      |    5 ++---
- splash/SplashFTFontEngine.cc |    4 +---
- splash/SplashXPath.cc	      |    6 ++----
+ splash/Splash.cc	      | 5 ++---
+ splash/SplashFTFontEngine.cc | 4 +---
+ splash/SplashXPath.cc	      | 6 ++----
  3 files changed, 5 insertions(+), 10 deletions(-)
 
 commit 49d199fd1ea14383638739d95d019adb33b17768
@@ -12557,7 +15741,7 @@ Date:	Wed Apr 27 08:38:17 2011 +0100
 
     Fix page_transition::operator=
 
- cpp/poppler-page-transition.cpp |    3 ++-
+ cpp/poppler-page-transition.cpp | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 807c1df2bf79c7c6378390b41dc230d80533ae3f
@@ -12566,7 +15750,7 @@ Date:	Tue Apr 26 17:06:07 2011 +0100
 
     bbox coordinates are relative to MediaBox size, not CropBox size
 
- utils/pdftotext.cc |	 2 +-
+ utils/pdftotext.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 813f41367a681702ae7a155d5c2f3195124a9096
@@ -12575,7 +15759,7 @@ Date:	Sun Apr 3 20:40:15 2011 +0200
 
     forms: fix mem leak in case of error
 
- poppler/Form.cc |    2 ++
+ poppler/Form.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 722baf8baf42e2c7a49e1560aae5235677d1ddee
@@ -12585,7 +15769,7 @@ Date:	Sun Apr 3 20:17:57 2011 +0200
     forms: check form field is actually terminal before creating the
     widget
 
- poppler/Form.cc |    4 ++++
+ poppler/Form.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 5f6f7fc569d1c891956a3c37b3e328504635ab33
@@ -12596,7 +15780,7 @@ Date:	Sun Apr 3 15:06:45 2011 +0100
 
     Bug 35925
 
- poppler/Hints.cc |    3 ++-
+ poppler/Hints.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit d6786edc2549164214342a50782b72c2fd904b63
@@ -12605,8 +15789,8 @@ Date:	Sun Apr 3 13:11:18 2011 +0200
 
     forms: Remove unused parameter
 
- poppler/Form.cc |    2 +-
- poppler/Form.h  |    2 +-
+ poppler/Form.cc | 2 +-
+ poppler/Form.h  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 62692ff381f3b7907b330bfc2019416ed058ea46
@@ -12623,10 +15807,10 @@ Date:	Sun Apr 3 13:01:42 2011 +0200
     reworked too, since now it's possible to have a set of buttons where
     children are not widgets, but form fields with a child widget.
 
- poppler/Annot.cc |    4 +-
- poppler/Form.cc  |  237
- +++++++++++++++++++++++++++++-------------------------
- poppler/Form.h   |   17 ++--
+ poppler/Annot.cc |   4 +-
+ poppler/Form.cc  | 237
+ +++++++++++++++++++++++++++++--------------------------
+ poppler/Form.h   |  17 ++--
  3 files changed, 137 insertions(+), 121 deletions(-)
 
 commit a6802301d9c3ab8bf68bd8821f562f8ecced8491
@@ -12635,9 +15819,9 @@ Date:	Mon Mar 28 17:42:37 2011 +0200
 
     forms: Add debug methods to print the forms tree
 
- poppler/Form.cc |   78
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Form.h  |   25 ++++++++++++++++++
+ poppler/Form.cc | 78
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Form.h  | 25 ++++++++++++++++++
  2 files changed, 103 insertions(+)
 
 commit 46f87da04700cdd1afa634f9c554e376f6f6f752
@@ -12646,7 +15830,7 @@ Date:	Thu Mar 31 08:09:41 2011 -0400
 
     Fix a memleak in AnnotScreen::initialize
 
- poppler/Annot.cc |    1 +
+ poppler/Annot.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit b64178eaa5dd01f914649d6faa870fa140ddaf9b
@@ -12655,7 +15839,7 @@ Date:	Wed Mar 30 15:17:54 2011 +0200
 
     glib: docs: Add PopplerActionJavascript to poppler-sections.txt
 
- glib/reference/poppler-sections.txt |	  1 +
+ glib/reference/poppler-sections.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3d777181ddee8f7ab2cc9e4684879cb5b52b065c
@@ -12664,7 +15848,7 @@ Date:	Wed Mar 30 15:16:04 2011 +0200
 
     glib: Use Javascript instead of JavaScript for consistency
 
- glib/poppler-action.h |    6 +++---
+ glib/poppler-action.h | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit c4774fecfe3d523f32d5980f50e31daa798c9692
@@ -12673,7 +15857,7 @@ Date:	Wed Mar 30 15:08:59 2011 +0200
 
     glib-demo: show javascript actions in actions view
 
- glib/demo/utils.c |   25 +++++++++++++++++++++++++
+ glib/demo/utils.c | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
 commit 68bbbe1a3f68d242b35027ae41f5751b02a2a700
@@ -12682,8 +15866,8 @@ Date:	Tue Mar 29 04:56:37 2011 -0400
 
     glib: add JavaScript actions
 
- glib/poppler-action.cc |   24 ++++++++++++++++++++++++
- glib/poppler-action.h	|   14 +++++++++++++-
+ glib/poppler-action.cc | 24 ++++++++++++++++++++++++
+ glib/poppler-action.h	| 14 +++++++++++++-
  2 files changed, 37 insertions(+), 1 deletion(-)
 
 commit 3dd934088a06f246718382601030c9b093d04160
@@ -12692,7 +15876,7 @@ Date:	Wed Mar 30 00:03:58 2011 +0100
 
     Need to create the globalParams
 
- qt4/tests/check_optcontent.cpp |    5 +++++
+ qt4/tests/check_optcontent.cpp | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit ce0d4278a32b3ba19c2002ed0c481c58b1854d59
@@ -12701,7 +15885,7 @@ Date:	Tue Mar 29 23:47:33 2011 +0100
 
     Long gone
 
- Makefile.am |	  2 --
+ Makefile.am | 2 --
  1 file changed, 2 deletions(-)
 
 commit 12337026533aa59bb66022ce8a119f37aafd4fad
@@ -12710,12 +15894,12 @@ Date:	Tue Mar 29 23:40:57 2011 +0100
 
     increase sonames
 
- CMakeLists.txt		|    2 +-
- glib/CMakeLists.txt	|    2 +-
- glib/Makefile.am	|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		| 2 +-
+ glib/CMakeLists.txt	| 2 +-
+ glib/Makefile.am	| 2 +-
+ poppler/Makefile.am	| 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am	| 2 +-
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 commit a6e613b01698c6b38deff5248fcf7c0b17d041c3
@@ -12724,7 +15908,7 @@ Date:	Tue Mar 29 23:40:38 2011 +0100
 
     more typos
 
- NEWS |    6 +++---
+ NEWS | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit e3ee037ede67212836be158b935deb7ea974b7f7
@@ -12733,7 +15917,7 @@ Date:	Tue Mar 29 23:38:24 2011 +0100
 
     typo
 
- NEWS |    4 ++--
+ NEWS | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8bcd94964f0af17a3f5b6edf71127df3daa00b1a
@@ -12742,7 +15926,7 @@ Date:	Tue Mar 29 23:30:30 2011 +0100
 
     typo
 
- NEWS |    2 +-
+ NEWS | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a05b9dacbe5dbd4337fdbb3e7d7d364ad5fbaeab
@@ -12751,10 +15935,10 @@ Date:	Tue Mar 29 23:28:49 2011 +0100
 
     0.17.0 version number
 
- CMakeLists.txt   |    2 +-
- configure.ac	  |    2 +-
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 4637b737b4735c70017b46a3ed6c0ee069c02c9b
@@ -12763,8 +15947,8 @@ Date:	Tue Mar 29 23:28:41 2011 +0100
 
     0.17.0 news
 
- NEWS |  108
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 108
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 108 insertions(+)
 
 commit a55cc5d9c67ede1d96f6e5a58179ddd9f563c53f
@@ -12773,8 +15957,8 @@ Date:	Tue Mar 29 22:51:40 2011 +0100
 
     Update years
 
- poppler/Catalog.cc |	 2 +-
- poppler/Catalog.h  |	 2 +-
+ poppler/Catalog.cc | 2 +-
+ poppler/Catalog.h  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit d96efb6c1af621be78e998ba1a228022c3c076fc
@@ -12783,7 +15967,7 @@ Date:	Tue Mar 29 11:13:03 2011 +0200
 
     fix comment
 
- poppler/ViewerPreferences.h |	  2 +-
+ poppler/ViewerPreferences.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 74ec81d66d4d5bc45cccc4aa8794df1c517f2d74
@@ -12792,8 +15976,8 @@ Date:	Tue Mar 29 11:07:36 2011 +0200
 
     viewer preferences: read PrintScaling and Duplex
 
- poppler/ViewerPreferences.cc |   24 ++++++++++++++++++++++++
- poppler/ViewerPreferences.h  |   14 ++++++++++++++
+ poppler/ViewerPreferences.cc | 24 ++++++++++++++++++++++++
+ poppler/ViewerPreferences.h  | 14 ++++++++++++++
  2 files changed, 38 insertions(+)
 
 commit b41bcd484dd7a93a339270926c57caa524059d8f
@@ -12802,7 +15986,7 @@ Date:	Tue Mar 29 10:58:46 2011 +0200
 
     free the viewerPreferences Object
 
- poppler/Catalog.cc |	 1 +
+ poppler/Catalog.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 1dd88d0b6b7cbfda76e81902a351c89457a061a8
@@ -12815,8 +15999,8 @@ Date:	Tue Mar 29 09:58:10 2011 +0200
     this way it is possible to know whether the ViewerPreferences
     dictionary is present in the Catalog
 
- poppler/Catalog.cc |	24 +++++++++---------------
- poppler/Catalog.h  |	 3 ++-
+ poppler/Catalog.cc | 24 +++++++++---------------
+ poppler/Catalog.h  |  3 ++-
  2 files changed, 11 insertions(+), 16 deletions(-)
 
 commit f10b0b8c88a7df83ada09f32b6cb6fd930fcb748
@@ -12825,7 +16009,7 @@ Date:	Tue Mar 29 09:57:46 2011 +0200
 
     assume the prefDict is not null
 
- poppler/ViewerPreferences.cc |    4 ----
+ poppler/ViewerPreferences.cc | 4 ----
  1 file changed, 4 deletions(-)
 
 commit d4a5ea45057cad531a8979cf9861ac05cdd56613
@@ -12834,7 +16018,7 @@ Date:	Tue Mar 29 09:54:22 2011 +0200
 
     fix variable name for DisplayDocTitle
 
- poppler/ViewerPreferences.cc |    2 +-
+ poppler/ViewerPreferences.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cf84a05ae524aa9b266463cc23cccc3860ff1ba3
@@ -12843,8 +16027,8 @@ Date:	Mon Mar 28 23:18:02 2011 +0200
 
     viewer preferences: read NonFullScreenPageMode and Direction
 
- poppler/ViewerPreferences.cc |   26 ++++++++++++++++++++++++++
- poppler/ViewerPreferences.h  |   15 +++++++++++++++
+ poppler/ViewerPreferences.cc | 26 ++++++++++++++++++++++++++
+ poppler/ViewerPreferences.h  | 15 +++++++++++++++
  2 files changed, 41 insertions(+)
 
 commit 460253a6705a227ff7c36e9c31cceb93cce4d78b
@@ -12860,9 +16044,9 @@ Date:	Mon Mar 28 22:37:54 2011 +0200
     - CenterWindow
     - DisplayDocTitle
 
- poppler/ViewerPreferences.cc |   41
+ poppler/ViewerPreferences.cc | 41
  +++++++++++++++++++++++++++++++++++++++++
- poppler/ViewerPreferences.h  |   13 +++++++++++++
+ poppler/ViewerPreferences.h  | 13 +++++++++++++
  2 files changed, 54 insertions(+)
 
 commit 9fa9ac3546674120532bb512b82af6471cbebf01
@@ -12876,12 +16060,12 @@ Date:	Mon Mar 28 19:58:16 2011 +0200
     created on demand and in any occasion (so defaults are in one
     place only)
 
- CMakeLists.txt		      |    2 ++
- poppler/Catalog.cc	      |   23 +++++++++++++++++++++++
- poppler/Catalog.h	      |    4 ++++
- poppler/Makefile.am	      |    2 ++
- poppler/ViewerPreferences.cc |   30 ++++++++++++++++++++++++++++++
- poppler/ViewerPreferences.h  |   34 ++++++++++++++++++++++++++++++++++
+ CMakeLists.txt		      |  2 ++
+ poppler/Catalog.cc	      | 23 +++++++++++++++++++++++
+ poppler/Catalog.h	      |  4 ++++
+ poppler/Makefile.am	      |  2 ++
+ poppler/ViewerPreferences.cc | 30 ++++++++++++++++++++++++++++++
+ poppler/ViewerPreferences.h  | 34 ++++++++++++++++++++++++++++++++++
  6 files changed, 95 insertions(+)
 
 commit c6081f0bf00d7dcdfa1d09e91e4c9a1fe5a54ad6
@@ -12890,7 +16074,7 @@ Date:	Mon Mar 28 19:55:00 2011 +0200
 
     delete the temporary buffers created by pdfDocEncodingToUTF16()
 
- poppler/Form.cc |    2 ++
+ poppler/Form.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit d94d5056d5570e2f5cb578736eba12317ea63fa4
@@ -12899,7 +16083,7 @@ Date:	Mon Mar 28 18:20:31 2011 +0200
 
     glib-demo: show the activation action of form fields if there's one
 
- glib/demo/forms.c |   21 ++++++++++++++++-----
+ glib/demo/forms.c | 21 ++++++++++++++++-----
  1 file changed, 16 insertions(+), 5 deletions(-)
 
 commit ba0f36b76d0c2fd4ef39f3013fc125a53747c03f
@@ -12910,11 +16094,11 @@ Date:	Mon Mar 28 18:17:52 2011 +0200
 
     Fixes bug #33174.
 
- glib/poppler-form-field.cc	     |	 34
+ glib/poppler-form-field.cc	     | 34
  ++++++++++++++++++++++++++++++++++
- glib/poppler-form-field.h	     |	  1 +
- glib/poppler-private.h		     |	  1 +
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-form-field.h	     |	1 +
+ glib/poppler-private.h		     |	1 +
+ glib/reference/poppler-sections.txt |	1 +
  4 files changed, 37 insertions(+)
 
 commit ae5b9cf884ce38dde409c3e5b0f6c46f7d6327d2
@@ -12928,11 +16112,11 @@ Date:	Mon Mar 28 17:43:53 2011 +0200
     It introduces new API to glib frontend that is wrong and will be
     changed soon.
 
- glib/poppler-annot.cc |   33 -----
- glib/poppler-annot.h  |    5 -
- poppler/Annot.cc      |  377
- -------------------------------------------------
- poppler/Annot.h       |    2 -
+ glib/poppler-annot.cc |  33 -----
+ glib/poppler-annot.h  |   5 -
+ poppler/Annot.cc      | 377
+ --------------------------------------------------
+ poppler/Annot.h       |   2 -
  4 files changed, 417 deletions(-)
 
 commit b7edd4c93539585652961ecf2db9c4462415c8bc
@@ -12943,7 +16127,7 @@ Date:	Sun Mar 27 12:31:19 2011 +0200
 
     Fixes regression in document example_054.pdf
 
- poppler/Annot.cc |    6 +++---
+ poppler/Annot.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit e9350899e77c28452c48b56349ad7758b3fd47ba
@@ -12954,10 +16138,10 @@ Date:	Thu Mar 24 20:09:18 2011 +0000
 
     So it does not need to pack and unpack the color again and again
 
- poppler/GfxState.cc	    |  248
- +++++++++++++++++++++++++++++++++++++++++---
- poppler/GfxState.h	    |	22 +++-
- poppler/SplashOutputDev.cc |	43 ++------
+ poppler/GfxState.cc	    | 248
+ ++++++++++++++++++++++++++++++++++++++++++---
+ poppler/GfxState.h	    |  22 +++-
+ poppler/SplashOutputDev.cc |  43 ++------
  3 files changed, 265 insertions(+), 48 deletions(-)
 
 commit 7b08795a9541e9fa01836b4c7fd63f6fe295ad80
@@ -12967,7 +16151,7 @@ Date:	Thu Mar 24 12:16:07 2011 +0100
     glib: Add g_return macros to make sure index is correct in form
     field choice methods
 
- glib/poppler-form-field.cc |	 4 ++++
+ glib/poppler-form-field.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit f1102fccd2899bc7f97414b1e2a295c59f03da22
@@ -12976,7 +16160,7 @@ Date:	Thu Mar 24 12:15:30 2011 +0100
 
     glib-demo: Fix a crash when a choice form field has no items selected
 
- glib/demo/forms.c |	4 ++--
+ glib/demo/forms.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit b3971ee6bca6b14b75f046c831a31ac1e5e3241e
@@ -12985,7 +16169,7 @@ Date:	Tue Mar 22 22:08:27 2011 +0000
 
     kill this TODO, n is too small
 
- poppler/SplashOutputDev.cc |	 6 +++---
+ poppler/SplashOutputDev.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 1064d75817401fe24f728c189b450e9e906beb56
@@ -13013,17 +16197,17 @@ Date:	Mon Mar 21 21:34:46 2011 +0000
 
     Fixes bug 13518
 
- poppler/CairoOutputDev.cc   |	  5 +-
- poppler/CairoOutputDev.h    |	 10 +-
- poppler/Gfx.cc		     |	  6 +-
- poppler/OutputDev.h	     |	  6 +-
- poppler/PSOutputDev.cc      |	  8 +-
- poppler/PSOutputDev.h	     |	  6 +-
- poppler/PreScanOutputDev.cc |	 22 +++-
- poppler/PreScanOutputDev.h  |	 16 ++-
- poppler/SplashOutputDev.cc  |	265
- +++++++++++++++++++++++++++++++++++++++++++
- poppler/SplashOutputDev.h   |	 12 ++
+ poppler/CairoOutputDev.cc   |	 5 +-
+ poppler/CairoOutputDev.h    |	10 +-
+ poppler/Gfx.cc		     |	 6 +-
+ poppler/OutputDev.h	     |	 6 +-
+ poppler/PSOutputDev.cc      |	 8 +-
+ poppler/PSOutputDev.h	     |	 6 +-
+ poppler/PreScanOutputDev.cc |	22 +++-
+ poppler/PreScanOutputDev.h  |	16 ++-
+ poppler/SplashOutputDev.cc  | 265
+ ++++++++++++++++++++++++++++++++++++++++++++
+ poppler/SplashOutputDev.h   |	12 ++
  10 files changed, 334 insertions(+), 22 deletions(-)
 
 commit 66575c990f379871e4b796befc899de178332670
@@ -13032,11 +16216,11 @@ Date:	Thu Mar 17 20:14:05 2011 +0000
 
     Patch for embedding videos in to the pdf
 
- glib/poppler-annot.cc |   33 +++++
- glib/poppler-annot.h  |    5 +
- poppler/Annot.cc      |  377
- +++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h       |    2 +
+ glib/poppler-annot.cc |  33 +++++
+ glib/poppler-annot.h  |   5 +
+ poppler/Annot.cc      | 377
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h       |   2 +
  4 files changed, 417 insertions(+)
 
 commit ec1917968d2f1c7a00772a0829b3fcc6957d8f3c
@@ -13045,7 +16229,7 @@ Date:	Mon Mar 14 00:13:26 2011 +0000
 
     Only build gtk-test if we have to build gtk-test
 
- test/Makefile.am |    6 +++---
+ test/Makefile.am | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 1acbb01e72a22f70f00dc058ff206e3bc05bc0ab
@@ -13054,8 +16238,8 @@ Date:	Sun Mar 13 14:49:48 2011 +0000
 
     (C) years
 
- poppler/CachedFile.cc	   |	2 +-
- poppler/CurlCachedFile.cc |	2 +-
+ poppler/CachedFile.cc	   | 2 +-
+ poppler/CurlCachedFile.cc | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit bc8aeb269aa92406081f749064ceff75bb3145e7
@@ -13064,8 +16248,8 @@ Date:	Sat Mar 12 23:17:59 2011 +0100
 
     Check response code of libcurl call
 
- poppler/CachedFile.cc	   |	8 +++++++-
- poppler/CurlCachedFile.cc |   12 +++++++++---
+ poppler/CachedFile.cc	   |  8 +++++++-
+ poppler/CurlCachedFile.cc | 12 +++++++++---
  2 files changed, 16 insertions(+), 4 deletions(-)
 
 commit 0268cedee5b460835a4747d0ea41bbe12269310d
@@ -13074,7 +16258,7 @@ Date:	Sat Mar 12 15:24:30 2011 +0100
 
     cairo: Fix typo
 
- poppler/CairoFontEngine.cc |	 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5aa369e68e5c9f14efc888c7b26da06aa8bd2a78
@@ -13083,7 +16267,7 @@ Date:	Sat Mar 12 13:47:34 2011 +0000
 
     Remove unused variable
 
- poppler/CurlCachedFile.cc |	2 --
+ poppler/CurlCachedFile.cc | 2 --
  1 file changed, 2 deletions(-)
 
 commit c0dffbe28f91b30b36310ab0b9a9b948610550ae
@@ -13092,8 +16276,8 @@ Date:	Sat Mar 12 12:15:58 2011 +0100
 
     update copyright years
 
- cpp/poppler-document-private.h |    2 +-
- cpp/poppler-document.cpp	|    2 +-
+ cpp/poppler-document-private.h | 2 +-
+ cpp/poppler-document.cpp	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit b8fab173ffdd1e62a34b530228d08bc5ec6725ac
@@ -13105,9 +16289,9 @@ Date:	Sat Mar 12 12:13:05 2011 +0100
     introduce a small RAII class to init/deinit the globalParams, and
     make document_private inherit from it
 
- cpp/poppler-document-private.h |   17 ++++++++-----
- cpp/poppler-document.cpp	|   52
- +++++++++++++++++++++-------------------
+ cpp/poppler-document-private.h | 17 +++++++++-----
+ cpp/poppler-document.cpp	| 52
+ +++++++++++++++++++++++-------------------
  2 files changed, 39 insertions(+), 30 deletions(-)
 
 commit a97a54cb22def2a9fc381fb81842dad9e5c3931f
@@ -13116,7 +16300,7 @@ Date:	Sat Mar 12 12:12:11 2011 +0100
 
     forms: delete tmp_str after being converted to GooString
 
- poppler/Form.cc |    1 +
+ poppler/Form.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 9671fe07f8c9ade956742cb141b99518c3b12bad
@@ -13125,7 +16309,7 @@ Date:	Fri Mar 11 00:05:52 2011 +0000
 
     getForm can return NULL, do not crash if that happens
 
- poppler/Annot.cc |   10 ++++++----
+ poppler/Annot.cc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit bd32672899f5ca4509ec9311de8092d14bec8ab1
@@ -13134,8 +16318,8 @@ Date:	Thu Mar 10 23:33:15 2011 +0000
 
     update copyright years
 
- poppler/Catalog.cc	 |    2 +-
- qt4/src/poppler-form.cc |    1 +
+ poppler/Catalog.cc	 | 2 +-
+ qt4/src/poppler-form.cc | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 841f3bbca37015ec2c58d7b85a73cef5681294f8
@@ -13144,7 +16328,7 @@ Date:	Thu Mar 10 23:30:51 2011 +0000
 
     Do not infinite loop
 
- poppler/Form.cc |    4 ++--
+ poppler/Form.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f2fcafdc2b982d9bbed3c01bc7d45c8bd0603f19
@@ -13153,8 +16337,8 @@ Date:	Thu Mar 10 23:27:41 2011 +0000
 
     Create the globalParams before the pdfdoc
 
- qt4/src/poppler-private.cc |	 5 +----
- qt4/src/poppler-private.h  |	12 ++++++++----
+ qt4/src/poppler-private.cc |  5 +----
+ qt4/src/poppler-private.h  | 12 ++++++++----
  2 files changed, 9 insertions(+), 8 deletions(-)
 
 commit f956b03604b195623ab034a06942a39547adf905
@@ -13163,7 +16347,7 @@ Date:	Thu Mar 10 00:01:18 2011 +0000
 
     compile
 
- qt4/src/poppler-form.cc |    4 ++--
+ qt4/src/poppler-form.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f0ec3bedc5490aa35e54563019fcf2c3f8b7647d
@@ -13172,8 +16356,8 @@ Date:	Wed Mar 9 20:54:15 2011 +0100
 
     forms: Remove unused method FormWidget::updateField()
 
- poppler/Form.cc |   22 ----------------------
- poppler/Form.h  |    2 --
+ poppler/Form.cc | 22 ----------------------
+ poppler/Form.h  |  2 --
  2 files changed, 24 deletions(-)
 
 commit 93c25e100ae2564b9a866b95bed16d2fac619bd7
@@ -13186,9 +16370,9 @@ Date:	Wed Mar 9 20:49:32 2011 +0100
     And use the existing action from the AnnotWidget instead of creating a
     new one.
 
- poppler/Form.cc	 |   11 ++---------
- poppler/Form.h		 |    2 +-
- qt4/src/poppler-form.cc |    3 +--
+ poppler/Form.cc	 | 11 ++---------
+ poppler/Form.h		 |  2 +-
+ qt4/src/poppler-form.cc |  3 +--
  3 files changed, 4 insertions(+), 12 deletions(-)
 
 commit 59fb0489bfabfd8acccafdcd0361ce005664962a
@@ -13201,9 +16385,9 @@ Date:	Wed Mar 9 20:19:24 2011 +0100
     And never modify the AP entry since it breaks check and radio buttons
     that doesn't have an appearance for the Off state.
 
- poppler/Annot.cc |   79
- +++++++++---------------------------------------------
- poppler/Annot.h  |    1 -
+ poppler/Annot.cc | 79
+ ++++++++++----------------------------------------------
+ poppler/Annot.h  |  1 -
  2 files changed, 13 insertions(+), 67 deletions(-)
 
 commit f3b00ef51ceef6d9b7a1aa7e0f19249abf8ca6f3
@@ -13216,9 +16400,9 @@ Date:	Wed Mar 9 18:19:12 2011 +0100
     also the
     appearance stream corresponding to the new state.
 
- poppler/Annot.cc |   43 ++++++++++++++++++++++++++++++++++++-------
- poppler/Annot.h  |    2 ++
- poppler/Form.cc  |    7 +++----
+ poppler/Annot.cc | 43 ++++++++++++++++++++++++++++++++++++-------
+ poppler/Annot.h  |  2 ++
+ poppler/Form.cc  |  7 +++----
  3 files changed, 41 insertions(+), 11 deletions(-)
 
 commit d59561212253302d4dcb23392bb8306b8e5c68d1
@@ -13233,12 +16417,12 @@ Date:	Wed Mar 9 17:35:28 2011 +0100
     it instead
     of duplicating it.
 
- poppler/Annot.cc   |	42 +++++++++++++--------
- poppler/Annot.h    |	 2 +-
- poppler/Catalog.cc |	 2 +-
- poppler/Form.cc    |  107
- ++++++++++++++++++++++++----------------------------
- poppler/Form.h     |	23 ++++++-----
+ poppler/Annot.cc   |  42 +++++++++++++--------
+ poppler/Annot.h    |	2 +-
+ poppler/Catalog.cc |	2 +-
+ poppler/Form.cc    | 107
+ +++++++++++++++++++++++++----------------------------
+ poppler/Form.h     |  23 ++++++------
  5 files changed, 89 insertions(+), 87 deletions(-)
 
 commit 2dd7e1ba09d4501adf9d10ab4cb8ee003cace74a
@@ -13247,8 +16431,8 @@ Date:	Wed Mar 9 10:25:00 2011 +0100
 
     forms: Move modified flag from FormWidget to FormField
 
- poppler/Form.cc |   16 ++++++++--------
- poppler/Form.h  |    6 ++++--
+ poppler/Form.cc | 16 ++++++++--------
+ poppler/Form.h  |  6 ++++--
  2 files changed, 12 insertions(+), 10 deletions(-)
 
 commit b04f03be7e43e309af5f164ef71788e7b8915841
@@ -13257,9 +16441,9 @@ Date:	Wed Mar 9 10:17:57 2011 +0100
 
     forms: Move field names handling from FormWidget to FormField
 
- poppler/Form.cc |  149
- ++++++++++++++++++++++++++++++-------------------------
- poppler/Form.h  |   20 +++++---
+ poppler/Form.cc | 149
+ +++++++++++++++++++++++++++++++-------------------------
+ poppler/Form.h  |  20 +++++---
  2 files changed, 95 insertions(+), 74 deletions(-)
 
 commit abe1e0d5a37bcdb4376901306d3adccfb33ff3b4
@@ -13270,8 +16454,8 @@ Date:	Tue Mar 8 21:39:00 2011 +0100
 
     Fixes regression on ClassSchedule_2091_ENGL.pdf
 
- poppler/Annot.cc |    8 ++++++--
- poppler/Annot.h  |    2 +-
+ poppler/Annot.cc | 8 ++++++--
+ poppler/Annot.h  | 2 +-
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 14d145371e86ccb92f09b1ca750ced52171b2885
@@ -13284,9 +16468,9 @@ Date:	Tue Mar 8 20:14:57 2011 +0100
     constructors and widget stuff to form widget constructors. Clean up an
     simplify the code.
 
- poppler/Form.cc |  227
- +++++++++++++++++++++----------------------------------
- poppler/Form.h  |   21 ++---
+ poppler/Form.cc | 227
+ +++++++++++++++++++++-----------------------------------
+ poppler/Form.h  |  21 ++----
  2 files changed, 91 insertions(+), 157 deletions(-)
 
 commit 0585d7820455c93fe5b732b7a9a20d423df47075
@@ -13298,10 +16482,10 @@ Date:	Tue Mar 8 15:36:45 2011 +0100
     Rather than AnnotWidget or FormWidget, and use the form field object
     from AnnotWidget to get the values.
 
- poppler/Annot.cc |   52 ++++---
- poppler/Form.cc  |  400
- ++++++++++++++++++++++++++----------------------------
- poppler/Form.h   |   21 +--
+ poppler/Annot.cc |  52 ++++----
+ poppler/Form.cc  | 400
+ +++++++++++++++++++++++++++----------------------------
+ poppler/Form.h   |  21 +--
  3 files changed, 230 insertions(+), 243 deletions(-)
 
 commit dc100eb9080fb58164fc94c86bfb1728cecd21c3
@@ -13311,7 +16495,7 @@ Date:	Mon Mar 7 20:14:27 2011 +0100
     annots: Use the field object to get MaxLen instead of parsing the
     field dict
 
- poppler/Annot.cc |   10 ++++------
+ poppler/Annot.cc | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 commit 7149634f184dc3f07f2a70c296aac207ef24952c
@@ -13322,11 +16506,11 @@ Date:	Mon Mar 7 19:55:45 2011 +0100
 
     And use it in AnnotWidget instead of parsing the dictionary again.
 
- poppler/Annot.cc |   65
- +++++++++++++++++++++---------------------------------
- poppler/Annot.h  |   12 +++++-----
- poppler/Form.cc  |   16 ++++++++++++++
- poppler/Form.h   |    5 +++++
+ poppler/Annot.cc | 65
+ ++++++++++++++++++++++----------------------------------
+ poppler/Annot.h  | 12 +++++------
+ poppler/Form.cc  | 16 ++++++++++++++
+ poppler/Form.h   |  5 +++++
  4 files changed, 52 insertions(+), 46 deletions(-)
 
 commit 2e73f17975811177c0b3c16b8bd97c7eb912bc44
@@ -13338,9 +16522,9 @@ Date:	Mon Mar 7 18:41:48 2011 +0100
     And use them from AnnotWidget instead of parsing the field dictionary
     again.
 
- poppler/Annot.cc |   28 +++++-----------------------
- poppler/Form.cc  |   17 +++++++++++++++++
- poppler/Form.h   |    9 +++++++++
+ poppler/Annot.cc | 28 +++++-----------------------
+ poppler/Form.cc  | 17 +++++++++++++++++
+ poppler/Form.h   |  9 +++++++++
  3 files changed, 31 insertions(+), 23 deletions(-)
 
 commit 8677a34911563a712b2dcf0b6e411cee0bad9c44
@@ -13354,10 +16538,10 @@ Date:	Mon Mar 7 18:24:07 2011 +0100
     dictionary
     again.
 
- poppler/Annot.cc |   99
- ++++++++++++++++++++++++++----------------------------
- poppler/Form.cc  |   11 ++++++
- poppler/Form.h   |   12 +++++++
+ poppler/Annot.cc | 99
+ +++++++++++++++++++++++++++-----------------------------
+ poppler/Form.cc  | 11 +++++++
+ poppler/Form.h   | 12 +++++++
  3 files changed, 70 insertions(+), 52 deletions(-)
 
 commit 41420bfd88685d9b1ac44dc7444ea3abee92097c
@@ -13366,7 +16550,7 @@ Date:	Mon Mar 7 09:18:25 2011 +0100
 
     annots: Only parse the dash array for dashed borders
 
- poppler/Annot.cc |   16 +++++++++-------
+ poppler/Annot.cc | 16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 commit c198a3f83d8508ddaf84564871d9202ffba8096c
@@ -13378,8 +16562,8 @@ Date:	Sun Mar 6 17:52:01 2011 +0100
 
     Instead of parsing the field dictionary again.
 
- poppler/Annot.cc |   14 ++------------
- poppler/Annot.h  |    1 -
+ poppler/Annot.cc | 14 ++------------
+ poppler/Annot.h  |  1 -
  2 files changed, 2 insertions(+), 13 deletions(-)
 
 commit 5cf803ec181dbf1112f67b4f4a9c77b88d102e3b
@@ -13388,8 +16572,8 @@ Date:	Sun Mar 6 17:47:18 2011 +0100
 
     forms: Add FormFieldChoice::getTopIndex()
 
- poppler/Form.cc |    5 +++++
- poppler/Form.h  |    5 ++++-
+ poppler/Form.cc | 5 +++++
+ poppler/Form.h  | 5 ++++-
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 commit 1248f59e2045749ece1f5a5e579b866b8330a752
@@ -13401,7 +16585,7 @@ Date:	Sun Mar 6 17:41:33 2011 +0100
 
     Instead of parsing the appearance characteristics dictionary again
 
- poppler/Annot.cc |   23 +++++++----------------
+ poppler/Annot.cc | 23 +++++++----------------
  1 file changed, 7 insertions(+), 16 deletions(-)
 
 commit dc249ad4529997001ae1f96dcfd7351766ca8e8d
@@ -13413,9 +16597,9 @@ Date:	Sun Mar 6 17:34:33 2011 +0100
     Adding methods to render every form field type and using the field
     object when possible instead of parsing the field dictionary again.
 
- poppler/Annot.cc |  312
- +++++++++++++++++++++++-------------------------------
- poppler/Annot.h  |    8 +-
+ poppler/Annot.cc | 312
+ +++++++++++++++++++++++--------------------------------
+ poppler/Annot.h  |   8 +-
  2 files changed, 138 insertions(+), 182 deletions(-)
 
 commit f98b3540db731026e0febf1f010548f0f0ef9142
@@ -13427,9 +16611,9 @@ Date:	Sun Mar 6 15:57:22 2011 +0100
     And use the field object instead of parsing the field dictionary
     again.
 
- poppler/Annot.cc |  242
- +++++++++++++++++++++++++++---------------------------
- poppler/Annot.h  |    3 +
+ poppler/Annot.cc | 242
+ +++++++++++++++++++++++++++----------------------------
+ poppler/Annot.h  |   3 +
  2 files changed, 124 insertions(+), 121 deletions(-)
 
 commit 9854f3173f994bbe3f57d33bd1d0e045833859c2
@@ -13439,8 +16623,8 @@ Date:	Sun Mar 6 15:56:06 2011 +0100
     annots: Add AnnotColor::adjustColor() to be able to adjust an
     existing AnnotColor
 
- poppler/Annot.cc |    7 +++++++
- poppler/Annot.h  |    2 ++
+ poppler/Annot.cc | 7 +++++++
+ poppler/Annot.h  | 2 ++
  2 files changed, 9 insertions(+)
 
 commit 2bf82f27bd9c8f97e5484ea97be661f65221163d
@@ -13449,8 +16633,8 @@ Date:	Sat Mar 5 15:30:01 2011 +0100
 
     annots: Remove unused class AnnotBorderStyle
 
- poppler/Annot.cc |   22 ----------------------
- poppler/Annot.h  |   36 ------------------------------------
+ poppler/Annot.cc | 22 ----------------------
+ poppler/Annot.h  | 36 ------------------------------------
  2 files changed, 58 deletions(-)
 
 commit 128dcaf282f418d8c45cea4df6ad4d3167b3e39c
@@ -13461,9 +16645,9 @@ Date:	Sat Mar 5 13:12:49 2011 +0100
 
     The code was duplicated in AnnotBorderArray and AnnotBorderBS
 
- poppler/Annot.cc |   91
- +++++++++++++++++++-----------------------------------
- poppler/Annot.h  |    4 ++-
+ poppler/Annot.cc | 91
+ +++++++++++++++++++-------------------------------------
+ poppler/Annot.h  |  4 ++-
  2 files changed, 34 insertions(+), 61 deletions(-)
 
 commit ec2643d311e0ce55f0ff5309c0c420140d053a50
@@ -13472,30 +16656,30 @@ Date:	Tue Mar 1 19:50:55 2011 +0000
 
     fix copyright years
 
- poppler/Annot.cc			  |    2 +-
- poppler/Annot.h			  |    2 +-
- poppler/ArthurOutputDev.cc		  |    2 +-
- poppler/ArthurOutputDev.h		  |    2 +-
- poppler/FontInfo.cc			  |    1 +
- poppler/Form.cc			  |    4 ++--
- poppler/Form.h				  |    3 ++-
- poppler/GlobalParams.cc		  |    1 +
- poppler/GlobalParams.h			  |    1 +
- poppler/Link.cc			  |    2 +-
- poppler/Link.h				  |    2 +-
- poppler/OutputDev.h			  |    2 +-
- poppler/PDFDoc.cc			  |    2 +-
- poppler/Page.cc			  |    2 +-
- poppler/Page.h				  |    2 +-
- poppler/TextOutputDev.cc		  |    2 +-
- poppler/TextOutputDev.h		  |    2 +-
- qt4/src/poppler-form.cc		  |    2 +-
- qt4/src/poppler-link-extractor-private.h |    2 +-
- qt4/src/poppler-link-extractor.cc	  |    2 +-
- qt4/src/poppler-page.cc		  |    2 +-
- qt4/src/poppler-private.h		  |    2 +-
- utils/HtmlOutputDev.cc			  |    2 +-
- utils/HtmlOutputDev.h			  |    4 ++--
+ poppler/Annot.cc			  | 2 +-
+ poppler/Annot.h			  | 2 +-
+ poppler/ArthurOutputDev.cc		  | 2 +-
+ poppler/ArthurOutputDev.h		  | 2 +-
+ poppler/FontInfo.cc			  | 1 +
+ poppler/Form.cc			  | 4 ++--
+ poppler/Form.h				  | 3 ++-
+ poppler/GlobalParams.cc		  | 1 +
+ poppler/GlobalParams.h			  | 1 +
+ poppler/Link.cc			  | 2 +-
+ poppler/Link.h				  | 2 +-
+ poppler/OutputDev.h			  | 2 +-
+ poppler/PDFDoc.cc			  | 2 +-
+ poppler/Page.cc			  | 2 +-
+ poppler/Page.h				  | 2 +-
+ poppler/TextOutputDev.cc		  | 2 +-
+ poppler/TextOutputDev.h		  | 2 +-
+ qt4/src/poppler-form.cc		  | 2 +-
+ qt4/src/poppler-link-extractor-private.h | 2 +-
+ qt4/src/poppler-link-extractor.cc	  | 2 +-
+ qt4/src/poppler-page.cc		  | 2 +-
+ qt4/src/poppler-private.h		  | 2 +-
+ utils/HtmlOutputDev.cc			  | 2 +-
+ utils/HtmlOutputDev.h			  | 4 ++--
  24 files changed, 27 insertions(+), 23 deletions(-)
 
 commit 900974ebfbe6ab7ae21ed151ff79f9578d2bdae2
@@ -13504,8 +16688,8 @@ Date:	Tue Mar 1 19:42:22 2011 +0000
 
     Fix years
 
- poppler/poppler-config.h.cmake |    2 +-
- poppler/poppler-config.h.in	|    2 +-
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit c804db4d8261274b013f8c340abfc921c77bb3cf
@@ -13517,8 +16701,8 @@ Date:	Tue Mar 1 19:22:31 2011 +0100
     this avoids a dependency on the fontconfig headers to the users of
     the core
 
- poppler/GlobalParams.cc |    4 ++++
- poppler/GlobalParams.h  |    3 ---
+ poppler/GlobalParams.cc | 4 ++++
+ poppler/GlobalParams.h  | 3 ---
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit 2d77c7f9c41f1121354413bcdc3beded35a247f9
@@ -13527,8 +16711,8 @@ Date:	Tue Mar 1 16:51:04 2011 +0100
 
     create the GooString on stack, not in heap
 
- poppler/Annot.cc |    5 ++---
- poppler/Form.cc  |    5 ++---
+ poppler/Annot.cc | 5 ++---
+ poppler/Form.cc  | 5 ++---
  2 files changed, 4 insertions(+), 6 deletions(-)
 
 commit 5dc2ef0e27ac48c81739cdfe8e8070ebbc410c87
@@ -13541,8 +16725,8 @@ Date:	Tue Mar 1 16:39:36 2011 +0100
     other than reducing few GooString allocations, strcmp should be much
     faster than GooString::cmp
 
- poppler/Annot.cc |  128
- ++++++++++++++++++++++++------------------------------
+ poppler/Annot.cc | 128
+ ++++++++++++++++++++++++-------------------------------
  1 file changed, 56 insertions(+), 72 deletions(-)
 
 commit 535e48ab764ee4e377451ddd032044b51b842c4a
@@ -13554,7 +16738,7 @@ Date:	Tue Mar 1 16:07:34 2011 +0100
     they usually are forms or something else we do not support, so do
     not complain about them for now
 
- qt4/src/poppler-page.cc |    4 +++-
+ qt4/src/poppler-page.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit f0e5c36e7f1c5d0f0f51e3a6a6acd6c423f86df7
@@ -13567,7 +16751,7 @@ Date:	Tue Mar 1 16:02:54 2011 +0100
     other than reducing few GooString allocations, strcmp should be much
     faster than GooString::cmp
 
- poppler/Annot.cc |   54
+ poppler/Annot.cc | 54
  ++++++++++++++++++++++++++----------------------------
  1 file changed, 26 insertions(+), 28 deletions(-)
 
@@ -13583,7 +16767,7 @@ Date:	Tue Mar 1 15:35:45 2011 +0100
     increase the annot refcount), but always decrement the refcount
     (so valid annotation will have it at 1, while invalid will be deleted)
 
- poppler/Annot.cc |    8 ++++++--
+ poppler/Annot.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 664865a2ddca9c20ac36a41aef52ebf12eab838d
@@ -13600,32 +16784,32 @@ Date:	Tue Mar 1 10:56:40 2011 +0100
     Link and frontends APIs are not affected.
     Qt4 changes made by Pino Toscano.
 
- glib/poppler-document.cc		  |    2 +-
- glib/poppler-page.cc			  |   29 ++++---
- glib/poppler-private.h			  |    1 -
- poppler/Annot.cc			  |   79 ++++++++++++-------
- poppler/Annot.h			  |   24 ++++--
- poppler/ArthurOutputDev.cc		  |    4 -
- poppler/ArthurOutputDev.h		  |    3 -
- poppler/CairoOutputDev.cc		  |    3 -
- poppler/CairoOutputDev.h		  |    6 --
- poppler/FontInfo.cc			  |    4 +-
- poppler/Form.cc			  |   36 ++++-----
- poppler/Form.h				  |    5 +-
- poppler/Link.cc			  |  124
- +++++-------------------------
- poppler/Link.h				  |   43 ++---------
- poppler/OutputDev.h			  |    4 +-
- poppler/PDFDoc.cc			  |    4 +-
- poppler/Page.cc			  |   63 +++++++--------
- poppler/Page.h				  |   11 +--
- poppler/TextOutputDev.cc		  |    9 ++-
- poppler/TextOutputDev.h		  |   10 +--
- qt4/src/poppler-link-extractor-private.h |    2 +-
- qt4/src/poppler-link-extractor.cc	  |    3 +-
- qt4/src/poppler-page.cc		  |   12 ++-
- utils/HtmlOutputDev.cc			  |    7 +-
- utils/HtmlOutputDev.h			  |    4 +-
+ glib/poppler-document.cc		  |   2 +-
+ glib/poppler-page.cc			  |  29 ++++----
+ glib/poppler-private.h			  |   1 -
+ poppler/Annot.cc			  |  79 +++++++++++++-------
+ poppler/Annot.h			  |  24 ++++--
+ poppler/ArthurOutputDev.cc		  |   4 -
+ poppler/ArthurOutputDev.h		  |   3 -
+ poppler/CairoOutputDev.cc		  |   3 -
+ poppler/CairoOutputDev.h		  |   6 --
+ poppler/FontInfo.cc			  |   4 +-
+ poppler/Form.cc			  |  36 ++++-----
+ poppler/Form.h				  |   5 +-
+ poppler/Link.cc			  | 124
+ +++++--------------------------
+ poppler/Link.h				  |  43 ++---------
+ poppler/OutputDev.h			  |   4 +-
+ poppler/PDFDoc.cc			  |   4 +-
+ poppler/Page.cc			  |  63 ++++++++--------
+ poppler/Page.h				  |  11 +--
+ poppler/TextOutputDev.cc		  |   9 ++-
+ poppler/TextOutputDev.h		  |  10 +--
+ qt4/src/poppler-link-extractor-private.h |   2 +-
+ qt4/src/poppler-link-extractor.cc	  |   3 +-
+ qt4/src/poppler-page.cc		  |  12 ++-
+ utils/HtmlOutputDev.cc			  |   7 +-
+ utils/HtmlOutputDev.h			  |   4 +-
  25 files changed, 188 insertions(+), 304 deletions(-)
 
 commit 1f6573e949aaba0eb0a4c2f9cd73d7ad45ba67be
@@ -13639,7 +16823,7 @@ Date:	Sun Feb 27 21:53:32 2011 +0100
     - fix UTF-8 character
     - fix hypens used as minus
 
- utils/pdftohtml.1 |   18 +++++++++---------
+ utils/pdftohtml.1 | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit e927384897595f1bda5f7e41b552602f9cc8ed95
@@ -13653,7 +16837,7 @@ Date:	Sun Feb 27 16:39:59 2011 +0100
     characteristics dictionary,
     and use the normal caption of that
 
- qt4/src/poppler-form.cc |   25 +++++++++++++++++++++++--
+ qt4/src/poppler-form.cc | 25 +++++++++++++++++++++++--
  1 file changed, 23 insertions(+), 2 deletions(-)
 
 commit 5b24ee2c934feea1b7d46c8ec423d1c547258be2
@@ -13662,7 +16846,7 @@ Date:	Sun Feb 27 16:24:22 2011 +0100
 
     annots: 'CA', 'RC' and 'AC' are strings, not names
 
- poppler/Annot.cc |   12 ++++++------
+ poppler/Annot.cc | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit e64f6cb23e9a564b3f80daea9abcfe8bb29189eb
@@ -13675,9 +16859,9 @@ Date:	Sun Feb 27 15:22:32 2011 +0100
     this way it is easier to check for a numm onStr, without the risk
     of dereferencing a NULL pointer
 
- poppler/Form.cc	 |    6 +++---
- poppler/Form.h		 |    2 +-
- qt4/src/poppler-form.cc |    7 ++-----
+ poppler/Form.cc	 | 6 +++---
+ poppler/Form.h		 | 2 +-
+ qt4/src/poppler-form.cc | 7 ++-----
  3 files changed, 6 insertions(+), 9 deletions(-)
 
 commit f9c978fc2ab8a1f901f2136ae95deb9d41076155
@@ -13686,7 +16870,7 @@ Date:	Sun Feb 27 14:39:52 2011 +0100
 
     [qt4] directly use the dict
 
- qt4/src/poppler-form.cc |    6 +++---
+ qt4/src/poppler-form.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 071966e48577c515b17a424baeae85ae4fc80a20
@@ -13695,8 +16879,8 @@ Date:	Sun Feb 27 14:21:11 2011 +0100
 
     [qt4] move textAlignment() as a private function
 
- qt4/src/poppler-form.cc   |   33 +++++++++++++++++++++++++++++++--
- qt4/src/poppler-private.h |   25 -------------------------
+ qt4/src/poppler-form.cc   | 33 +++++++++++++++++++++++++++++++--
+ qt4/src/poppler-private.h | 25 -------------------------
  2 files changed, 31 insertions(+), 27 deletions(-)
 
 commit adc236771f11eeb4197064747836e8ed3fbfeba9
@@ -13707,7 +16891,7 @@ Date:	Sun Feb 27 14:13:50 2011 +0100
 
     ... instead of read the value on our own
 
- qt4/src/poppler-form.cc |    9 ++-------
+ qt4/src/poppler-form.cc | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 commit 9f111483cf6196dedf3cee380c3e5224776203ea
@@ -13716,8 +16900,8 @@ Date:	Sun Feb 27 14:12:16 2011 +0100
 
     forms: read the TU field as alternateUiName
 
- poppler/Form.cc |    8 ++++++++
- poppler/Form.h  |    2 ++
+ poppler/Form.cc | 8 ++++++++
+ poppler/Form.h  | 2 ++
  2 files changed, 10 insertions(+)
 
 commit cfaadaa9e4a857fcea3b5a2cadacd352de6c469d
@@ -13728,7 +16912,7 @@ Date:	Sun Feb 27 14:07:35 2011 +0100
 
     ... instead of read the value on our own
 
- qt4/src/poppler-form.cc |    9 ++-------
+ qt4/src/poppler-form.cc | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 commit 2478896a0c1f6e5842f3d8b172e4cc7e6bd58cd8
@@ -13737,7 +16921,7 @@ Date:	Sun Feb 27 13:24:09 2011 +0100
 
     [qt4] use the new FormWidget::createActivationAction()
 
- qt4/src/poppler-form.cc |   13 +++----------
+ qt4/src/poppler-form.cc | 13 +++----------
  1 file changed, 3 insertions(+), 10 deletions(-)
 
 commit 1dcb683a5c2dd6a1de654e90a4394f65d63dc296
@@ -13748,8 +16932,8 @@ Date:	Sun Feb 27 13:22:48 2011 +0100
 
     used to get and create a new activation action object of a form widget
 
- poppler/Form.cc |   12 ++++++++++++
- poppler/Form.h  |    3 +++
+ poppler/Form.cc | 12 ++++++++++++
+ poppler/Form.h  |  3 +++
  2 files changed, 15 insertions(+)
 
 commit bd4cc73e438a7d4d4a10c50c69e65b5bdc63ddf2
@@ -13758,11 +16942,11 @@ Date:	Sun Feb 27 11:04:45 2011 +0000
 
     Some more missing copyrights
 
- poppler/CairoOutputDev.cc |	2 +-
- poppler/CairoOutputDev.h  |	2 +-
- poppler/Gfx.cc		   |	2 +-
- poppler/OutputDev.h	   |	2 +-
- poppler/TextOutputDev.cc  |	1 +
+ poppler/CairoOutputDev.cc | 2 +-
+ poppler/CairoOutputDev.h  | 2 +-
+ poppler/Gfx.cc		   | 2 +-
+ poppler/OutputDev.h	   | 2 +-
+ poppler/TextOutputDev.cc  | 1 +
  5 files changed, 5 insertions(+), 4 deletions(-)
 
 commit 6c2ed4781d8ecfffdf24e1459aafd554b3527686
@@ -13771,8 +16955,8 @@ Date:	Sun Feb 27 10:55:22 2011 +0000
 
     Add 2011 years
 
- poppler/Annot.cc	    |	 2 +-
- poppler/CairoFontEngine.cc |	 2 +-
+ poppler/Annot.cc	    | 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit b297fb9de0779ac84d5b7ef68c792afefe598320
@@ -13783,7 +16967,7 @@ Date:	Sun Feb 27 01:48:55 2011 +0000
 
     Faster, bug 34005
 
- splash/Splash.cc |   21 +++++++++++----------
+ splash/Splash.cc | 21 +++++++++++----------
  1 file changed, 11 insertions(+), 10 deletions(-)
 
 commit de77e26759f1c33698abe248ad29b75c329a043c
@@ -13795,7 +16979,7 @@ Date:	Sun Feb 27 01:39:23 2011 +0000
     Has to be 3 and not nComps since it's a output buffer, a the input one
     Bug 34357
 
- poppler/GfxState.cc |	  2 +-
+ poppler/GfxState.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4f82a2e08cb2c930956c6b38030fa7b015a0de5a
@@ -13804,8 +16988,8 @@ Date:	Sun Feb 27 01:38:33 2011 +0000
 
     Implement GfxDeviceCMYKColorSpace::getRGBLine
 
- poppler/GfxState.cc |	 22 +++++++++++++++++++++-
- poppler/GfxState.h  |	 12 +++++++++++-
+ poppler/GfxState.cc | 22 +++++++++++++++++++++-
+ poppler/GfxState.h  | 12 +++++++++++-
  2 files changed, 32 insertions(+), 2 deletions(-)
 
 commit 4980b99214281dcab8f82b5b618aadc24de371f4
@@ -13816,7 +17000,7 @@ Date:	Sat Feb 26 14:00:33 2011 +0100
 
     Fixes https://bugzilla.gnome.org/show_bug.cgi?id=643028
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e6ae0f8609cd66e9e124af59adefdff9d610dcd4
@@ -13827,7 +17011,7 @@ Date:	Sat Feb 26 13:23:47 2011 +0100
 
     Fixes https://bugzilla.gnome.org/show_bug.cgi?id=643273
 
- poppler/CairoFontEngine.cc |	 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 22eb01d305ea2560d26417ca8df9c0465d4e9a82
@@ -13836,8 +17020,8 @@ Date:	Sat Feb 26 12:17:49 2011 +0100
 
     cairo: Fix a crash when rendering a document with inline images
 
- poppler/CairoOutputDev.cc |   28 ++++++++++++++++------------
- poppler/CairoOutputDev.h  |	2 +-
+ poppler/CairoOutputDev.cc | 28 ++++++++++++++++------------
+ poppler/CairoOutputDev.h  |  2 +-
  2 files changed, 17 insertions(+), 13 deletions(-)
 
 commit a6599dd1fda37186b876b5b2de80be1731dd5946
@@ -13846,10 +17030,10 @@ Date:	Sat Feb 26 11:59:03 2011 +0100
 
     glib: Add some more introspection annotations
 
- glib/poppler-attachment.cc |	 2 +-
- glib/poppler-document.cc   |	 4 ++--
- glib/poppler-media.cc	    |	 2 +-
- glib/poppler-page.cc	    |	 6 +++---
+ glib/poppler-attachment.cc | 2 +-
+ glib/poppler-document.cc   | 4 ++--
+ glib/poppler-media.cc	    | 2 +-
+ glib/poppler-page.cc	    | 6 +++---
  4 files changed, 7 insertions(+), 7 deletions(-)
 
 commit 89c66f236c85ac5a53ae12b01cdebc30e27b78d3
@@ -13858,7 +17042,7 @@ Date:	Sat Feb 26 11:39:58 2011 +0100
 
     glib: Add missing "out" annotation to poppler_page_get_size()
 
- glib/poppler-page.cc |    4 ++--
+ glib/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7a68199b342eb3f33733f7d7446ede8f94130fba
@@ -13869,8 +17053,8 @@ Date:	Sat Feb 26 11:09:27 2011 +0100
 
     Cairo API has changed in 1.11.3.
 
- poppler/CairoOutputDev.cc |	4 ++--
- poppler/CairoOutputDev.h  |	4 ++--
+ poppler/CairoOutputDev.cc | 4 ++--
+ poppler/CairoOutputDev.h  | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 97e7ab1a4eea2160f3f0847d10f6c16f2d66ef11
@@ -13881,7 +17065,7 @@ Date:	Fri Feb 25 20:33:39 2011 +0000
 
     Fixes rendering bug at 34602
 
- splash/SplashFTFont.cc |    5 ++++-
+ splash/SplashFTFont.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 3590a2d38082fc705040cdb31bf0b22ff12dd3e4
@@ -13892,7 +17076,7 @@ Date:	Thu Feb 24 18:47:35 2011 +0000
 
     More info in bug 34522
 
- poppler/GfxFont.cc |	 3 ++-
+ poppler/GfxFont.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 384753f1f9f780687bdead99a6548ef8598b898a
@@ -13903,7 +17087,7 @@ Date:	Mon Feb 21 19:19:48 2011 +0000
 
     Bug 34512
 
- goo/GooString.cc |    4 ++--
+ goo/GooString.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d775420c3c6cb5a29ff74712d3fc210fcb4b4627
@@ -13912,7 +17096,7 @@ Date:	Sat Feb 19 11:19:57 2011 +0000
 
     Do not delete textOut twice when using -bbox
 
- utils/pdftotext.cc |	 3 +--
+ utils/pdftotext.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit e1a56d73b066e7152ccf6ccf36206def7956cb00
@@ -13936,15 +17120,15 @@ Date:	Wed Feb 16 00:06:45 2011 +0000
     Followup Bug 32349 & Poppler: More shading fun ;-)
     thread for more info
 
- poppler/Function.cc	    |  122 +--------
- poppler/Function.h	    |	 3 +-
- poppler/GfxState.cc	    |  634
- +++++++++++++++++++++++++++++++++++++++-----
- poppler/GfxState.h	    |	90 +++++--
- poppler/SplashOutputDev.cc |  253 +++++++++++++++---
- poppler/SplashOutputDev.h  |	67 ++++-
- splash/Splash.cc	    |  126 ++++++---
- splash/SplashPattern.h     |	 7 +-
+ poppler/Function.cc	    | 122 +--------
+ poppler/Function.h	    |	3 +-
+ poppler/GfxState.cc	    | 634
+ +++++++++++++++++++++++++++++++++++++++------
+ poppler/GfxState.h	    |  90 +++++--
+ poppler/SplashOutputDev.cc | 253 +++++++++++++++---
+ poppler/SplashOutputDev.h  |  67 ++++-
+ splash/Splash.cc	    | 126 ++++++---
+ splash/SplashPattern.h     |	7 +-
  8 files changed, 1006 insertions(+), 296 deletions(-)
 
 commit 675b3505f963a0110dac7f865654232cbb865ef5
@@ -13955,12 +17139,12 @@ Date:	Sun Feb 13 16:21:52 2011 +0100
 
     With a command line option to use cairo or splash backends.
 
- test/CMakeLists.txt	 |   20 +--
- test/Makefile.am	 |   29 ++--
- test/gtk-cairo-test.cc  |  190 -----------------------
- test/gtk-splash-test.cc |  311 -------------------------------------
- test/gtk-test.cc	 |  397
- +++++++++++++++++++++++++++++++++++++++++++++++
+ test/CMakeLists.txt	 |  20 +--
+ test/Makefile.am	 |  29 ++--
+ test/gtk-cairo-test.cc  | 190 -----------------------
+ test/gtk-splash-test.cc | 311 -------------------------------------
+ test/gtk-test.cc	 | 397
+ ++++++++++++++++++++++++++++++++++++++++++++++++
  5 files changed, 412 insertions(+), 535 deletions(-)
 
 commit 728c022cdc1ea12aa54077d44276f9d7714930d4
@@ -13971,7 +17155,7 @@ Date:	Sun Feb 13 13:25:51 2011 +0100
 
     followup of d82f98a274bfa008c218e265a080c4af7ce95131
 
- Makefile.am |	  3 ---
+ Makefile.am | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 15e5b3f16015361754fdc14da4a0dde5af887568
@@ -13982,11 +17166,11 @@ Date:	Sun Feb 13 13:23:06 2011 +0100
 
     followup of 149b7fec472beda9d1538e0f26607c9498d504c2
 
- Makefile.am			     |	  1 -
- cmake/modules/FindGDK.cmake	     |	 22 ----------------------
- config.h.cmake			     |	  3 ---
- glib/reference/Makefile.am	     |	  1 -
- glib/reference/poppler-sections.txt |	  1 -
+ Makefile.am			     |	1 -
+ cmake/modules/FindGDK.cmake	     | 22 ----------------------
+ config.h.cmake			     |	3 ---
+ glib/reference/Makefile.am	     |	1 -
+ glib/reference/poppler-sections.txt |	1 -
  5 files changed, 28 deletions(-)
 
 commit 50aa15a0bd7100fc9b9243de1d6e6f4b59df1488
@@ -13997,7 +17181,7 @@ Date:	Sun Feb 13 13:07:19 2011 +0100
 
     followup of 149b7fec472beda9d1538e0f26607c9498d504c2
 
- glib/poppler-features.h.cmake |    1 -
+ glib/poppler-features.h.cmake | 1 -
  1 file changed, 1 deletion(-)
 
 commit f410cd11268254b9d0422201c9860d775f73fdd8
@@ -14006,7 +17190,7 @@ Date:	Sun Feb 13 12:55:37 2011 +0100
 
     gtk-splash-test: Don't use GDK deprecated API
 
- test/gtk-splash-test.cc |   28 +++++++++++++++-------------
+ test/gtk-splash-test.cc | 28 +++++++++++++++-------------
  1 file changed, 15 insertions(+), 13 deletions(-)
 
 commit a0568e449061d6b6af5485e340cd6f9d3e54ef7c
@@ -14015,9 +17199,9 @@ Date:	Sun Feb 13 12:27:22 2011 +0100
 
     glib: remove gdk referenes from pkg-config files
 
- poppler-glib-uninstalled.pc.in |    2 +-
- poppler-glib.pc.cmake		|    2 +-
- poppler-glib.pc.in		|    2 +-
+ poppler-glib-uninstalled.pc.in | 2 +-
+ poppler-glib.pc.cmake		| 2 +-
+ poppler-glib.pc.in		| 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 149b7fec472beda9d1538e0f26607c9498d504c2
@@ -14029,14 +17213,14 @@ Date:	Sun Feb 13 11:51:57 2011 +0100
     It removes the GDK dependency so that poppler-glib now only depends on
     glib and cairo.
 
- CMakeLists.txt		    |	 9 --
- configure.ac		    |	44 +------
- glib/CMakeLists.txt	    |	14 +--
- glib/Makefile.am	    |	 8 +-
- glib/poppler-features.h.in |	 6 -
- glib/poppler-page.cc	    |  296
- --------------------------------------------
- glib/poppler-page.h	    |	34 -----
+ CMakeLists.txt		    |	9 --
+ configure.ac		    |  44 +------
+ glib/CMakeLists.txt	    |  14 +--
+ glib/Makefile.am	    |	8 +-
+ glib/poppler-features.h.in |	6 -
+ glib/poppler-page.cc	    | 296
+ ---------------------------------------------
+ glib/poppler-page.h	    |  34 ------
  7 files changed, 4 insertions(+), 407 deletions(-)
 
 commit a5482d64472a81206dd8d0c5bb80007f6d5bb893
@@ -14046,10 +17230,10 @@ Date:	Sun Feb 13 11:40:23 2011 +0100
     glib: Remove test-poppler-glib, poppler-glib-demo does the same
     and more
 
- glib/CMakeLists.txt	   |	8 -
- glib/Makefile.am	   |   14 -
- glib/test-poppler-glib.cc |  657
- ---------------------------------------------
+ glib/CMakeLists.txt	   |   8 -
+ glib/Makefile.am	   |  14 -
+ glib/test-poppler-glib.cc | 657
+ ----------------------------------------------
  3 files changed, 679 deletions(-)
 
 commit cab0cf028a192772dcb5c3f4aefa0a421e73e9e7
@@ -14058,7 +17242,7 @@ Date:	Fri Feb 11 19:42:34 2011 +0000
 
     Do not infinite loop in some broken files
 
- poppler/JBIG2Stream.cc |    3 ++-
+ poppler/JBIG2Stream.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 1125cc8ccf386d8e0a0679aa73614bc2cb8037b0
@@ -14069,11 +17253,11 @@ Date:	Tue Feb 8 20:27:16 2011 +0000
 
     More info at bug 34001
 
- poppler/GlobalParams.cc |   15 +++++++++++++++
- poppler/GlobalParams.h  |    3 +++
- poppler/PSOutputDev.cc  |    7 ++++++-
- utils/pdftops.1	 |    6 ++++++
- utils/pdftops.cc	 |    6 ++++++
+ poppler/GlobalParams.cc | 15 +++++++++++++++
+ poppler/GlobalParams.h  |  3 +++
+ poppler/PSOutputDev.cc  |  7 ++++++-
+ utils/pdftops.1	 |  6 ++++++
+ utils/pdftops.cc	 |  6 ++++++
  5 files changed, 36 insertions(+), 1 deletion(-)
 
 commit 96e169b0eca31891f3cd564365d4a2a5c6e2a2c0
@@ -14085,9 +17269,9 @@ Date:	Tue Feb 8 19:58:31 2011 +0000
     It might happen you are extremely unlucky and get the same
     globalParams after a new delete/creation
 
- qt4/src/poppler-private.cc |	51
- ++++++++++++++++++++++++++++++++++++++------
- qt4/src/poppler-private.h  |	34 +++--------------------------
+ qt4/src/poppler-private.cc | 51
+ +++++++++++++++++++++++++++++++++++++++-------
+ qt4/src/poppler-private.h  | 34 +++----------------------------
  2 files changed, 47 insertions(+), 38 deletions(-)
 
 commit c3470145f95791167c19a438934a923eab8a93cf
@@ -14098,12 +17282,12 @@ Date:	Tue Feb 8 19:54:48 2011 +0000
 
     More info at bug 34003
 
- poppler/GlobalParams.cc |   18 +++-
- poppler/GlobalParams.h  |    5 +-
- poppler/PSOutputDev.cc  |  227
- ++++++++++++++++++++++++++++++++++-------------
- utils/pdftops.1	 |    7 ++
- utils/pdftops.cc	 |    8 +-
+ poppler/GlobalParams.cc |  18 +++-
+ poppler/GlobalParams.h  |   5 +-
+ poppler/PSOutputDev.cc  | 227
+ ++++++++++++++++++++++++++++++++++--------------
+ utils/pdftops.1	 |   7 ++
+ utils/pdftops.cc	 |   8 +-
  5 files changed, 198 insertions(+), 67 deletions(-)
 
 commit 37077aa475d2dee81f87daa05297b201eeb99c87
@@ -14116,7 +17300,7 @@ Date:	Mon Feb 7 19:48:28 2011 +0000
     depending on
     the resolution you render it
 
- poppler/SplashOutputDev.cc |	10 +++++-----
+ poppler/SplashOutputDev.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 5aa854f70c8f563efe56dafa8bd6b3cdd5c95451
@@ -14130,8 +17314,8 @@ Date:	Sun Feb 6 13:24:35 2011 +0100
     with the same mime data. This reduces the size of the output file when
     printing.
 
- poppler/CairoOutputDev.cc |   18 ++++++++++++++++--
- poppler/CairoOutputDev.h  |	2 +-
+ poppler/CairoOutputDev.cc | 18 ++++++++++++++++--
+ poppler/CairoOutputDev.h  |  2 +-
  2 files changed, 17 insertions(+), 3 deletions(-)
 
 commit fe7b8aa4fc78aacf3226d019db74146ceaebd63c
@@ -14142,9 +17326,9 @@ Date:	Wed Feb 2 22:35:40 2011 +0000
 
     See bug 31926 for more info
 
- poppler/PSOutputDev.cc      |	  2 +-
- poppler/PreScanOutputDev.cc |	  7 +++++++
- poppler/PreScanOutputDev.h  |	  7 +++++++
+ poppler/PSOutputDev.cc      | 2 +-
+ poppler/PreScanOutputDev.cc | 7 +++++++
+ poppler/PreScanOutputDev.h  | 7 +++++++
  3 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 5984ad081cd609f3146e0da5e22097ef073eb519
@@ -14155,8 +17339,8 @@ Date:	Sun Jan 30 17:02:02 2011 +0000
 
     Fixes some issues with pdf from bug 27482
 
- poppler/PSOutputDev.cc |  200
- ++++++++++++++++++++++++------------------------
+ poppler/PSOutputDev.cc | 200
+ ++++++++++++++++++++++++-------------------------
  1 file changed, 100 insertions(+), 100 deletions(-)
 
 commit c60d5afbeb986c1b335357202c5f551a3c146a76
@@ -14168,7 +17352,7 @@ Date:	Mon Jan 24 15:51:20 2011 +0100
     * text.c (pgd_text_get_text): Before this change, when
     poppler_page_get_text returned NULL, we'd use "n_recs" uninitialized.
 
- glib/demo/text.c |    1 +
+ glib/demo/text.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit a3bdc56e2f086444419eddfcda5d2010a9a6b5c0
@@ -14181,8 +17365,8 @@ Date:	Sat Jan 29 11:23:33 2011 +0100
     poppler_page_get_text() matches
     the list of rectangles returned by poppler_page_get_text_layout().
 
- glib/demo/text.c |   60
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/text.c | 60
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 60 insertions(+)
 
 commit bf2d86c8db430595fb3c55edd3f6c8d289bdaeb5
@@ -14193,7 +17377,7 @@ Date:	Fri Jan 28 20:34:08 2011 +0000
 
     Fixes KDE bug 264667
 
- qt4/src/poppler-private.cc |	 6 ++++--
+ qt4/src/poppler-private.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit e6fb20d7b3bf8ea8aedc1bcd910e035059835b5f
@@ -14205,8 +17389,8 @@ Date:	Fri Jan 28 19:20:15 2011 +0000
     See "[poppler] text extraction does not work" in the mailing list
     for more info
 
- poppler/GfxFont.cc |	14 +++++++++++++-
- poppler/GfxFont.h  |	 2 ++
+ poppler/GfxFont.cc | 14 +++++++++++++-
+ poppler/GfxFont.h  |  2 ++
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 4829d36a3b005585db8c8115f7ee81a4e2384780
@@ -14221,7 +17405,7 @@ Date:	Wed Jan 26 22:59:49 2011 +0000
     disregard the page range for all preceding prefixes that do not
     match the given prefix.
 
- poppler/PageLabelInfo.cc |    7 +++----
+ poppler/PageLabelInfo.cc | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit e57c75fbd95ef8399b0785500f6893465bc808c3
@@ -14232,11 +17416,11 @@ Date:	Mon Jan 24 19:48:09 2011 +1030
 
     Fixes bugs #19076 and #32791.
 
- poppler/CairoOutputDev.cc |  139
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |   12 ++++
- poppler/Gfx.cc		   |   10 +++-
- poppler/OutputDev.h	   |	2 +
+ poppler/CairoOutputDev.cc | 139
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  |  12 ++++
+ poppler/Gfx.cc		   |  10 +++-
+ poppler/OutputDev.h	   |   2 +
  4 files changed, 161 insertions(+), 2 deletions(-)
 
 commit 5081356fcc69012e9df95dbf1e3c36e7c1e751c4
@@ -14245,7 +17429,7 @@ Date:	Tue Jan 25 20:26:25 2011 +0000
 
     Fix leak in SplashOutputDev::axialShadedFill
 
- poppler/SplashOutputDev.cc |	 3 ++-
+ poppler/SplashOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 19dc283c3af597deab297341a37495c06988948b
@@ -14254,7 +17438,7 @@ Date:	Mon Jan 24 19:05:08 2011 +0000
 
     Include zlib header since we use things defined there
 
- goo/PNGWriter.cc |    3 +++
+ goo/PNGWriter.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 5056e33e01ce0f7db1a5401b7b38d30e84eedf69
@@ -14270,7 +17454,7 @@ Date:	Mon Jan 17 13:07:22 2011 +0800
     This fix neglect the Y vaules to make sure that the words
     also displayed when line is selected.
 
- poppler/TextOutputDev.cc |   16 ++++++++--------
+ poppler/TextOutputDev.cc | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 commit 88812e716c1a0c87a504118d47eb4cc6f52962fa
@@ -14279,8 +17463,8 @@ Date:	Fri Jan 21 23:33:47 2011 +0000
 
     Add Hinting API to ArthurOutputDev
 
- poppler/ArthurOutputDev.cc |	11 +++++++++--
- poppler/ArthurOutputDev.h  |	15 ++++++++++++++-
+ poppler/ArthurOutputDev.cc | 11 +++++++++--
+ poppler/ArthurOutputDev.h  | 15 ++++++++++++++-
  2 files changed, 23 insertions(+), 3 deletions(-)
 
 commit dc5ec4668bdfe3b6ba41f0a2e551bbc07f8839ba
@@ -14289,17 +17473,17 @@ Date:	Fri Jan 21 23:32:50 2011 +0000
 
     support slight hinting in Splash backend
 
- cpp/poppler-page-renderer.cpp |    2 +-
- poppler/SplashOutputDev.cc    |    6 +++++-
- poppler/SplashOutputDev.h     |    4 +++-
- qt4/src/poppler-private.h     |    3 ++-
- qt4/src/poppler-qt4.h	       |    4 +++-
- splash/SplashFTFont.cc        |   27 ++++++++++++++++++---------
- splash/SplashFTFont.h	       |    2 ++
- splash/SplashFTFontEngine.cc  |   10 +++++++---
- splash/SplashFTFontEngine.h   |    6 ++++--
- splash/SplashFontEngine.cc    |    4 +++-
- splash/SplashFontEngine.h     |    2 ++
+ cpp/poppler-page-renderer.cpp |  2 +-
+ poppler/SplashOutputDev.cc    |  6 +++++-
+ poppler/SplashOutputDev.h     |  4 +++-
+ qt4/src/poppler-private.h     |  3 ++-
+ qt4/src/poppler-qt4.h	       |  4 +++-
+ splash/SplashFTFont.cc        | 27 ++++++++++++++++++---------
+ splash/SplashFTFont.h	       |  2 ++
+ splash/SplashFTFontEngine.cc  | 10 +++++++---
+ splash/SplashFTFontEngine.h   |  6 ++++--
+ splash/SplashFontEngine.cc    |  4 +++-
+ splash/SplashFontEngine.h     |  2 ++
  11 files changed, 50 insertions(+), 20 deletions(-)
 
 commit 0c5b1bef9f3f98001cee20061b1eaf20b965c5a9
@@ -14310,9 +17494,9 @@ Date:	Fri Jan 21 19:01:45 2011 +0000
 
     Also some speed improvemensts. Bug #32365
 
- poppler/PSOutputDev.cc |  207
- +++++++++++++++++++++++++++++++++++++-----------
- poppler/PSOutputDev.h	|   13 ++-
+ poppler/PSOutputDev.cc | 207
+ ++++++++++++++++++++++++++++++++++++++-----------
+ poppler/PSOutputDev.h	|  13 +++-
  2 files changed, 170 insertions(+), 50 deletions(-)
 
 commit 6cb8965fb8bce6da2a4460e86f592c1ea3a84a5c
@@ -14321,10 +17505,10 @@ Date:	Fri Jan 21 18:43:21 2011 +0000
 
     fix (C) years
 
- poppler/CairoOutputDev.cc   |	  2 +-
- poppler/CairoOutputDev.h    |	  2 +-
- qt4/src/poppler-private.cc  |	  2 +-
- qt4/tests/check_strings.cpp |	  2 +-
+ poppler/CairoOutputDev.cc   | 2 +-
+ poppler/CairoOutputDev.h    | 2 +-
+ qt4/src/poppler-private.cc  | 2 +-
+ qt4/tests/check_strings.cpp | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 24f9c8924b2135da616386d0fa691fe790b4e7a4
@@ -14335,7 +17519,7 @@ Date:	Fri Jan 21 08:43:34 2011 +0000
 
     Fixes asert on bug 33063
 
- poppler/Annot.cc |    4 ++--
+ poppler/Annot.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 07a8808c22445c421f3064da7e5227dcbf40358b
@@ -14350,8 +17534,8 @@ Date:	Mon Jan 17 21:34:23 2011 +0100
 
     Add a couple of testcases for it.
 
- qt4/src/poppler-private.cc  |	 30 ++++++++++++++++++++++++------
- qt4/tests/check_strings.cpp |	 21 +++++++++++++++++++++
+ qt4/src/poppler-private.cc  | 30 ++++++++++++++++++++++++------
+ qt4/tests/check_strings.cpp | 21 +++++++++++++++++++++
  2 files changed, 45 insertions(+), 6 deletions(-)
 
 commit ed367c08d788c88c49de770019bf826cfebb3e2c
@@ -14360,7 +17544,7 @@ Date:	Sun Jan 16 17:25:02 2011 +0000
 
     Don't need this either
 
- configure.ac |    1 -
+ configure.ac | 1 -
  1 file changed, 1 deletion(-)
 
 commit 76ab657dc81ed0af7d9f2efaca2e68d570063001
@@ -14369,7 +17553,7 @@ Date:	Sun Jan 16 17:22:56 2011 +0000
 
     And this is the last bit of qt3 cleaning?
 
- configure.ac |    1 -
+ configure.ac | 1 -
  1 file changed, 1 deletion(-)
 
 commit 9a02856c2762e65b8f03e443e728e05e5a86f65b
@@ -14378,7 +17562,7 @@ Date:	Sun Jan 16 17:21:00 2011 +0000
 
     Another qt3 unused file
 
- m4/qt.m4 |   16 ----------------
+ m4/qt.m4 | 16 ----------------
  1 file changed, 16 deletions(-)
 
 commit 26da7a52d31eb677ab6399de2c07140aa272b35e
@@ -14387,7 +17571,7 @@ Date:	Sun Jan 16 17:17:59 2011 +0000
 
     Yet more qt3 cleaning
 
- configure.ac |    2 --
+ configure.ac | 2 --
  1 file changed, 2 deletions(-)
 
 commit 8dc9c693abb0033247a338d0f7d1f3f7a57c1a55
@@ -14396,10 +17580,10 @@ Date:	Sun Jan 16 17:14:34 2011 +0000
 
     Some more qt3 thigs i forgot to kill
 
- CMakeLists.txt		     |	  5 -
- Makefile.am		     |	  1 -
- cmake/modules/FindQt3.cmake |	319
- -------------------------------------------
+ CMakeLists.txt		     |	 5 -
+ Makefile.am		     |	 1 -
+ cmake/modules/FindQt3.cmake | 319
+ --------------------------------------------
  3 files changed, 325 deletions(-)
 
 commit d82f98a274bfa008c218e265a080c4af7ce95131
@@ -14408,29 +17592,29 @@ Date:	Sun Jan 16 17:13:06 2011 +0000
 
     Kill qt3 frontend
 
- CMakeLists.txt			      |    5 -
- Makefile.am			      |    5 -
- configure.ac			      |   18 --
- poppler-qt-uninstalled.pc.in	      |    7 -
- poppler-qt.pc.cmake		      |   13 --
- poppler-qt.pc.in		      |   13 --
- qt/.gitignore			      |    7 -
- qt/CMakeLists.txt		      |   34 ----
- qt/Makefile.am			      |   48 -----
- qt/poppler-document.cc		      |  344
- --------------------------------
- qt/poppler-fontinfo.cc		      |   83 --------
- qt/poppler-link-qt3.h		      |  188 ------------------
- qt/poppler-link.cc		      |  267 -------------------------
- qt/poppler-page-transition-private.h |   28 ---
- qt/poppler-page-transition.cc	      |   95 ---------
- qt/poppler-page-transition.h	      |  146 --------------
- qt/poppler-page.cc		      |  357
- ----------------------------------
- qt/poppler-private.cc		      |  147 --------------
- qt/poppler-private.h		      |  102 ----------
- qt/poppler-qt.h		      |  311 -----------------------------
- qt/test-poppler-qt.cpp		      |  122 ------------
+ CMakeLists.txt			      |   5 -
+ Makefile.am			      |   5 -
+ configure.ac			      |  18 --
+ poppler-qt-uninstalled.pc.in	      |   7 -
+ poppler-qt.pc.cmake		      |  13 --
+ poppler-qt.pc.in		      |  13 --
+ qt/.gitignore			      |   7 -
+ qt/CMakeLists.txt		      |  34 ----
+ qt/Makefile.am			      |  48 -----
+ qt/poppler-document.cc		      | 344
+ ---------------------------------
+ qt/poppler-fontinfo.cc		      |  83 --------
+ qt/poppler-link-qt3.h		      | 188 ------------------
+ qt/poppler-link.cc		      | 267 --------------------------
+ qt/poppler-page-transition-private.h |  28 ---
+ qt/poppler-page-transition.cc	      |  95 ----------
+ qt/poppler-page-transition.h	      | 146 --------------
+ qt/poppler-page.cc		      | 357
+ -----------------------------------
+ qt/poppler-private.cc		      | 147 ---------------
+ qt/poppler-private.h		      | 102 ----------
+ qt/poppler-qt.h		      | 311 ------------------------------
+ qt/test-poppler-qt.cpp		      | 122 ------------
  21 files changed, 2340 deletions(-)
 
 commit 301352e5585d4ab6e7b609b4ab79b4d8b8656092
@@ -14441,8 +17625,8 @@ Date:	Sun Jan 9 18:48:50 2011 +0000
 
     Bug 32890
 
- poppler/DCTStream.cc |   21 ++++++++++++---------
- poppler/DCTStream.h  |    8 ++++++--
+ poppler/DCTStream.cc | 21 ++++++++++++---------
+ poppler/DCTStream.h  |  8 ++++++--
  2 files changed, 18 insertions(+), 11 deletions(-)
 
 commit 17baf0498485720b4ea5952bb46287f533139d0a
@@ -14451,7 +17635,7 @@ Date:	Sat Jan 8 13:03:31 2011 +0000
 
     Remove declaration of function without implementation
 
- poppler/XRef.h |    3 +--
+ poppler/XRef.h | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit a9e280508f5d669c8b6e1a6bb888b9369d868ab3
@@ -14461,7 +17645,7 @@ Date:	Sat Jan 8 10:39:41 2011 +0100
     glib: Fix memory leak when calling poppler_page_get_text_layout()
     for pages with no text
 
- glib/poppler-page.cc |    5 ++++-
+ glib/poppler-page.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 5d62d18941810ef7d668eafa8b001085133fb169
@@ -14471,7 +17655,7 @@ Date:	Sat Jan 8 10:33:32 2011 +0100
     glib: Use NULL instead of FALSE in g_return_val_if_fail() for
     functions returning a pointer
 
- glib/poppler-page.cc |   12 ++++++------
+ glib/poppler-page.cc | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 1324ae13f1fc2fa28951c2c7f7d63d4756537229
@@ -14480,7 +17664,7 @@ Date:	Thu Jan 6 01:15:30 2011 +0100
 
     [cpp/apidox] advertize the 'pnm' image format
 
- cpp/poppler-image.cpp |    1 +
+ cpp/poppler-image.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit b192363960c26111167b1b08db9910e5f39dcf8b
@@ -14494,12 +17678,12 @@ Date:	Thu Jan 6 01:09:09 2011 +0100
     and use it choosing the output format matching as close as possible
     the format of the image.
 
- cpp/CMakeLists.txt    |    1 +
- cpp/Makefile.am       |    2 +
- cpp/PNMWriter.cc      |  119
- +++++++++++++++++++++++++++++++++++++++++++++++++
- cpp/PNMWriter.h       |   43 ++++++++++++++++++
- cpp/poppler-image.cpp |   22 ++++++++-
+ cpp/CMakeLists.txt    |   1 +
+ cpp/Makefile.am       |   2 +
+ cpp/PNMWriter.cc      | 119
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/PNMWriter.h       |  43 ++++++++++++++++++
+ cpp/poppler-image.cpp |  22 +++++++++-
  5 files changed, 186 insertions(+), 1 deletion(-)
 
 commit bebc530cbde7898759e1bd3629d2836ce0fb1d08
@@ -14513,9 +17697,9 @@ Date:	Fri Dec 31 12:11:40 2010 +1030
 
     https://bugs.freedesktop.org/show_bug.cgi?id=32746
 
- poppler/CairoOutputDev.cc |   46
- ++++++++++++++++++++++++++++++---------------
- poppler/CairoOutputDev.h  |	1 +
+ poppler/CairoOutputDev.cc | 46
+ +++++++++++++++++++++++++++++++---------------
+ poppler/CairoOutputDev.h  |  1 +
  2 files changed, 32 insertions(+), 15 deletions(-)
 
 commit 1399b9ab14b19f25583c75af2b36f63a6a01129a
@@ -14524,7 +17708,7 @@ Date:	Wed Dec 29 15:56:45 2010 +0100
 
     [cpp] add TIFF output to 'image'
 
- cpp/poppler-image.cpp |   12 ++++++++++++
+ cpp/poppler-image.cpp | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit 1c7937dbc3c577ffc12cacc8de33d320e2f30ce9
@@ -14535,19 +17719,19 @@ Date:	Wed Dec 29 14:47:06 2010 +0000
 
     BUG 32027
 
- CMakeLists.txt		|   15 ++++
- config.h.cmake		|    3 +
- configure.ac		|   32 ++++++++
- goo/Makefile.am	|    2 +
- goo/TiffWriter.cc	|  202
- ++++++++++++++++++++++++++++++++++++++++++++++++
- goo/TiffWriter.h	|   53 +++++++++++++
- poppler/Makefile.am	|   11 +++
- splash/SplashBitmap.cc |   18 ++++-
- splash/SplashBitmap.h	|    5 +-
- splash/SplashTypes.h	|    4 +-
- utils/pdftoppm.1	|    6 ++
- utils/pdftoppm.cc	|   14 +++-
+ CMakeLists.txt		|  15 ++++
+ config.h.cmake		|   3 +
+ configure.ac		|  32 ++++++++
+ goo/Makefile.am	|   2 +
+ goo/TiffWriter.cc	| 202
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/TiffWriter.h	|  53 +++++++++++++
+ poppler/Makefile.am	|  11 +++
+ splash/SplashBitmap.cc |  18 ++++-
+ splash/SplashBitmap.h	|   5 +-
+ splash/SplashTypes.h	|   4 +-
+ utils/pdftoppm.1	|   6 ++
+ utils/pdftoppm.cc	|  14 +++-
  12 files changed, 358 insertions(+), 7 deletions(-)
 
 commit bae91ecb638fcfee001e5c9a86a754610da796e4
@@ -14558,8 +17742,8 @@ Date:	Tue Dec 28 11:53:54 2010 +0000
 
     Bug 32025
 
- utils/pdftoppm.1  |	3 +++
- utils/pdftoppm.cc |   26 +++++++++++++++++++++++---
+ utils/pdftoppm.1  |  3 +++
+ utils/pdftoppm.cc | 26 +++++++++++++++++++++++---
  2 files changed, 26 insertions(+), 3 deletions(-)
 
 commit ff58ee66c27da09a370a3000ab55eb1a24921852
@@ -14568,8 +17752,8 @@ Date:	Mon Dec 27 20:07:21 2010 +0000
 
     bump soname just in case the getPage change is not BC
 
- qt/CMakeLists.txt |	2 +-
- qt/Makefile.am    |	2 +-
+ qt/CMakeLists.txt | 2 +-
+ qt/Makefile.am    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 453df02e195a96d0210f297c21c8ffba646659da
@@ -14578,7 +17762,7 @@ Date:	Mon Dec 27 19:51:13 2010 +0000
 
     Make distcheck work
 
- glib/Makefile.am |    2 +-
+ glib/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6a34cec72c1a1b6576858a7836aae4a902fb5ed7
@@ -14587,8 +17771,8 @@ Date:	Mon Dec 27 19:29:52 2010 +0000
 
     increase core soname
 
- CMakeLists.txt      |	  2 +-
- poppler/Makefile.am |	  2 +-
+ CMakeLists.txt      | 2 +-
+ poppler/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 8c11e9d68dceb609d04b3b383d22c307b5981d86
@@ -14597,10 +17781,10 @@ Date:	Mon Dec 27 19:23:29 2010 +0000
 
     0.16.0 project version increase
 
- CMakeLists.txt   |    4 ++--
- configure.ac	  |    4 ++--
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 4 ++--
+ configure.ac	  | 4 ++--
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 8c1fd83c6061279af00c1172fe41cee61f19d917
@@ -14609,7 +17793,7 @@ Date:	Mon Dec 27 19:22:22 2010 +0000
 
     0.16.0 NEWS
 
- NEWS |   24 ++++++++++++++++++++++++
+ NEWS | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
 commit 0294d6e50691a3e40fad0d6e4fa9056944a91efd
@@ -14620,7 +17804,7 @@ Date:	Thu Dec 23 15:56:32 2010 +0000
 
     Fixes 32349
 
- poppler/Gfx.cc |   25 ++++++++++++++++---------
+ poppler/Gfx.cc | 25 ++++++++++++++++---------
  1 file changed, 16 insertions(+), 9 deletions(-)
 
 commit 3aa08e378927889b35b6fa858d6da568250ba6ec
@@ -14629,7 +17813,7 @@ Date:	Sun Dec 19 22:36:47 2010 +0000
 
     Seems to work with this version, so enable it
 
- CMakeLists.txt |    4 ++--
+ CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 93cf184b7573980bf2e56342e64f9b99c5d0b415
@@ -14640,7 +17824,7 @@ Date:	Sun Dec 19 14:16:25 2010 +0000
 
     Applying patches by hand is bad
 
- poppler/PDFDoc.cc |	4 ++--
+ poppler/PDFDoc.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ebb580d756a8321de87814f05ab572564732c15e
@@ -14649,7 +17833,7 @@ Date:	Sun Dec 19 14:08:31 2010 +0000
 
     Windows fixes
 
- poppler/PDFDoc.cc |	5 +++--
+ poppler/PDFDoc.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 88a4154420e016d93c5ce05b5b8e09b6bddcadc9
@@ -14658,7 +17842,7 @@ Date:	Sun Dec 19 13:03:01 2010 +0000
 
     build on newer MSVC
 
- qt4/src/poppler-annotation.h |    7 ++++---
+ qt4/src/poppler-annotation.h | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 18cd9f6aeb48266c551952c395eb9cd662bc27f5
@@ -14667,7 +17851,7 @@ Date:	Sat Dec 18 17:59:54 2010 +0000
 
     compile in windows
 
- poppler/FontInfo.cc |	  3 ++-
+ poppler/FontInfo.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 471102ef68b439dfa13e20e3b0f2e143f8d0dc85
@@ -14678,8 +17862,8 @@ Date:	Fri Dec 17 00:36:36 2010 +0000
 
     Actually use -zoom that is there for a reason
 
- utils/pdftohtml.1  |	 3 ---
- utils/pdftohtml.cc |	15 ++++++---------
+ utils/pdftohtml.1  |  3 ---
+ utils/pdftohtml.cc | 15 ++++++---------
  2 files changed, 6 insertions(+), 12 deletions(-)
 
 commit edf6c47feb5b7658e585bcce196e465245e1dc98
@@ -14688,7 +17872,7 @@ Date:	Thu Dec 16 22:56:40 2010 +0000
 
     kill useless code
 
- utils/pdftohtml.cc |	 8 --------
+ utils/pdftohtml.cc | 8 --------
  1 file changed, 8 deletions(-)
 
 commit 185a2f81485e19f96393a431be5523a277747b94
@@ -14697,8 +17881,8 @@ Date:	Thu Dec 16 22:56:15 2010 +0000
 
     static-ify some vars
 
- utils/HtmlOutputDev.cc |    9 ---------
- utils/pdftohtml.cc	|    8 ++++----
+ utils/HtmlOutputDev.cc | 9 ---------
+ utils/pdftohtml.cc	| 8 ++++----
  2 files changed, 4 insertions(+), 13 deletions(-)
 
 commit e4dfc548c57b690db9122d1db3342ed0a785c8bb
@@ -14707,7 +17891,7 @@ Date:	Tue Dec 14 19:45:46 2010 +0000
 
     We need this to make the define really be defined
 
- config.h.cmake |    3 +++
+ config.h.cmake | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 06da4b46c442778c67b788b747f04b386b5247ac
@@ -14723,9 +17907,9 @@ Date:	Tue Dec 14 09:06:57 2010 +1030
     where a 65K PDF printed to PDF using poppler-cairo turns into an 8MB
     PDF.
 
- CMakeLists.txt		   |	2 ++
- configure.ac		   |	1 +
- poppler/CairoOutputDev.cc |   25 ++++++++++++++++++-------
+ CMakeLists.txt		   |  2 ++
+ configure.ac		   |  1 +
+ poppler/CairoOutputDev.cc | 25 ++++++++++++++++++-------
  3 files changed, 21 insertions(+), 7 deletions(-)
 
 commit 6ef457dc818e7e241e5d2e264bc2d78b132ae638
@@ -14738,8 +17922,8 @@ Date:	Mon Dec 13 14:08:29 2010 +0000
     gmem a
     while ago
 
- cmake/modules/PopplerMacros.cmake |	2 +-
- configure.ac			   |	2 +-
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac			   | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 86e469600b58ae05cb6ede1b4017fbdac99cc556
@@ -14751,8 +17935,8 @@ Date:	Mon Dec 13 14:04:00 2010 +0000
     -Wchar-subscripts is part of -Wall so remove it
     Move -fno-common to default options since it makes sense to use it
 
- cmake/modules/PopplerMacros.cmake |	4 ++--
- configure.ac			   |	4 ++--
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ configure.ac			   | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 2b74241d8b1fd1ec9fab4f6f673bbaaa1cb3d949
@@ -14761,8 +17945,8 @@ Date:	Mon Dec 13 13:56:52 2010 +0000
 
     Promote -Wcast-align to the general warnings we ask gcc to give
 
- cmake/modules/PopplerMacros.cmake |	2 +-
- configure.ac			   |	2 +-
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac			   | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 7313e0a4de6f2146c1dcb3d235f18a3c844d12d5
@@ -14773,12 +17957,12 @@ Date:	Sun Dec 12 23:28:18 2010 +0000
 
     Bug 32149
 
- utils/pdffonts.cc  |	 2 ++
- utils/pdfimages.cc |	 2 ++
- utils/pdfinfo.cc   |	 3 +++
- utils/pdftoppm.cc  |	 2 ++
- utils/pdftops.cc   |	 5 ++++-
- utils/pdftotext.cc |	 3 +++
+ utils/pdffonts.cc  | 2 ++
+ utils/pdfimages.cc | 2 ++
+ utils/pdfinfo.cc   | 3 +++
+ utils/pdftoppm.cc  | 2 ++
+ utils/pdftops.cc   | 5 ++++-
+ utils/pdftotext.cc | 3 +++
  6 files changed, 16 insertions(+), 1 deletion(-)
 
 commit 669cbfc9fd78a22d4f14b0af43143e1f5dc28cd5
@@ -14790,7 +17974,7 @@ Date:	Sat Dec 11 19:04:22 2010 +0000
     Code based in code posted by Suzuki Toshiya in the freetype mailing
     list
 
- splash/SplashFTFont.cc |   15 +++++++++------
+ splash/SplashFTFont.cc | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 commit 2984002a64acca7014edeadd900dd52cdf7d9eac
@@ -14801,7 +17985,7 @@ Date:	Sat Dec 11 18:57:52 2010 +0000
 
     Gives a warning with newer gcc's
 
- splash/Splash.cc |    6 +++---
+ splash/Splash.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 9b45fa072198da4a5032004ac943cf2227aa97ea
@@ -14812,8 +17996,8 @@ Date:	Fri Dec 10 12:05:58 2010 +0000
 
     BUG 30107
 
- poppler/PreScanOutputDev.cc |	 14 +++++++++++++-
- poppler/PreScanOutputDev.h  |	  4 ++++
+ poppler/PreScanOutputDev.cc | 14 +++++++++++++-
+ poppler/PreScanOutputDev.h  |	4 ++++
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 commit f96f6a06cdc33b4654669ac74d5abd0d546a127d
@@ -14824,8 +18008,8 @@ Date:	Sun Dec 5 12:06:21 2010 +0000
 
     Bug 32065
 
- poppler/FlateStream.cc |    9 ++++++---
- poppler/FlateStream.h	|    9 +++++++++
+ poppler/FlateStream.cc | 9 ++++++---
+ poppler/FlateStream.h	| 9 +++++++++
  2 files changed, 15 insertions(+), 3 deletions(-)
 
 commit 7b1f83990a1f68306daf5f7dbeabcd38f4382e3b
@@ -14834,12 +18018,12 @@ Date:	Mon Nov 29 22:27:46 2010 +0000
 
     0.15.3
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 18 ++++++++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 18 ++++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 24 insertions(+), 6 deletions(-)
 
 commit 7c23a993193aaaa4d4b5b6d1161a0455d1e2a8c0
@@ -14848,8 +18032,7 @@ Date:	Mon Nov 29 21:33:31 2010 +0000
 
     Add some more isNum before calling getNum
 
- poppler/GfxState.cc |	 48
- ++++++++++++++++++++++++++++++++----------------
+ poppler/GfxState.cc | 48 ++++++++++++++++++++++++++++++++----------------
  1 file changed, 32 insertions(+), 16 deletions(-)
 
 commit 62ec4f591c258e702ee79b519919a931517220bf
@@ -14860,9 +18043,9 @@ Date:	Mon Nov 29 20:50:43 2010 +0000
 
     Fixes some more crashes in broken files
 
- poppler/Parser.cc |	7 ++++++-
- poppler/Parser.h  |	1 +
- poppler/XRef.cc   |	6 +++---
+ poppler/Parser.cc | 7 ++++++-
+ poppler/Parser.h  | 1 +
+ poppler/XRef.cc   | 6 +++---
  3 files changed, 10 insertions(+), 4 deletions(-)
 
 commit d2a0e2ca723142478858f7edfb7c98807d554578
@@ -14871,7 +18054,7 @@ Date:	Thu Nov 25 10:36:38 2010 +0000
 
     Skip over loops in Pages tree
 
- poppler/Catalog.cc |	15 ++++++++++-----
+ poppler/Catalog.cc | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)
 
 commit 7abd371364e6e4aaef932f26b0664f7f9d760c42
@@ -14880,8 +18063,8 @@ Date:	Sun Nov 28 13:57:50 2010 +0000
 
     this var is not about xobjects only anymroe
 
- poppler/FontInfo.cc |	  6 +++---
- poppler/FontInfo.h  |	  2 +-
+ poppler/FontInfo.cc | 6 +++---
+ poppler/FontInfo.h  | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 1ac14df61d711097837e44d80a9332f0a854b95e
@@ -14892,7 +18075,7 @@ Date:	Sun Nov 28 13:49:41 2010 +0000
 
     Bug 31948
 
- poppler/FontInfo.cc |	 50
+ poppler/FontInfo.cc | 50
  +++++++++++++++++++++++++++-----------------------
  1 file changed, 27 insertions(+), 23 deletions(-)
 
@@ -14902,8 +18085,8 @@ Date:	Sun Nov 28 13:25:39 2010 +0000
 
     Use sets instead of arrays
 
- poppler/FontInfo.cc |	 46 ++++++++--------------------------------------
- poppler/FontInfo.h  |	 11 +++--------
+ poppler/FontInfo.cc | 46 ++++++++--------------------------------------
+ poppler/FontInfo.h  | 11 +++--------
  2 files changed, 11 insertions(+), 46 deletions(-)
 
 commit 4c20bf14c0b1d7f1d5e530ded890186487da32b5
@@ -14915,8 +18098,8 @@ Date:	Sun Nov 28 12:50:24 2010 +0000
     No idea why we didn't do this before, duplicate code is evil and now
     pdffonts doesn't crash on pdf from bug 20486
 
- utils/pdffonts.cc |  185
- ++++++++---------------------------------------------
+ utils/pdffonts.cc | 185
+ ++++++++----------------------------------------------
  1 file changed, 26 insertions(+), 159 deletions(-)
 
 commit d915f3d5a9e9e2e5dcd6be4cf8fac1b5849a13e9
@@ -14925,7 +18108,7 @@ Date:	Wed Nov 24 21:51:46 2010 +0000
 
     protect against null ref here
 
- poppler/Catalog.cc |	 2 +-
+ poppler/Catalog.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cf32faaa16d763561fb9dfc4469345e4b3ba2369
@@ -14934,7 +18117,7 @@ Date:	Wed Nov 24 21:48:54 2010 +0000
 
     Protect against NULL values here
 
- poppler/JPEG2000Stream.h |    2 ++
+ poppler/JPEG2000Stream.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 46a6cc5952c59504863baed3ad2870093c462f12
@@ -14945,7 +18128,7 @@ Date:	Wed Nov 24 19:42:59 2010 +0000
 
     Bug 31895
 
- poppler/GfxState.cc |	 26 ++++++++++++++++++--------
+ poppler/GfxState.cc | 26 ++++++++++++++++++--------
  1 file changed, 18 insertions(+), 8 deletions(-)
 
 commit 52e25cca7e75a8b8eac95a3cec258f1cd9f8ecaa
@@ -14957,9 +18140,9 @@ Date:	Tue Nov 23 20:31:14 2010 +0000
 
     Fixes broken PDF at bug 31861
 
- poppler/Catalog.cc |	 2 +-
- poppler/Dict.cc    |	 4 ++++
- poppler/Dict.h     |	 2 ++
+ poppler/Catalog.cc | 2 +-
+ poppler/Dict.cc    | 4 ++++
+ poppler/Dict.h     | 2 ++
  3 files changed, 7 insertions(+), 1 deletion(-)
 
 commit c6127898b13311197971b1c6b1b306b91e28cf0e
@@ -14970,7 +18153,7 @@ Date:	Mon Nov 22 13:08:48 2010 +0000
 
     Prevents running out of memory with malicious documents.
 
- poppler/Hints.cc |   26 +++++++++++++-------------
+ poppler/Hints.cc | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 commit 6a17cc89eda52f08cbacbf9bfaaeda22cf041e82
@@ -14981,8 +18164,8 @@ Date:	Mon Nov 22 19:20:56 2010 +0000
 
     Improves the duck rendering in bug 22098
 
- poppler/Gfx.cc |   71
- +++++++++++++++++++++++++++-----------------------------
+ poppler/Gfx.cc | 71
+ ++++++++++++++++++++++++++++------------------------------
  1 file changed, 34 insertions(+), 37 deletions(-)
 
 commit 9093adede4f9ad6fb2962dcefcb09c1d8c357715
@@ -14991,7 +18174,7 @@ Date:	Sun Nov 21 23:49:12 2010 +0000
 
     pedantic ;
 
- poppler/CurlPDFDocBuilder.cc |    2 +-
+ poppler/CurlPDFDocBuilder.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 61445f5af749510fb647059af01abf1faf664195
@@ -15000,7 +18183,7 @@ Date:	Sat Nov 20 22:19:35 2010 +0000
 
     forgot to upadte year here
 
- poppler/Parser.h |    2 +-
+ poppler/Parser.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3628837febb21bcd1b54f3fb737628ea59e5d95d
@@ -15011,14 +18194,14 @@ Date:	Sat Nov 20 22:15:08 2010 +0000
 
     Works for loops of more than one item as in bug 28784
 
- poppler/Dict.cc   |	4 ++--
- poppler/Dict.h    |	2 +-
- poppler/Object.cc |	4 ++--
- poppler/Object.h  |	9 +++++----
- poppler/Parser.cc |   19 +++++++++++++------
- poppler/Parser.h  |	7 ++++++-
- poppler/XRef.cc   |   30 +++++++++++++++++++++++++-----
- poppler/XRef.h    |	2 +-
+ poppler/Dict.cc   |  4 ++--
+ poppler/Dict.h    |  2 +-
+ poppler/Object.cc |  4 ++--
+ poppler/Object.h  |  9 +++++----
+ poppler/Parser.cc | 19 +++++++++++++------
+ poppler/Parser.h  |  7 ++++++-
+ poppler/XRef.cc   | 30 +++++++++++++++++++++++++-----
+ poppler/XRef.h    |  2 +-
  8 files changed, 55 insertions(+), 22 deletions(-)
 
 commit b0555189a7fbd7f6a899e582783b9e0df44d5d6a
@@ -15027,13 +18210,13 @@ Date:	Sat Nov 20 21:32:24 2010 +0000
 
     Protect against more loops when parsing
 
- poppler/Dict.cc   |	4 ++--
- poppler/Dict.h    |	2 +-
- poppler/Object.cc |	4 ++--
- poppler/Object.h  |	8 ++++----
- poppler/Parser.cc |	2 +-
- poppler/XRef.cc   |	4 ++--
- poppler/XRef.h    |	2 +-
+ poppler/Dict.cc   | 4 ++--
+ poppler/Dict.h    | 2 +-
+ poppler/Object.cc | 4 ++--
+ poppler/Object.h  | 8 ++++----
+ poppler/Parser.cc | 2 +-
+ poppler/XRef.cc   | 4 ++--
+ poppler/XRef.h    | 2 +-
  7 files changed, 13 insertions(+), 13 deletions(-)
 
 commit 555fa897b275ca7195f22a727b049c8c4f2d74cd
@@ -15042,9 +18225,9 @@ Date:	Sat Nov 20 19:14:38 2010 +0000
 
     Detect loops in FormField creation
 
- poppler/Form.cc |   88
- +++++++++++++++++++++++++++++++------------------------
- poppler/Form.h  |   14 +++++----
+ poppler/Form.cc | 88
+ ++++++++++++++++++++++++++++++++-------------------------
+ poppler/Form.h  | 14 +++++----
  2 files changed, 58 insertions(+), 44 deletions(-)
 
 commit 1802ddef374cb1451975480b2427e5d23ee2c737
@@ -15053,8 +18236,8 @@ Date:	Sat Nov 20 18:58:17 2010 +0000
 
     Forgot to port this away from GooVector :-S
 
- poppler/CurlCachedFile.cc |	3 +--
- poppler/CurlCachedFile.h  |	2 +-
+ poppler/CurlCachedFile.cc | 3 +--
+ poppler/CurlCachedFile.h  | 2 +-
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 commit 32e53c5436b8c3654e7043f1d86596a79511a4cf
@@ -15063,7 +18246,7 @@ Date:	Sat Nov 20 18:54:59 2010 +0000
 
     fix spacing
 
- poppler/Form.cc |    8 ++++----
+ poppler/Form.cc | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 1cb3d5d94a1d89ccded96d977bcabfbe438fb81f
@@ -15074,7 +18257,7 @@ Date:	Sat Nov 20 18:08:45 2010 +0000
 
     Fixes crash in broken pdf
 
- poppler/Hints.cc |    2 +-
+ poppler/Hints.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 22e8cebaa15adb4b19c9556cdca43cc3e77832b7
@@ -15083,7 +18266,7 @@ Date:	Sat Nov 20 17:20:34 2010 +0000
 
     Ensure the obj are num before reading them
 
- poppler/GfxState.cc |	 32 ++++++++++++++++++++++----------
+ poppler/GfxState.cc | 32 ++++++++++++++++++++++----------
  1 file changed, 22 insertions(+), 10 deletions(-)
 
 commit 08b2db36db4e011ebe36d2d945cb1a0498f1c5fb
@@ -15092,7 +18275,7 @@ Date:	Sat Nov 20 14:00:36 2010 +0100
 
     add my copyright here
 
- poppler/Hints.cc |    1 +
+ poppler/Hints.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 91aa4b02aa93ffe3828479194067de42d52be465
@@ -15101,8 +18284,8 @@ Date:	Sat Nov 20 13:13:46 2010 +0100
 
     [cpp] include <ios> for std::hex() and std::left()
 
- cpp/poppler-global.cpp     |	 1 +
- cpp/tests/poppler-dump.cpp |	 1 +
+ cpp/poppler-global.cpp     | 1 +
+ cpp/tests/poppler-dump.cpp | 1 +
  2 files changed, 2 insertions(+)
 
 commit 1c924412923cb01f2cb95b0943cb7bbaf7e8cfb6
@@ -15111,7 +18294,7 @@ Date:	Sat Nov 20 13:02:36 2010 +0100
 
     [cpp] include <iterator> for std::back_inserter()
 
- cpp/poppler-document.cpp |    1 +
+ cpp/poppler-document.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit 95b551025a34f3a7bcff2852eac6d186bc8a7cb0
@@ -15120,7 +18303,7 @@ Date:	Sat Nov 20 12:54:21 2010 +0100
 
     use a std::vector<char> instead of a var-length-array of char's
 
- poppler/Hints.cc |    6 +++---
+ poppler/Hints.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 4faaff893515c80cb69b02e431a0f8483274a497
@@ -15131,8 +18314,8 @@ Date:	Fri Nov 19 23:53:35 2010 +0000
 
     The previous implementation did not compile with mingw64.
 
- poppler/strtok_r.cpp |  137
- +-------------------------------------------------
+ poppler/strtok_r.cpp | 137
+ +--------------------------------------------------
  1 file changed, 1 insertion(+), 136 deletions(-)
 
 commit 255f84927a649d980f047fe755c9c308535a3779
@@ -15143,7 +18326,7 @@ Date:	Fri Nov 19 23:45:33 2010 +0000
 
     Fixes bug #31627
 
- poppler/Linearization.cc |    4 +---
+ poppler/Linearization.cc | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 9d05138f0b7d15945f546564036bc67815593db0
@@ -15152,12 +18335,12 @@ Date:	Sun Nov 14 16:05:28 2010 +0000
 
     0.15.2
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 22 ++++++++++++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 22 ++++++++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 28 insertions(+), 6 deletions(-)
 
 commit 2d18543bd6b3a5a9ff2dfab63339d5bfcccd0b2f
@@ -15166,7 +18349,7 @@ Date:	Sun Nov 14 15:41:56 2010 +0000
 
     This does actually work now :D
 
- qt4/tests/check_metadata.cpp |    1 -
+ qt4/tests/check_metadata.cpp | 1 -
  1 file changed, 1 deletion(-)
 
 commit d772364b8a5858cbd98e256547d319260fa9d084
@@ -15181,8 +18364,8 @@ Date:	Thu Nov 11 21:52:25 2010 +0100
 
     Base on an idea of Albert, added closure and polish by me.
 
- qt4/src/poppler-private.cc |	20 +++++++++++++++++++-
- qt4/src/poppler-qt4.h	    |	24 ++++++++++++++++++++++++
+ qt4/src/poppler-private.cc | 20 +++++++++++++++++++-
+ qt4/src/poppler-qt4.h	    | 24 ++++++++++++++++++++++++
  2 files changed, 43 insertions(+), 1 deletion(-)
 
 commit ce929cf33f4b6b6421f9d327b4bb792816d47aac
@@ -15193,10 +18376,10 @@ Date:	Wed Nov 10 23:41:44 2010 +0000
 
     Adds the page the image is in to the image filename
 
- utils/ImageOutputDev.cc |   25 ++++++++++++++++++-------
- utils/ImageOutputDev.h  |   19 +++++++++++++++----
- utils/pdfimages.1	 |    3 +++
- utils/pdfimages.cc	 |    6 +++++-
+ utils/ImageOutputDev.cc | 25 ++++++++++++++++++-------
+ utils/ImageOutputDev.h  | 19 +++++++++++++++----
+ utils/pdfimages.1	 |  3 +++
+ utils/pdfimages.cc	 |  6 +++++-
  4 files changed, 41 insertions(+), 12 deletions(-)
 
 commit 6296c28968613aadb7ea084092945a54005eca9b
@@ -15210,27 +18393,27 @@ Date:	Wed Nov 10 23:28:45 2010 +0000
     need to maintain it in case we ever get a new xpdf release we want to
     merge with
 
- CMakeLists.txt		    |	 1 -
- goo/GooVector.h	    |  159
- --------------------------------------------
- goo/Makefile.am	    |	 1 -
- poppler/CachedFile.cc	    |	19 +++---
- poppler/CachedFile.h	    |	15 +++--
- poppler/Catalog.cc	    |	12 ++--
- poppler/Catalog.h	    |	10 +--
- poppler/Form.h		    |	 3 +-
- poppler/Gfx.h		    |	 7 +-
- poppler/Hints.cc	    |	 5 +-
- poppler/Hints.h	    |	 6 +-
- poppler/StdinCachedFile.cc |	 2 +-
- poppler/StdinCachedFile.h  |	 2 +-
- poppler/Stream.h	    |	 1 -
- poppler/XRef.cc	    |	10 +--
- poppler/XRef.h		    |	 7 +-
- utils/HtmlFonts.cc	    |	 8 +--
- utils/HtmlFonts.h	    |	12 ++--
- utils/HtmlLinks.cc	    |	 8 +--
- utils/HtmlLinks.h	    |	 4 +-
+ CMakeLists.txt		    |	1 -
+ goo/GooVector.h	    | 159
+ ---------------------------------------------
+ goo/Makefile.am	    |	1 -
+ poppler/CachedFile.cc	    |  19 +++---
+ poppler/CachedFile.h	    |  15 +++--
+ poppler/Catalog.cc	    |  12 ++--
+ poppler/Catalog.h	    |  10 +--
+ poppler/Form.h		    |	3 +-
+ poppler/Gfx.h		    |	7 +-
+ poppler/Hints.cc	    |	5 +-
+ poppler/Hints.h	    |	6 +-
+ poppler/StdinCachedFile.cc |	2 +-
+ poppler/StdinCachedFile.h  |	2 +-
+ poppler/Stream.h	    |	1 -
+ poppler/XRef.cc	    |  10 +--
+ poppler/XRef.h		    |	7 +-
+ utils/HtmlFonts.cc	    |	8 +--
+ utils/HtmlFonts.h	    |  12 ++--
+ utils/HtmlLinks.cc	    |	8 +--
+ utils/HtmlLinks.h	    |	4 +-
  20 files changed, 66 insertions(+), 226 deletions(-)
 
 commit 5934c320aa136c1a6e97fb9bf54bdfdccfcab521
@@ -15243,42 +18426,42 @@ Date:	Wed Nov 10 22:50:36 2010 +0000
     http://lists.freedesktop.org/archives/poppler/2010-November/006642.html
     for the detailed patch description
 
- CMakeLists.txt			 |    4 +
- glib/poppler-action.cc		 |    4 +-
- glib/poppler-document.cc	 |   17 +-
- glib/poppler-page.cc		 |    1 +
- poppler/CachedFile.h		 |    2 +-
- poppler/Catalog.cc		 |  352 ++++++++++++++++++++-----------
- poppler/Catalog.h		 |   14 +-
- poppler/FontInfo.cc		 |    5 +-
- poppler/Hints.cc		 |  439
- +++++++++++++++++++++++++++++++++++++++
- poppler/Hints.h		 |   95 +++++++++
- poppler/Linearization.cc	 |  224 ++++++++++++++++++++
- poppler/Linearization.h	 |   45 ++++
- poppler/Makefile.am		 |    4 +
- poppler/PDFDoc.cc		 |  284 +++++++++++++++++++++----
- poppler/PDFDoc.h		 |   38 +++-
- poppler/PSOutputDev.cc		 |   39 ++--
- poppler/PSOutputDev.h		 |   14 +-
- poppler/Stream.cc		 |   13 +-
- poppler/Stream.h		 |   11 +-
- poppler/XRef.cc		 |  351 ++++++++++++++++++-------------
- poppler/XRef.h			 |   25 ++-
- qt/poppler-document.cc		 |   14 +-
- qt/poppler-page.cc		 |   19 +-
- qt/poppler-private.h		 |   14 +-
- qt/poppler-qt.h		 |    3 +-
- qt4/src/poppler-document.cc	 |   12 +-
- qt4/src/poppler-link.cc	 |    7 +-
- qt4/src/poppler-page.cc	 |    3 +-
- qt4/src/poppler-ps-converter.cc |    2 +
- utils/HtmlOutputDev.cc		 |    2 +-
- utils/HtmlOutputDev.h		 |    3 +
- utils/pdffonts.cc		 |    6 +-
- utils/pdfinfo.cc		 |   22 +-
- utils/pdftohtml.cc		 |    2 +-
- utils/pdftops.cc		 |    3 +-
+ CMakeLists.txt			 |   4 +
+ glib/poppler-action.cc		 |   4 +-
+ glib/poppler-document.cc	 |  17 +-
+ glib/poppler-page.cc		 |   1 +
+ poppler/CachedFile.h		 |   2 +-
+ poppler/Catalog.cc		 | 352 +++++++++++++++++++++-----------
+ poppler/Catalog.h		 |  14 +-
+ poppler/FontInfo.cc		 |   5 +-
+ poppler/Hints.cc		 | 439
+ ++++++++++++++++++++++++++++++++++++++++
+ poppler/Hints.h		 |  95 +++++++++
+ poppler/Linearization.cc	 | 224 ++++++++++++++++++++
+ poppler/Linearization.h	 |  45 ++++
+ poppler/Makefile.am		 |   4 +
+ poppler/PDFDoc.cc		 | 284 ++++++++++++++++++++++----
+ poppler/PDFDoc.h		 |  38 +++-
+ poppler/PSOutputDev.cc		 |  39 ++--
+ poppler/PSOutputDev.h		 |  14 +-
+ poppler/Stream.cc		 |  13 +-
+ poppler/Stream.h		 |  11 +-
+ poppler/XRef.cc		 | 351 +++++++++++++++++++-------------
+ poppler/XRef.h			 |  25 ++-
+ qt/poppler-document.cc		 |  14 +-
+ qt/poppler-page.cc		 |  19 +-
+ qt/poppler-private.h		 |  14 +-
+ qt/poppler-qt.h		 |   3 +-
+ qt4/src/poppler-document.cc	 |  12 +-
+ qt4/src/poppler-link.cc	 |   7 +-
+ qt4/src/poppler-page.cc	 |   3 +-
+ qt4/src/poppler-ps-converter.cc |   2 +
+ utils/HtmlOutputDev.cc		 |   2 +-
+ utils/HtmlOutputDev.h		 |   3 +
+ utils/pdffonts.cc		 |   6 +-
+ utils/pdfinfo.cc		 |  22 +-
+ utils/pdftohtml.cc		 |   2 +-
+ utils/pdftops.cc		 |   3 +-
  35 files changed, 1690 insertions(+), 403 deletions(-)
 
 commit abb1313ae40ab7efb073406f47fa53bf7afe0b88
@@ -15287,7 +18470,7 @@ Date:	Mon Nov 8 01:54:03 2010 +0100
 
     [cpp/apidox] add the minimum version of 'image'
 
- cpp/poppler-image.cpp |    2 ++
+ cpp/poppler-image.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 commit f559e77cb7d76c5fe6a79be9086667a29613c912
@@ -15296,8 +18479,8 @@ Date:	Mon Nov 8 01:52:48 2010 +0100
 
     [cpp] add image::bytes_per_row()
 
- cpp/poppler-image.cpp |    8 ++++++++
- cpp/poppler-image.h   |    1 +
+ cpp/poppler-image.cpp | 8 ++++++++
+ cpp/poppler-image.h   | 1 +
  2 files changed, 9 insertions(+)
 
 commit 14dea4d74698d5d7d994e687f8176652d790dba7
@@ -15309,7 +18492,7 @@ Date:	Sun Nov 7 22:57:31 2010 +0100
     ... as the painter will do the transformation itself already;
     seems to product better results
 
- poppler/ArthurOutputDev.cc |	 2 +-
+ poppler/ArthurOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f077e82af0724be88d28c896a3c208f1d50ccff9
@@ -15326,10 +18509,10 @@ Date:	Sun Nov 7 21:50:48 2010 +0100
     Mostly based on a patch by Matthias Fauconneau
     (matthias.fauconneau@gmail.com), thanks!
 
- qt4/src/poppler-page.cc |   62
- ++++++++++++++++++++++++++++++--------------
- qt4/src/poppler-qt4.h	 |   65
- ++++++++++++++++++++++++++++++++++++++++++++++-
+ qt4/src/poppler-page.cc | 62
+ +++++++++++++++++++++++++++++++---------------
+ qt4/src/poppler-qt4.h	 | 65
+ ++++++++++++++++++++++++++++++++++++++++++++++++-
  2 files changed, 107 insertions(+), 20 deletions(-)
 
 commit df02d1fc9e65422121e5e8f493c13229552ec0e7
@@ -15338,8 +18521,8 @@ Date:	Sun Nov 7 19:47:56 2010 +0100
 
     [arthur] remove unused 'm_image' attribute
 
- poppler/ArthurOutputDev.cc |	 1 -
- poppler/ArthurOutputDev.h  |	 2 +-
+ poppler/ArthurOutputDev.cc | 1 -
+ poppler/ArthurOutputDev.h  | 2 +-
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 commit b29582cd0d542a3e70dbca3fb75770daa4cc91ca
@@ -15352,8 +18535,8 @@ Date:	Sun Nov 7 19:44:11 2010 +0100
     glyph origin)
     - fix image rendering (alpha was set to zero)
 
- poppler/ArthurOutputDev.cc |  122
- ++++++++++++++++++++------------------------
+ poppler/ArthurOutputDev.cc | 122
+ ++++++++++++++++++++-------------------------
  1 file changed, 54 insertions(+), 68 deletions(-)
 
 commit 970f075569bf9be5e5ddc3a9ad1fabec5435dfaf
@@ -15365,10 +18548,10 @@ Date:	Sun Nov 7 16:31:02 2010 +0100
     ... to ease testing the render capabilities of poppler-cpp.
     quite minimal at the moment.
 
- cpp/tests/CMakeLists.txt     |    3 ++
- cpp/tests/Makefile.am	      |    9 +++-
- cpp/tests/poppler-render.cpp |  113
- ++++++++++++++++++++++++++++++++++++++++++
+ cpp/tests/CMakeLists.txt     |   3 ++
+ cpp/tests/Makefile.am	      |   9 +++-
+ cpp/tests/poppler-render.cpp | 113
+ +++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 124 insertions(+), 1 deletion(-)
 
 commit bfe4139c742cb0a669f5504df7e22e3e57243d9a
@@ -15383,11 +18566,11 @@ Date:	Sun Nov 7 16:23:26 2010 +0100
     It can hold a color for the "paper" of the pages, and some hints
     for the actual rendering.
 
- cpp/CMakeLists.txt	       |    2 +
- cpp/Makefile.am	       |    2 +
- cpp/poppler-page-renderer.cpp |  212
- +++++++++++++++++++++++++++++++++++++++++
- cpp/poppler-page-renderer.h   |   66 +++++++++++++
+ cpp/CMakeLists.txt	       |   2 +
+ cpp/Makefile.am	       |   2 +
+ cpp/poppler-page-renderer.cpp | 212
+ ++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-page-renderer.h   |  66 +++++++++++++
  4 files changed, 282 insertions(+)
 
 commit 91e3f7b4ea42a5821fd78e1edf55e95250c9bc68
@@ -15400,7 +18583,7 @@ Date:	Sun Nov 7 16:19:34 2010 +0100
     cpp classes
     without the need to add friends to 'page'
 
- cpp/poppler-page-private.h |	 5 +++++
+ cpp/poppler-page-private.h | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit fa7c41cb9c52ecd3d7c574455b1258a3021b8c75
@@ -15414,21 +18597,21 @@ Date:	Thu Nov 4 20:55:34 2010 +0000
     Feuersänger <cfeuersaenger@googlemail.com>
     More info at bug 30436
 
- poppler/CairoOutputDev.h   |	 5 +-
- poppler/Function.cc	    |	 4 +-
- poppler/Function.h	    |	 2 +
- poppler/Gfx.cc		    |	12 +-
- poppler/OutputDev.h	    |	16 +-
- poppler/PSOutputDev.h	    |	 4 +-
- poppler/SplashOutputDev.cc |  182 +++++++++++++++++++-
- poppler/SplashOutputDev.h  |	68 +++++++-
- splash/Splash.cc	    |  395
- +++++++++++++++++++++++++++++++++++++++++++-
- splash/Splash.h	    |	11 +-
- splash/SplashBitmap.cc     |	 4 +-
- splash/SplashBitmap.h	    |	 3 +
- splash/SplashPattern.cc    |	17 +-
- splash/SplashPattern.h     |	36 +++-
+ poppler/CairoOutputDev.h   |	5 +-
+ poppler/Function.cc	    |	4 +-
+ poppler/Function.h	    |	2 +
+ poppler/Gfx.cc		    |  12 +-
+ poppler/OutputDev.h	    |  16 +-
+ poppler/PSOutputDev.h	    |	4 +-
+ poppler/SplashOutputDev.cc | 182 ++++++++++++++++++++-
+ poppler/SplashOutputDev.h  |  68 +++++++-
+ splash/Splash.cc	    | 395
+ ++++++++++++++++++++++++++++++++++++++++++++-
+ splash/Splash.h	    |  11 +-
+ splash/SplashBitmap.cc     |	4 +-
+ splash/SplashBitmap.h	    |	3 +
+ splash/SplashPattern.cc    |  17 +-
+ splash/SplashPattern.h     |  36 ++++-
  14 files changed, 735 insertions(+), 24 deletions(-)
 
 commit 0aa040163741ab8ba093a742e556bba2a5ab7edf
@@ -15439,7 +18622,7 @@ Date:	Wed Nov 3 20:40:24 2010 +0000
 
     Fixes c2ff94b1600b8a5841a5e4627f014560ac460f1a
 
- poppler/Function.cc |	  7 ++++---
+ poppler/Function.cc | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit c2ff94b1600b8a5841a5e4627f014560ac460f1a
@@ -15451,8 +18634,8 @@ Date:	Wed Nov 3 00:02:02 2010 +0000
     StitchingFunctions that have themselves up in the parent chain
     are wrong
 
- poppler/Function.cc |	 22 +++++++++++++++++++---
- poppler/Function.h  |	  6 ++++--
+ poppler/Function.cc | 22 +++++++++++++++++++---
+ poppler/Function.h  |	6 ++++--
  2 files changed, 23 insertions(+), 5 deletions(-)
 
 commit cad66a7d25abdb6aa15f3aa94a35737b119b2659
@@ -15465,7 +18648,7 @@ Date:	Tue Nov 2 19:14:34 2010 +0000
     < code
     that is not what you wanted
 
- poppler/CharCodeToUnicode.cc |   16 +++++++++++-----
+ poppler/CharCodeToUnicode.cc | 16 +++++++++++-----
  1 file changed, 11 insertions(+), 5 deletions(-)
 
 commit 7e5f31c1c41193c6e49355970e6d027b91d45825
@@ -15474,7 +18657,7 @@ Date:	Tue Nov 2 00:32:01 2010 +0000
 
     make some more fields private
 
- splash/SplashFontFile.h |    5 +++--
+ splash/SplashFontFile.h | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 6751eb48dc49890f7ad8b732b3fc29a2db746ec4
@@ -15485,7 +18668,7 @@ Date:	Tue Nov 2 00:26:08 2010 +0000
 
     You are not supposed to call it, you should call unref
 
- splash/SplashFontFile.h |    5 +++--
+ splash/SplashFontFile.h | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit b718e821d5f21ea5b0c44c6c2b59769c9b94892a
@@ -15496,7 +18679,7 @@ Date:	Thu Oct 28 08:46:09 2010 +0100
 
     It is not a leak and makes things crash :D
 
- poppler/SplashOutputDev.cc |	 1 -
+ poppler/SplashOutputDev.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 15b9aeac5a20c544db1aebe00113ebc2f7ba52c7
@@ -15505,7 +18688,7 @@ Date:	Thu Oct 28 00:37:29 2010 +0100
 
     if reallocn fails, free p
 
- goo/gmem.cc |	  8 ++++++--
+ goo/gmem.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 561c0567a5741d7c49903c51c8020187dccaa0d9
@@ -15514,7 +18697,7 @@ Date:	Wed Oct 27 22:43:51 2010 +0100
 
     fix comment
 
- poppler/SplashOutputDev.cc |	 4 ++--
+ poppler/SplashOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 4ef38cc99a879202e717447a422272cf85eeccfc
@@ -15523,7 +18706,7 @@ Date:	Wed Oct 27 22:36:07 2010 +0100
 
     Fix memory leaks that can happen with broken documents
 
- poppler/SplashOutputDev.cc |	10 ++++++++++
+ poppler/SplashOutputDev.cc | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit fdfffc9c68314d3f64dee7e0ef8617105e3198dd
@@ -15532,7 +18715,7 @@ Date:	Wed Oct 27 20:40:19 2010 +0100
 
     Fix memory leak
 
- poppler/SplashOutputDev.cc |	 1 +
+ poppler/SplashOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 90d479d9d5c947175e60ab689f440ae9c24f0b2b
@@ -15543,7 +18726,7 @@ Date:	Wed Oct 27 20:39:48 2010 +0100
 
     Happens in broken files
 
- splash/Splash.cc |    6 ++++++
+ splash/Splash.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 6ad36277971ec46d4a4ef0c45625e60f8c5f1247
@@ -15552,7 +18735,7 @@ Date:	Mon Oct 25 18:59:49 2010 +0100
 
     Initialze movie to NULL on broken pdf files
 
- poppler/Annot.cc |    1 +
+ poppler/Annot.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2d0b6e2956a81164bca6adc9aacad0e620480957
@@ -15563,7 +18746,7 @@ Date:	Sun Oct 24 00:23:21 2010 +0100
 
     Fixes crash in file provided by Robert Święcki
 
- poppler/Stream.h |    2 +-
+ poppler/Stream.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dcb02d2100136b6035485be3be214ce3d9f1c102
@@ -15572,7 +18755,7 @@ Date:	Sat Oct 23 23:45:05 2010 +0100
 
     remove -ansi flag for cywin and mingw
 
- configure.ac |    8 +++++++-
+ configure.ac | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 17cdc81224c72f7b58de61734c9ead337ff7b42b
@@ -15581,7 +18764,7 @@ Date:	Sat Oct 23 23:37:59 2010 +0100
 
     update my C year
 
- poppler/SplashOutputDev.cc |	 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e09ddce7e21bbd62b384d9d59fbd1e0f14f7d05f
@@ -15590,7 +18773,7 @@ Date:	Sat Oct 23 23:33:00 2010 +0100
 
     Fix crash in malformed documents
 
- poppler/SplashOutputDev.cc |	 5 +++++
+ poppler/SplashOutputDev.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 906e4e15421d8f3f0a825ca767e5eac3169853d6
@@ -15599,7 +18782,7 @@ Date:	Sat Oct 23 23:12:44 2010 +0100
 
     Do not leak attrs1
 
- poppler/Catalog.cc |	 1 +
+ poppler/Catalog.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit ec32bb45a57a8a839156c946fcde1270aa6019d9
@@ -15608,7 +18791,7 @@ Date:	Sat Oct 23 23:00:03 2010 +0100
 
     Do not crash if n is 0
 
- poppler/Function.cc |	  3 +++
+ poppler/Function.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 9edf7e4fefb37989af9a2558aaa83d7cd4694ec6
@@ -15617,7 +18800,7 @@ Date:	Sat Oct 23 22:59:50 2010 +0100
 
     add unlikely marker
 
- poppler/Decrypt.cc |	 2 +-
+ poppler/Decrypt.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c46e863b7b94dc2f83a7d89f4afb8fe3bc8ec35c
@@ -15626,7 +18809,7 @@ Date:	Sat Oct 23 22:55:49 2010 +0100
 
     Do not divide by 0 in rc4InitKey
 
- poppler/Decrypt.cc |	 4 ++++
+ poppler/Decrypt.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit bcb13ed5828e2a855efd5e38b2acd15ca37a9991
@@ -15635,7 +18818,7 @@ Date:	Sat Oct 23 22:40:17 2010 +0100
 
     Check obj2 is a num before reading it
 
- poppler/Gfx.cc |    8 +++++++-
+ poppler/Gfx.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit c64a49307782299cb7a950a66419f9d59707f38b
@@ -15644,12 +18827,12 @@ Date:	Wed Oct 20 22:29:29 2010 +0100
 
     0.15.1
 
- CMakeLists.txt      |	  4 ++--
- NEWS		     |	 46 ++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac	     |	  2 +-
- cpp/Doxyfile	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 ++--
+ NEWS		     | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	     |	2 +-
+ cpp/Doxyfile	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  6 files changed, 52 insertions(+), 6 deletions(-)
 
 commit 3b45c66de91243d7419657512cf726c9e1c26dfb
@@ -15658,9 +18841,9 @@ Date:	Sun Oct 17 14:24:16 2010 +0100
 
     Add -bbox option to pdftotext
 
- utils/pdftotext.1  |	 4 ++
- utils/pdftotext.cc |  125
- +++++++++++++++++++++++++++++++++++++++++-----------
+ utils/pdftotext.1  |	4 ++
+ utils/pdftotext.cc | 125
+ ++++++++++++++++++++++++++++++++++++++++++-----------
  2 files changed, 103 insertions(+), 26 deletions(-)
 
 commit 71ec4c7a6715a40d536d1e4b911dae48d1bba7b9
@@ -15672,8 +18855,8 @@ Date:	Sun Oct 17 14:57:43 2010 +0200
     no radical changes, just a minor improvement for the "explicitly
     disabled" case
 
- cmake/modules/MacroOptionalFindPackage.cmake |   40
- +++++++++++++++++++-------
+ cmake/modules/MacroOptionalFindPackage.cmake | 40
+ +++++++++++++++++++++-------
  1 file changed, 30 insertions(+), 10 deletions(-)
 
 commit ab0049d8be5dfe1989c4aa33c2732915c62fecb2
@@ -15682,7 +18865,7 @@ Date:	Sun Oct 17 14:29:22 2010 +0200
 
     [CMake] Cairo package: make the version check really working
 
- cmake/modules/FindCairo.cmake |    8 ++++----
+ cmake/modules/FindCairo.cmake | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 1cea33717c92631ee9c417d9f89e32b03695c75a
@@ -15693,7 +18876,7 @@ Date:	Sun Oct 17 13:55:58 2010 +0200
 
     followup of fc9b85894754d175af916eaf6cb127efd601df7e
 
- CMakeLists.txt |    2 +-
+ CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d6f49aa2da15cd2e9cf775d6b1d2d04a005c8cdd
@@ -15702,7 +18885,7 @@ Date:	Sun Oct 17 14:22:57 2010 +0200
 
     [cairo] Fix a crash when redering documents with invalid type 3 fonts
 
- poppler/CairoFontEngine.cc |	 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e2fad550c3cbf86541730582151e1bb6470ed9c1
@@ -15711,8 +18894,8 @@ Date:	Sun Oct 17 13:47:33 2010 +0200
 
     [glib-demo] Use poppler_page_get_selected_region() in selections demo
 
- glib/demo/selections.c |   73
- +++++++++++++++---------------------------------
+ glib/demo/selections.c | 73
+ +++++++++++++++-----------------------------------
  1 file changed, 22 insertions(+), 51 deletions(-)
 
 commit 88013458e141de58ed801480707ae0dfe92b9aa2
@@ -15724,10 +18907,10 @@ Date:	Sun Oct 17 13:46:26 2010 +0200
     that returns a cairo_region_t, and deprecate
     poppler_page_get_selection_region().
 
- glib/poppler-page.cc		     |	 81
- +++++++++++++++++++++++++++++++++++
- glib/poppler-page.h		     |	  4 ++
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-page.cc		     | 81
+ +++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h		     |	4 ++
+ glib/reference/poppler-sections.txt |	1 +
  3 files changed, 86 insertions(+)
 
 commit fc9b85894754d175af916eaf6cb127efd601df7e
@@ -15736,8 +18919,8 @@ Date:	Sun Oct 17 12:54:18 2010 +0200
 
     [configure] Bump cairo dependency to 1.10
 
- configure.ac		   |	2 +-
- poppler/CairoOutputDev.cc |	4 ----
+ configure.ac		   | 2 +-
+ poppler/CairoOutputDev.cc | 4 ----
  2 files changed, 1 insertion(+), 5 deletions(-)
 
 commit dd14ef6b211ac1c8a4f16bb6094dbfd6a09cbef9
@@ -15748,9 +18931,9 @@ Date:	Sun Oct 17 12:46:55 2010 +0100
 
     Based on a patch by Paweł Wiejacha <pawel.wiejacha@gmail.com>
 
- poppler/Dict.cc |   98
- +++++++++++++++++++++++++++++++++++++++++++------------
- poppler/Dict.h  |    2 ++
+ poppler/Dict.cc | 98
+ +++++++++++++++++++++++++++++++++++++++++++++------------
+ poppler/Dict.h  |  2 ++
  2 files changed, 80 insertions(+), 20 deletions(-)
 
 commit bb38a0c71434413f2728109c73278de1b8a58571
@@ -15762,7 +18945,7 @@ Date:	Sun Oct 17 12:52:01 2010 +0200
     It's a useful tool for testing and debugging not only for people who
     install from sources.
 
- glib/demo/Makefile.am |    2 +-
+ glib/demo/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d26d0fab2ddfff853f6681a3518813a2d65a4112
@@ -15771,8 +18954,8 @@ Date:	Sun Oct 17 12:36:46 2010 +0200
 
     [glib-demo] Use printing options in print demo
 
- glib/demo/print.c |   96
- +++++++++++++++++++++++++++++++++++++++++++++++++++--
+ glib/demo/print.c | 96
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 93 insertions(+), 3 deletions(-)
 
 commit 4a71dcdd350d0c0515ca349f0b875b33289d25ee
@@ -15787,11 +18970,11 @@ Date:	Sun Oct 17 12:31:41 2010 +0200
      - Print document and markup
      - Print document and stamps
 
- glib/poppler-page.cc		     |	 77
- +++++++++++++++++++++++++++++++----
- glib/poppler-page.h		     |	  3 ++
- glib/poppler.h			     |	 19 +++++++++
- glib/reference/poppler-sections.txt |	  4 ++
+ glib/poppler-page.cc		     | 77
+ ++++++++++++++++++++++++++++++++-----
+ glib/poppler-page.h		     |	3 ++
+ glib/poppler.h			     | 19 +++++++++
+ glib/reference/poppler-sections.txt |	4 ++
  4 files changed, 94 insertions(+), 9 deletions(-)
 
 commit 0b3b2ebc3930bd46fb13fb2158fc695b0962f7c5
@@ -15800,8 +18983,8 @@ Date:	Sat Oct 16 15:09:05 2010 +0100
 
     Add a callback to know which page has been printed
 
- qt4/src/poppler-ps-converter.cc |   16 ++++++++++++++--
- qt4/src/poppler-qt4.h		 |   10 ++++++++++
+ qt4/src/poppler-ps-converter.cc | 16 ++++++++++++++--
+ qt4/src/poppler-qt4.h		 | 10 ++++++++++
  2 files changed, 24 insertions(+), 2 deletions(-)
 
 commit 4bd25223c4d15dfa91965a6e86eaa444a5a81f71
@@ -15812,7 +18995,7 @@ Date:	Sat Oct 16 15:08:05 2010 +0100
 
     Mimics Cairo backend and Adode Reader behaviour
 
- splash/SplashFTFont.cc |    4 ----
+ splash/SplashFTFont.cc | 4 ----
  1 file changed, 4 deletions(-)
 
 commit b604a008a2a379a21e5fdfa0799886f80d893a08
@@ -15821,11 +19004,11 @@ Date:	Thu Oct 14 23:56:36 2010 +0100
 
     Improve rendering of Shading Type 6 and 7
 
- poppler/Gfx.cc      |	214
- ++++++++++++++++++++++++++++++++++++++++-----------
- poppler/Gfx.h	     |	  9 ++-
- poppler/GfxState.cc |	 96 ++++++++++++++++++++++-
- poppler/GfxState.h  |	127 +++++++++++++++++++++++++++++-
+ poppler/Gfx.cc      | 214
+ +++++++++++++++++++++++++++++++++++++++++-----------
+ poppler/Gfx.h	     |	 9 ++-
+ poppler/GfxState.cc |	96 ++++++++++++++++++++++-
+ poppler/GfxState.h  | 127 ++++++++++++++++++++++++++++++-
  4 files changed, 398 insertions(+), 48 deletions(-)
 
 commit c6bb63b31c268e4e842532e6839b15edb31cf25c
@@ -15836,7 +19019,7 @@ Date:	Thu Oct 14 23:33:13 2010 +0100
 
     Fixes bug 30784
 
- poppler/Page.cc |   19 +++++++++++--------
+ poppler/Page.cc | 19 +++++++++++--------
  1 file changed, 11 insertions(+), 8 deletions(-)
 
 commit 4a248b3f523209ec16ace587229412653b2276d0
@@ -15847,7 +19030,7 @@ Date:	Thu Oct 14 18:32:05 2010 +0200
 
     including the ImgWirter.h is enough to get the definition of ImgWriter
 
- cpp/poppler-image.cpp |    1 +
+ cpp/poppler-image.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit de1501d87549269f9214c9e3fba4cbf39960826e
@@ -15856,7 +19039,7 @@ Date:	Wed Oct 13 19:18:36 2010 +0100
 
     remove windows eol
 
- poppler/Gfx.cc |   38 +++++++++++++++++++-------------------
+ poppler/Gfx.cc | 38 +++++++++++++++++++-------------------
  1 file changed, 19 insertions(+), 19 deletions(-)
 
 commit 12e68b49feef10b654944dd71eab0852cfeceb89
@@ -15873,12 +19056,12 @@ Date:	Sun Oct 10 23:04:57 2010 +0200
     Still a FIXME in the copy() method and in the save() (for mono
     images only).
 
- cpp/CMakeLists.txt	     |	  2 +
- cpp/Makefile.am	     |	  3 +
- cpp/poppler-image-private.h |	 48 +++++
- cpp/poppler-image.cpp	     |	431
- +++++++++++++++++++++++++++++++++++++++++++
- cpp/poppler-image.h	     |	 70 +++++++
+ cpp/CMakeLists.txt	     |	 2 +
+ cpp/Makefile.am	     |	 3 +
+ cpp/poppler-image-private.h |	48 +++++
+ cpp/poppler-image.cpp	     | 431
+ ++++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-image.h	     |	70 +++++++
  5 files changed, 554 insertions(+)
 
 commit db31687ba476e272b72625a8a78b50780522ee7d
@@ -15887,7 +19070,7 @@ Date:	Sat Oct 9 10:33:06 2010 +0200
 
     [glib] docs: Document poppler_annot_markup_get_date()
 
- glib/poppler-annot.cc |    9 +++++++++
+ glib/poppler-annot.cc | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit a7cf8d322a4a687c9810a577cc92ff6b9725ecdc
@@ -15899,7 +19082,7 @@ Date:	Thu Oct 7 17:28:31 2010 +0200
     Return value should be transfer full since the caller owns the only
     reference.
 
- glib/poppler-document.cc |    6 ++----
+ glib/poppler-document.cc | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit d690bea929553d1a4392d42d949843e9467ba8cb
@@ -15912,7 +19095,7 @@ Date:	Tue Oct 5 22:18:22 2010 +0100
     broken you're probably going to get a wrong rendering anyway, so who
     cares. Bug #30590
 
- poppler/Gfx.cc |    6 ++++--
+ poppler/Gfx.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit b17be2bc32cf71bac0473bf4ac16359e3027b4fc
@@ -15924,8 +19107,8 @@ Date:	Sun Oct 3 12:14:11 2010 +0200
 
     Fixes bug #30580
 
- poppler/Annot.cc |  121
- +++++++++++++++++++++++++++---------------------------
+ poppler/Annot.cc | 121
+ ++++++++++++++++++++++++++++---------------------------
  1 file changed, 61 insertions(+), 60 deletions(-)
 
 commit e3d3944c1988343704e3ba3a5d60609719466afb
@@ -15934,7 +19117,7 @@ Date:	Wed Sep 29 20:03:45 2010 +0100
 
     Fix uninitialized uses on DCTScanInfo
 
- poppler/Stream.cc |	3 +++
+ poppler/Stream.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit f380647f09d88339c936184bbe86c70c0d47de4b
@@ -15943,7 +19126,7 @@ Date:	Wed Sep 29 20:02:10 2010 +0100
 
     Free names
 
- poppler/Catalog.cc |	 1 +
+ poppler/Catalog.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit aa0fd32a8501473832bce1b8b804dd3f9a45735b
@@ -15954,13 +19137,13 @@ Date:	Mon Sep 27 22:39:09 2010 +0100
 
     Fixes bug 2807
 
- poppler/CairoOutputDev.cc  |	18 +++---------------
- poppler/CairoOutputDev.h   |	 2 --
- poppler/Gfx.cc		    |	21 +++++++++++++++++----
- poppler/PSOutputDev.cc     |	26 ++++++++++----------------
- poppler/PSOutputDev.h	    |	 3 +--
- poppler/SplashOutputDev.cc |	18 +++---------------
- poppler/SplashOutputDev.h  |	 4 +---
+ poppler/CairoOutputDev.cc  | 18 +++---------------
+ poppler/CairoOutputDev.h   |  2 --
+ poppler/Gfx.cc		    | 21 +++++++++++++++++----
+ poppler/PSOutputDev.cc     | 26 ++++++++++----------------
+ poppler/PSOutputDev.h	    |  3 +--
+ poppler/SplashOutputDev.cc | 18 +++---------------
+ poppler/SplashOutputDev.h  |  4 +---
  7 files changed, 35 insertions(+), 57 deletions(-)
 
 commit cf710b999b510203e9348ea9f04360be1fe957b8
@@ -15971,7 +19154,7 @@ Date:	Fri Sep 24 00:50:37 2010 +0200
 
     ... usable in Qt Assistant
 
- qt4/src/Doxyfile |   14 +++++++-------
+ qt4/src/Doxyfile | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit be6d933071c9ab043f01f374a884472c4ce3007e
@@ -15995,8 +19178,8 @@ Date:	Thu Sep 23 14:09:11 2010 +0200
 
     Ids are not null-terminated strings, but fixed size byte arrays.
 
- glib/demo/info.cc	  |    8 ++++++--
- glib/poppler-document.cc |   33 ++++++++++++++-------------------
+ glib/demo/info.cc	  |  8 ++++++--
+ glib/poppler-document.cc | 33 ++++++++++++++-------------------
  2 files changed, 20 insertions(+), 21 deletions(-)
 
 commit 4ffc0ed73397e4e58f04c3577b093a3fd39c22bd
@@ -16005,7 +19188,7 @@ Date:	Thu Sep 23 02:21:12 2010 +0200
 
     [cpp] small clarification in document::load_from_data() apidox
 
- cpp/poppler-document.cpp |    4 ++--
+ cpp/poppler-document.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9491dc4a10706109d0f2b4d15f21b9a1db51d8c9
@@ -16021,10 +19204,10 @@ Date:	Thu Sep 23 02:18:07 2010 +0200
     situation,
     and make sure to properly use the raw data when unlocking the document
 
- cpp/poppler-document-private.h |    5 ++++
- cpp/poppler-document.cpp	|   53
- ++++++++++++++++++++++++++++++++++++++++
- cpp/poppler-document.h		|    4 +++
+ cpp/poppler-document-private.h |  5 ++++
+ cpp/poppler-document.cpp	| 53
+ ++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-document.h		|  4 ++++
  3 files changed, 62 insertions(+)
 
 commit a3c1f2d5ea1de969e9aaaa84ee38866938b4ce0c
@@ -16033,8 +19216,8 @@ Date:	Wed Sep 22 20:14:27 2010 +0100
 
     fix copyright
 
- poppler/Form.cc |    1 +
- poppler/Form.h  |    1 +
+ poppler/Form.cc | 1 +
+ poppler/Form.h  | 1 +
  2 files changed, 2 insertions(+)
 
 commit 1aad013e353a9e59bdab8a1b4ce93f2ad7aaf4f2
@@ -16043,10 +19226,10 @@ Date:	Wed Sep 22 17:07:38 2010 +0200
 
     update copyrights
 
- cpp/poppler-document.h		 |    2 +-
- cpp/poppler-page-transition.cpp |    2 +-
- cpp/poppler-private.cpp	 |    2 +-
- cpp/poppler-rectangle.cpp	 |    2 +-
+ cpp/poppler-document.h		 | 2 +-
+ cpp/poppler-page-transition.cpp | 2 +-
+ cpp/poppler-private.cpp	 | 2 +-
+ cpp/poppler-rectangle.cpp	 | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 2d6d66ebe0215df66e33cb5974c58c324fab50b6
@@ -16055,7 +19238,7 @@ Date:	Wed Sep 22 17:07:13 2010 +0200
 
     [cpp/tests] poppler-dump: show the PDF IDs, if available
 
- cpp/tests/poppler-dump.cpp |	 6 ++++++
+ cpp/tests/poppler-dump.cpp | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit e39fde1b62544b90e73a2fc3609a260991db3a47
@@ -16066,8 +19249,8 @@ Date:	Wed Sep 22 16:52:08 2010 +0200
 
     ... to get the IDs of a PDF document, if present.
 
- cpp/poppler-document.cpp |   29 +++++++++++++++++++++++++++++
- cpp/poppler-document.h   |    1 +
+ cpp/poppler-document.cpp | 29 +++++++++++++++++++++++++++++
+ cpp/poppler-document.h   |  1 +
  2 files changed, 30 insertions(+)
 
 commit 299a1849a148fa0a7b3171c45ec68b9901aa93bb
@@ -16080,10 +19263,10 @@ Date:	Wed Sep 22 16:36:30 2010 +0200
 
     also, add two test cases for it in the metadata unit test
 
- qt4/src/poppler-document.cc  |   16 ++++++++++++++
- qt4/src/poppler-qt4.h	      |   14 ++++++++++++
- qt4/tests/check_metadata.cpp |   50
- ++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-document.cc  | 16 ++++++++++++++
+ qt4/src/poppler-qt4.h	      | 14 +++++++++++++
+ qt4/tests/check_metadata.cpp | 50
+ ++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 80 insertions(+)
 
 commit dd9bcdb720ac1bf8a022635bcbb3b56e4b75bb15
@@ -16100,7 +19283,7 @@ Date:	Wed Sep 22 16:29:46 2010 +0200
     Also, remove an hardcoded 16 and make it dependent on pdfIdLength,
     as used elsewhere in get_id() function.
 
- poppler/PDFDoc.cc |   11 ++++++-----
+ poppler/PDFDoc.cc | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 9554cbc3cb4fc0cd7ad2295f5d27a18e030c6aee
@@ -16109,7 +19292,7 @@ Date:	Wed Sep 22 12:54:25 2010 +0200
 
     [glib-demo] Show form field names in forms demo
 
- glib/demo/forms.c |   26 ++++++++++++++++++++------
+ glib/demo/forms.c | 26 ++++++++++++++++++++------
  1 file changed, 20 insertions(+), 6 deletions(-)
 
 commit 257634b26b682628dba5ee5f94cb0bad030bcb4f
@@ -16121,10 +19304,10 @@ Date:	Wed Sep 22 12:52:49 2010 +0200
 
     See bug #28780.
 
- glib/poppler-form-field.cc	     |	 68
- +++++++++++++++++++++++++++++++++++
- glib/poppler-form-field.h	     |	  3 ++
- glib/reference/poppler-sections.txt |	  3 ++
+ glib/poppler-form-field.cc	     | 68
+ +++++++++++++++++++++++++++++++++++++
+ glib/poppler-form-field.h	     |	3 ++
+ glib/reference/poppler-sections.txt |	3 ++
  3 files changed, 74 insertions(+)
 
 commit 6db98abc59c154dcb18d69fc37e44ce804c3ccc9
@@ -16135,9 +19318,9 @@ Date:	Wed Sep 22 12:41:16 2010 +0200
 
     See bug #28780.
 
- poppler/Form.cc |   64
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Form.h  |    8 +++++++
+ poppler/Form.cc | 64
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Form.h  |  8 ++++++++
  2 files changed, 72 insertions(+)
 
 commit bcdca66fd57439735e0b9aa182ab7cfce29e9ed0
@@ -16148,7 +19331,7 @@ Date:	Tue Sep 21 11:49:37 2010 +0200
 
     It should be -1 which means there's no date specified
 
- glib/poppler-document.cc |    4 ++--
+ glib/poppler-document.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d2578bd66129466b2dd114b6407c147598e09d2b
@@ -16160,8 +19343,8 @@ Date:	Tue Sep 21 19:19:27 2010 +0100
     Fixes crash in broken pdf provided by Joel Voss of Leviathan
     Security Group
 
- poppler/Dict.h  |    3 +++
- poppler/Form.cc |   27 ++++++++++++++++++++++++---
+ poppler/Dict.h  |  3 +++
+ poppler/Form.cc | 27 ++++++++++++++++++++++++---
  2 files changed, 27 insertions(+), 3 deletions(-)
 
 commit 2fe825deac055be82b220d0127169cb3d61387a8
@@ -16173,7 +19356,7 @@ Date:	Tue Sep 21 19:15:25 2010 +0100
     Fixes crash in broken pdf provided by Joel Voss of Leviathan
     Security Group
 
- poppler/Gfx.cc |   20 ++++++++++++++++----
+ poppler/Gfx.cc | 20 ++++++++++++++++----
  1 file changed, 16 insertions(+), 4 deletions(-)
 
 commit 473de6f88a055bb03470b4af5fa584be8cb5fda4
@@ -16184,7 +19367,7 @@ Date:	Tue Sep 21 19:11:42 2010 +0100
 
     Found thanks to PDF provided by Joel Voss of Leviathan Security Group
 
- poppler/Form.cc |    5 +++--
+ poppler/Form.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 9706e28657ff7ea52aa69d9efb3f91d0cfaee70b
@@ -16195,7 +19378,7 @@ Date:	Tue Sep 21 19:09:37 2010 +0100
 
     Found thanks to PDF provided by Joel Voss of Leviathan Security Group
 
- poppler/Function.cc |	  2 +-
+ poppler/Function.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 26a5817ffec9f05ac63db6c5cd5b1f0871d271c7
@@ -16207,7 +19390,7 @@ Date:	Tue Sep 21 19:08:54 2010 +0100
     Fixes crash in broken pdf provided by Joel Voss of Leviathan
     Security Group
 
- poppler/Function.cc |	  6 +++++-
+ poppler/Function.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit dfdf3602bde47d1be7788a44722c258bfa0c6d6e
@@ -16221,7 +19404,7 @@ Date:	Tue Sep 21 19:07:12 2010 +0100
 
     Found thanks to PDF provided by Joel Voss of Leviathan Security Group
 
- poppler/Gfx.cc |    8 ++++++++
+ poppler/Gfx.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 01c85c08305bae16242f5979ab107fa5bb5f5100
@@ -16230,7 +19413,7 @@ Date:	Tue Sep 21 19:04:37 2010 +0100
 
     Forgot my (C) here
 
- poppler/Decrypt.cc |	 2 +-
+ poppler/Decrypt.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bf2055088a3a2d3bb3d3c37d464954ec1a25771f
@@ -16242,7 +19425,7 @@ Date:	Tue Sep 21 19:03:19 2010 +0100
     Fixes crash in broken pdf provided by Joel Voss of Leviathan
     Security Group
 
- poppler/Function.cc |	  1 +
+ poppler/Function.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit e853106b58d6b4b0467dbd6436c9bb1cfbd372cf
@@ -16254,7 +19437,7 @@ Date:	Tue Sep 21 19:01:36 2010 +0100
     Fixes crash in broken pdf provided by Joel Voss of Leviathan
     Security Group
 
- poppler/Gfx.cc |    2 ++
+ poppler/Gfx.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 3422638b2a39cbdd33a114a7d7debc0a5f688501
@@ -16265,7 +19448,7 @@ Date:	Tue Sep 21 18:58:43 2010 +0100
 
     Found thanks to PDF provided by Joel Voss of Leviathan Security Group
 
- poppler/Gfx.cc |    9 +++++++--
+ poppler/Gfx.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit a2dab0238a69240dad08eca2083110b52ce488b7
@@ -16277,7 +19460,7 @@ Date:	Tue Sep 21 18:55:51 2010 +0100
     It is possible that there are calls to getPos before reset
     Found thanks to PDF provided by Joel Voss of Leviathan Security Group
 
- poppler/Decrypt.cc |	 2 ++
+ poppler/Decrypt.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 39d140bfc0b8239bdd96d6a55842034ae5c05473
@@ -16288,7 +19471,7 @@ Date:	Tue Sep 21 18:54:31 2010 +0100
 
     Found thanks to PDF provided by Joel Voss of Leviathan Security Group
 
- fofi/FoFiType1.cc |	5 +++--
+ fofi/FoFiType1.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit c6a091512745771894b54a71613fd6b5ca1adcb3
@@ -16299,7 +19482,7 @@ Date:	Tue Sep 21 18:50:25 2010 +0100
 
     Found thanks to PDF provided by Joel Voss of Leviathan Security Group
 
- poppler/Stream.cc |	1 +
+ poppler/Stream.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 9b6ddb68b80ef19cd2615900bd24da76374003d9
@@ -16308,8 +19491,8 @@ Date:	Mon Sep 20 19:47:47 2010 +0100
 
     Fix copyright
 
- poppler/PDFDoc.cc |	1 +
- poppler/PDFDoc.h  |	1 +
+ poppler/PDFDoc.cc | 1 +
+ poppler/PDFDoc.h  | 1 +
  2 files changed, 2 insertions(+)
 
 commit fa3abc23656204eedd022ee1c73d9e5af758cdac
@@ -16318,10 +19501,10 @@ Date:	Fri Sep 17 22:20:09 2010 +0200
 
     [cpp] More bits of API documentation.
 
- cpp/poppler-global.cpp		 |  124
- +++++++++++++++++++++++++++++++++++++++
- cpp/poppler-page-transition.cpp |   32 ++++++++++
- cpp/poppler-rectangle.cpp	 |   19 ++++++
+ cpp/poppler-global.cpp		 | 124
+ ++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-page-transition.cpp |  32 +++++++++++
+ cpp/poppler-rectangle.cpp	 |  19 ++++++
  3 files changed, 175 insertions(+)
 
 commit c5f7b5becc9993c05b67a470d5a1e431806b98d6
@@ -16330,8 +19513,8 @@ Date:	Fri Sep 17 20:26:37 2010 +0200
 
     update copyrights
 
- qt4/src/poppler-private.cc  |	  2 +-
- qt4/tests/check_strings.cpp |	 18 ++++++++++++++++++
+ qt4/src/poppler-private.cc  |	2 +-
+ qt4/tests/check_strings.cpp | 18 ++++++++++++++++++
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 commit ae517042570327b860c1db6b68f9697d5c104657
@@ -16342,7 +19525,7 @@ Date:	Fri Sep 17 19:39:10 2010 +0200
 
     (although IMHO not yet solved)
 
- cpp/poppler-private.cpp |    8 ++++----
+ cpp/poppler-private.cpp | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit f4c6ef88f01f6763943a3e6e006e52dbea0b149c
@@ -16354,7 +19537,7 @@ Date:	Fri Sep 17 16:07:05 2010 +0200
 
     not much test data at the moment though
 
- qt4/tests/check_strings.cpp |	 37 +++++++++++++++++++++++++++++++++++++
+ qt4/tests/check_strings.cpp | 37 +++++++++++++++++++++++++++++++++++++
  1 file changed, 37 insertions(+)
 
 commit ffd227b7669895325d752009d5185973cf86ce5b
@@ -16373,7 +19556,7 @@ Date:	Fri Sep 17 14:25:57 2010 +0200
     this should reduce of a very little bit the memory usage, while give
     a sensible speedup of UnicodeParsedString invocations
 
- qt4/src/poppler-private.cc |	 4 +++-
+ qt4/src/poppler-private.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 6180890008f2b1814f092f50b8f75376399905ba
@@ -16384,8 +19567,8 @@ Date:	Fri Sep 17 13:23:25 2010 +0200
 
     very simple test data for it, at the moment
 
- qt4/tests/check_strings.cpp |	 48
- +++++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/check_strings.cpp | 48
+ +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 48 insertions(+)
 
 commit c5f78d7d3953d62a746c6f5a90085ea020fe5ec7
@@ -16398,7 +19581,7 @@ Date:	Fri Sep 17 12:54:32 2010 +0200
     run (eg in benchmarks),
     making sure they all are properly freed
 
- qt4/tests/check_strings.cpp |	 35 ++++++++++++++++++++++++++++++-----
+ qt4/tests/check_strings.cpp | 35 ++++++++++++++++++++++++++++++-----
  1 file changed, 30 insertions(+), 5 deletions(-)
 
 commit 0cd5a256bdf7778c0c720941a611ad8ab56fa2e9
@@ -16417,10 +19600,10 @@ Date:	Fri Sep 17 00:27:53 2010 +0200
     given private symbols are used, this unit test is not compiled on
     windows (at least, it supposed to be so)
 
- qt4/tests/CMakeLists.txt    |	  3 ++
- qt4/tests/Makefile.am	     |	  7 ++-
- qt4/tests/check_strings.cpp |	101
- +++++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/CMakeLists.txt    |	 3 ++
+ qt4/tests/Makefile.am	     |	 7 ++-
+ qt4/tests/check_strings.cpp | 101
+ ++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 110 insertions(+), 1 deletion(-)
 
 commit c6e8b21c9829672e6ca42e6cdc0ca631a06af73f
@@ -16429,8 +19612,8 @@ Date:	Fri Sep 17 13:44:38 2010 +0200
 
     [glib] docs: Document PopplerDocument properties
 
- glib/poppler-document.cc |  380
- +++++++++++++++++++++++++++-------------------
+ glib/poppler-document.cc | 380
+ +++++++++++++++++++++++++++--------------------
  1 file changed, 223 insertions(+), 157 deletions(-)
 
 commit d4a6c17255821925906c17b79b88eebed9edfee1
@@ -16442,11 +19625,11 @@ Date:	Fri Sep 17 13:04:33 2010 +0200
     PopplerDocument:linearized is now a boolean value rather than string,
     so this commit breaks the API again.
 
- glib/demo/info.cc		     |	  8 +-
- glib/poppler-document.cc	     |	532
- ++++++++++++++++++++++++++++-------
- glib/poppler-document.h	     |	 74 +++--
- glib/reference/poppler-sections.txt |	 16 ++
+ glib/demo/info.cc		     |	 8 +-
+ glib/poppler-document.cc	     | 532
+ +++++++++++++++++++++++++++++-------
+ glib/poppler-document.h	     |	74 +++--
+ glib/reference/poppler-sections.txt |	16 ++
  4 files changed, 498 insertions(+), 132 deletions(-)
 
 commit a5fec843dbb40fdd2007b926405b96789b21496d
@@ -16455,7 +19638,7 @@ Date:	Fri Sep 17 10:38:14 2010 +0200
 
     [glib-demo] Show permanent/update ID in document info demo
 
- glib/demo/info.cc |	9 +++++++++
+ glib/demo/info.cc | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit bfaf8f3cc62f28c6255d42680b9464ab9973737e
@@ -16464,10 +19647,10 @@ Date:	Fri Sep 17 10:37:32 2010 +0200
 
     [glib] Add poppler_document_get_id() to get the PDF file identifier
 
- glib/poppler-document.cc	     |	 52
- +++++++++++++++++++++++++++++++++++
- glib/poppler-document.h	     |	  3 ++
- glib/reference/poppler-sections.txt |	  1 +
+ glib/poppler-document.cc	     | 52
+ +++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h	     |	3 +++
+ glib/reference/poppler-sections.txt |	1 +
  3 files changed, 56 insertions(+)
 
 commit b15641677447b2e89853a667fc34bcca1383a97a
@@ -16476,9 +19659,9 @@ Date:	Fri Sep 17 10:36:22 2010 +0200
 
     Add a method to get the PDF file identifier
 
- poppler/PDFDoc.cc |   65
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/PDFDoc.h  |	3 +++
+ poppler/PDFDoc.cc | 65
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PDFDoc.h  |  3 +++
  2 files changed, 68 insertions(+)
 
 commit 3b4a901a4431814590449b6cd5ea418f4d6c1172
@@ -16492,12 +19675,12 @@ Date:	Thu Sep 16 23:23:03 2010 +0100
     OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar
     Potdar (onkar@cdacmumbai.in)
 
- utils/HtmlFonts.cc	|   11 +++++--
- utils/HtmlFonts.h	|   18 +++++++++--
- utils/HtmlOutputDev.cc |   84
- ++++++++++++++++++++++++++++++------------------
- utils/pdftohtml.1	|    3 ++
- utils/pdftohtml.cc	|   15 +++++++--
+ utils/HtmlFonts.cc	| 11 +++++--
+ utils/HtmlFonts.h	| 18 +++++++++--
+ utils/HtmlOutputDev.cc | 84
+ +++++++++++++++++++++++++++++++-------------------
+ utils/pdftohtml.1	|  3 ++
+ utils/pdftohtml.cc	| 15 +++++++--
  5 files changed, 93 insertions(+), 38 deletions(-)
 
 commit 2792330f6caeeb42e2996271456b562489215c4c
@@ -16506,14 +19689,14 @@ Date:	Wed Sep 15 22:42:09 2010 +0100
 
     new soversions
 
- CMakeLists.txt		|    2 +-
- cpp/CMakeLists.txt	|    2 +-
- cpp/Makefile.am	|    2 +-
- glib/CMakeLists.txt	|    2 +-
- glib/Makefile.am	|    4 ++--
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		| 2 +-
+ cpp/CMakeLists.txt	| 2 +-
+ cpp/Makefile.am	| 2 +-
+ glib/CMakeLists.txt	| 2 +-
+ glib/Makefile.am	| 4 ++--
+ poppler/Makefile.am	| 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am	| 2 +-
  8 files changed, 9 insertions(+), 9 deletions(-)
 
 commit 1cf56c732b63d0a310bc45b8e4b3f3f357a42cb1
@@ -16522,10 +19705,10 @@ Date:	Wed Sep 15 20:56:42 2010 +0100
 
     0.15.0 in the versions
 
- CMakeLists.txt   |    2 +-
- configure.ac	  |    2 +-
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ cpp/Doxyfile	  | 2 +-
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 4ec0be498b557c3cf631e43823c6d7004304dff3
@@ -16534,8 +19717,8 @@ Date:	Wed Sep 15 20:56:34 2010 +0100
 
     0.15.0 NEWS
 
- NEWS |   90
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 90
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 90 insertions(+)
 
 commit c01a17745c04aef3e6f2225679c867a03e731e83
@@ -16547,7 +19730,7 @@ Date:	Thu Sep 16 20:55:56 2010 +0200
     it cannot complete the scanning propecure correctly without libtool
     it seems
 
- CMakeLists.txt |    4 ++--
+ CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9be7d3143b12f291409f88f3d725a239934b205e
@@ -16556,7 +19739,7 @@ Date:	Wed Sep 15 19:19:30 2010 +0100
 
     update copyright
 
- poppler/OptionalContent.cc |	 2 +-
+ poppler/OptionalContent.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b9333529bba43a71655fdbf1919ba515f7df9ca3
@@ -16569,7 +19752,7 @@ Date:	Wed Sep 15 17:23:54 2010 +0200
     so we have a chance to better output the bytearray of a string to
     the stream
 
- cpp/tests/poppler-dump.cpp |	26 ++++++++++++++++++--------
+ cpp/tests/poppler-dump.cpp | 26 ++++++++++++++++++--------
  1 file changed, 18 insertions(+), 8 deletions(-)
 
 commit a44f711b4412332875337e9fb7509f18db806ddc
@@ -16580,7 +19763,7 @@ Date:	Wed Sep 15 16:44:30 2010 +0200
 
     ... to show the text of a page in the specified layout
 
- cpp/tests/poppler-dump.cpp |	29 +++++++++++++++++++++++++++++
+ cpp/tests/poppler-dump.cpp | 29 +++++++++++++++++++++++++++++
  1 file changed, 29 insertions(+)
 
 commit 0094c9372b5b439af2564d83d6fb7439f4bdba88
@@ -16595,8 +19778,8 @@ Date:	Wed Sep 15 13:19:13 2010 +0200
     (= physical)
     add & adapt the apidox accordingly
 
- cpp/poppler-page.cpp |   27 +++++++++++++++++++++++++--
- cpp/poppler-page.h   |    5 +++++
+ cpp/poppler-page.cpp | 27 +++++++++++++++++++++++++--
+ cpp/poppler-page.h   |  5 +++++
  2 files changed, 30 insertions(+), 2 deletions(-)
 
 commit 4ec3e7784cdba5c0720b1992ba500e97a7e0ed2b
@@ -16607,7 +19790,7 @@ Date:	Wed Sep 15 11:24:07 2010 +0200
 
     There's a test case using BaseState attached to bug #30106
 
- poppler/OptionalContent.cc |	14 +++++++++-----
+ poppler/OptionalContent.cc | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 commit f49aa86812ed8ad91d41c675bc670b3d88d3444a
@@ -16616,7 +19799,7 @@ Date:	Mon Sep 13 14:37:10 2010 +0200
 
     [glib] doc: Document PopplerPage:label property
 
- glib/poppler-page.cc |    5 +++++
+ glib/poppler-page.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit f41fe7ae6e374100574c49d1bb7a3ddc646786c8
@@ -16625,7 +19808,7 @@ Date:	Mon Sep 13 14:36:43 2010 +0200
 
     [glib] doc: Add poppler_page_get_label to poppler-sections.txt
 
- glib/reference/poppler-sections.txt |	  1 +
+ glib/reference/poppler-sections.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 91b8246766a8e5d9cca385b5854667d7967a9d71
@@ -16634,7 +19817,7 @@ Date:	Mon Sep 13 14:22:56 2010 +0200
 
     [glib-demo] Use poppler_page_get_label() instead of g_object_get()
 
- glib/demo/page.c |    2 +-
+ glib/demo/page.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b82412ef86091f4d249c818cebf00e4c59bae311
@@ -16645,9 +19828,8 @@ Date:	Mon Sep 13 14:22:03 2010 +0200
 
     It's just an accessor for the property label
 
- glib/poppler-page.cc |   47
- ++++++++++++++++++++++++++++++++++-------------
- glib/poppler-page.h  |    1 +
+ glib/poppler-page.cc | 47 ++++++++++++++++++++++++++++++++++-------------
+ glib/poppler-page.h  |  1 +
  2 files changed, 35 insertions(+), 13 deletions(-)
 
 commit ff88abf61f4bf90ad276a8593be1818d39c8ecac
@@ -16656,9 +19838,9 @@ Date:	Mon Sep 13 10:05:45 2010 +0200
 
     [glib] Avoid core headers to be parsed by the g-i scanner
 
- glib/poppler-document.cc |    2 ++
- glib/poppler-page.cc	  |    2 ++
- glib/poppler-private.h   |    3 +++
+ glib/poppler-document.cc | 2 ++
+ glib/poppler-page.cc	  | 2 ++
+ glib/poppler-private.h   | 3 +++
  3 files changed, 7 insertions(+)
 
 commit 53324502898ae5fbbb21a4fb819e4a84acdc1a64
@@ -16670,7 +19852,7 @@ Date:	Sun Sep 12 11:42:03 2010 +0200
     Some layers are just the parent of others, but not actually a layer so
     they don't have an optional content object. Fixes bug #30106.
 
- glib/poppler-action.cc |   15 +++++++++------
+ glib/poppler-action.cc | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 commit dfc6ea7877635212aa7c5f7ade07af4aa9467e96
@@ -16681,7 +19863,7 @@ Date:	Sun Sep 12 11:36:58 2010 +0200
 
     Fixes layers for document attached to bug #30106.
 
- glib/poppler-document.cc |    1 +
+ glib/poppler-document.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 7574912b6c0ff0421c69b6e8c6835957d5126d7d
@@ -16692,8 +19874,8 @@ Date:	Thu Sep 9 20:34:03 2010 +0100
 
     Bug 29329
 
- poppler/StdinCachedFile.cc |	 2 +-
- utils/pdftoppm.cc	    |	 2 +-
+ poppler/StdinCachedFile.cc | 2 +-
+ utils/pdftoppm.cc	    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 2fc83068c32e09fa3de03a157a420490431ea706
@@ -16706,7 +19888,7 @@ Date:	Sun Sep 5 14:26:27 2010 +0100
     increase
     in the firefox nytimes advertisment pdf
 
- splash/SplashFont.cc |    8 ++++++--
+ splash/SplashFont.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 0d96f74f31171c58a55e4ac36d492ce36dd5e7c5
@@ -16719,10 +19901,10 @@ Date:	Sun Sep 5 12:31:57 2010 +0100
     Passes regression tests
     Based on Paweł Wiejacha patches
 
- poppler/GfxFont.cc	      |   17 ++++++---------
- splash/SplashXPath.cc	      |   48
- +++++++++++++++++++++++++++---------------
- splash/SplashXPathScanner.cc |   10 +++++----
+ poppler/GfxFont.cc	      | 17 +++++++---------
+ splash/SplashXPath.cc	      | 48
+ ++++++++++++++++++++++++++++----------------
+ splash/SplashXPathScanner.cc | 10 +++++----
  3 files changed, 44 insertions(+), 31 deletions(-)
 
 commit 3b4816b2b8caa0e2baafbe4c0eb1e45e452d01ce
@@ -16731,8 +19913,7 @@ Date:	Wed Sep 1 20:43:35 2010 +0100
 
     forgot the file
 
- qt4/tests/poppler-texts.cpp |	 40
- ++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/poppler-texts.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)
 
 commit b0db93c71a83946aa3e02bae6b396223dcca19d1
@@ -16741,8 +19922,8 @@ Date:	Wed Sep 1 20:43:14 2010 +0100
 
     add since and rename enum
 
- qt4/src/poppler-page.cc |    2 +-
- qt4/src/poppler-qt4.h	 |    5 ++++-
+ qt4/src/poppler-page.cc | 2 +-
+ qt4/src/poppler-qt4.h	 | 5 ++++-
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit a86f9d90be99a36c41c6932fb4d9a202c4ff6d05
@@ -16751,7 +19932,7 @@ Date:	Wed Sep 1 20:20:48 2010 +0100
 
     Clarify the ownership
 
- qt4/src/poppler-qt4.h |    2 ++
+ qt4/src/poppler-qt4.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 33ad3a17ac26879fcd6a7fad2023dd219bc5919f
@@ -16760,11 +19941,11 @@ Date:	Wed Sep 1 20:19:54 2010 +0100
 
     Add a way to access the raw text
 
- poppler/TextOutputDev.cc |   23 ++++++++++++++++++++---
- qt4/src/poppler-page.cc  |   11 +++++++++--
- qt4/src/poppler-qt4.h	  |   19 +++++++++++++++++++
- qt4/tests/CMakeLists.txt |    1 +
- qt4/tests/Makefile.am	  |    7 ++++++-
+ poppler/TextOutputDev.cc | 23 ++++++++++++++++++++---
+ qt4/src/poppler-page.cc  | 11 +++++++++--
+ qt4/src/poppler-qt4.h	  | 19 +++++++++++++++++++
+ qt4/tests/CMakeLists.txt |  1 +
+ qt4/tests/Makefile.am	  |  7 ++++++-
  5 files changed, 55 insertions(+), 6 deletions(-)
 
 commit 46e89248b3c5b1789baa3bd9bfa012570720ddb5
@@ -16773,8 +19954,8 @@ Date:	Wed Sep 1 19:54:02 2010 +0100
 
     quadding is not a GBool but an int
 
- poppler/Annot.cc |    2 +-
- poppler/Annot.h  |    4 ++--
+ poppler/Annot.cc | 2 +-
+ poppler/Annot.h  | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit ae79fc504c5424be2fa21dbc5498ced4db6e5dd3
@@ -16786,15 +19967,15 @@ Date:	Tue Aug 31 22:14:57 2010 +0100
     Passes the regression tests and might make things faster and use a bit
     less memory
 
- cpp/tests/CMakeLists.txt |    2 +-
- cpp/tests/Makefile.am	  |    2 +-
- goo/gtypes.h		  |    7 +-
- utils/CMakeLists.txt	  |    2 +-
- utils/Makefile.am	  |    2 +-
- utils/parseargs.c	  |  208
- ----------------------------------------------
- utils/parseargs.cc	  |  208
- ++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/tests/CMakeLists.txt |   2 +-
+ cpp/tests/Makefile.am	  |   2 +-
+ goo/gtypes.h		  |   7 +-
+ utils/CMakeLists.txt	  |   2 +-
+ utils/Makefile.am	  |   2 +-
+ utils/parseargs.c	  | 208
+ -----------------------------------------------
+ utils/parseargs.cc	  | 208
+ +++++++++++++++++++++++++++++++++++++++++++++++
  7 files changed, 216 insertions(+), 215 deletions(-)
 
 commit d3f32f2c4f9f46620c0287c44bef686f340461f3
@@ -16805,7 +19986,7 @@ Date:	Tue Aug 31 18:51:17 2010 +0100
 
     Fixes crash on KDE bug 249586
 
- poppler/Movie.cc |    3 ++-
+ poppler/Movie.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 681bb38eafc720b309172ed7c650439c559663a0
@@ -16814,7 +19995,7 @@ Date:	Thu Aug 26 23:55:58 2010 +0100
 
     Make declaration match what there is in the .cc file
 
- poppler/TextOutputDev.h |    4 ++--
+ poppler/TextOutputDev.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c91e869304fc263c52f21ee484a57a6f1900f6b2
@@ -16825,8 +20006,8 @@ Date:	Thu Aug 26 19:40:46 2010 +0100
 
     Fixes bug 29551
 
- utils/pdftohtml.1  |	 3 +++
- utils/pdftohtml.cc |	18 +++++++++++++-----
+ utils/pdftohtml.1  |  3 +++
+ utils/pdftohtml.cc | 18 +++++++++++++-----
  2 files changed, 16 insertions(+), 5 deletions(-)
 
 commit 9b4be586640b4ad344b1b3ed4c9cda8351257f0c
@@ -16835,7 +20016,7 @@ Date:	Wed Aug 25 19:26:30 2010 +0100
 
     Use 3 not nComps
 
- poppler/GfxState.cc |	  2 +-
+ poppler/GfxState.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 218f67c527fb41babf2703ba068d072f8326e37b
@@ -16846,7 +20027,7 @@ Date:	Tue Aug 24 23:47:06 2010 +0100
 
     By using getRGBLine when possible
 
- poppler/SplashOutputDev.cc |	39 ++++++++++++++++++++++++++++++---------
+ poppler/SplashOutputDev.cc | 39 ++++++++++++++++++++++++++++++---------
  1 file changed, 30 insertions(+), 9 deletions(-)
 
 commit 868f4a1f22051b7978f47a0614f23fd66dbb7ca8
@@ -16857,8 +20038,8 @@ Date:	Tue Aug 24 23:35:21 2010 +0100
 
     By calling doTransform less
 
- poppler/GfxState.cc |	 15 +++++++--------
- poppler/GfxState.h  |	  4 +++-
+ poppler/GfxState.cc | 15 +++++++--------
+ poppler/GfxState.h  |	4 +++-
  2 files changed, 10 insertions(+), 9 deletions(-)
 
 commit 46e37c54c6365cf37dc1e223a3c146e7b96a56af
@@ -16867,7 +20048,7 @@ Date:	Tue Aug 24 21:23:34 2010 +0100
 
     Do not call pow three times when one is enough
 
- poppler/GfxState.cc |	 12 ++++++------
+ poppler/GfxState.cc | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 8591c804598576556c6d24a66b6648de8ed1c4eb
@@ -16878,9 +20059,9 @@ Date:	Sun Aug 22 22:01:03 2010 +0100
 
     Patch in bug 19404, should fix 9746 too
 
- utils/pdftohtml.1  |	 8 +-
- utils/pdftohtml.cc |  210
- +++++++++++++++++++++++++++++++++++++---------------
+ utils/pdftohtml.1  |	8 +-
+ utils/pdftohtml.cc | 210
+ ++++++++++++++++++++++++++++++++++++++---------------
  2 files changed, 158 insertions(+), 60 deletions(-)
 
 commit 7fc3c21a8c5d6cf8517100427b182887a9569ed0
@@ -16891,10 +20072,10 @@ Date:	Fri Aug 20 20:24:31 2010 +0100
 
     Patch in bug 29189, fixes bug 3870
 
- poppler/PDFDoc.cc |   24 ++++++++++++----
- poppler/XRef.cc   |   80
- ++++++++++++++++++++++++++++++-----------------------
- poppler/XRef.h    |	5 ++--
+ poppler/PDFDoc.cc | 24 +++++++++++++----
+ poppler/XRef.cc   | 80
+ ++++++++++++++++++++++++++++++++-----------------------
+ poppler/XRef.h    |  5 ++--
  3 files changed, 68 insertions(+), 41 deletions(-)
 
 commit bedf48d4397ae412a6d28fc8fea16cc23a29f07c
@@ -16903,7 +20084,7 @@ Date:	Tue Aug 17 22:02:59 2010 +0100
 
     use memset instead of a for
 
- splash/Splash.cc |    4 +---
+ splash/Splash.cc | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 03ca5b4a5c9964d9c0e9913eb2061692848c4b95
@@ -16912,14 +20093,14 @@ Date:	Tue Aug 10 19:55:31 2010 +0100
 
     Update copyrights
 
- goo/GooTimer.cc	       |    1 +
- goo/GooTimer.h		       |    1 +
- goo/gfile.cc		       |    2 +-
- poppler/DCTStream.cc	       |    1 +
- poppler/DCTStream.h	       |    1 +
- poppler/GfxState.cc	       |    2 +-
- poppler/Page.cc	       |    2 +-
- qt4/src/poppler-annotation.cc |    2 +-
+ goo/GooTimer.cc	       | 1 +
+ goo/GooTimer.h		       | 1 +
+ goo/gfile.cc		       | 2 +-
+ poppler/DCTStream.cc	       | 1 +
+ poppler/DCTStream.h	       | 1 +
+ poppler/GfxState.cc	       | 2 +-
+ poppler/Page.cc	       | 2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
  8 files changed, 8 insertions(+), 4 deletions(-)
 
 commit 3bca8ddc10bf4291bf0c0e39c67341a05953e949
@@ -16930,8 +20111,8 @@ Date:	Tue Aug 10 19:42:40 2010 +0100
 
     Bug #29329
 
- poppler/StdinCachedFile.cc |	 9 +++++++++
- utils/pdftoppm.cc	    |	 9 +++++++++
+ poppler/StdinCachedFile.cc | 9 +++++++++
+ utils/pdftoppm.cc	    | 9 +++++++++
  2 files changed, 18 insertions(+)
 
 commit bdd617f2177a7836f6b6686fde892664513a32a7
@@ -16942,7 +20123,7 @@ Date:	Tue Aug 3 13:05:26 2010 +0200
 
     Fixes bug #28842.
 
- glib/poppler-layer.cc |    4 +++-
+ glib/poppler-layer.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit e9f0646ca664cc27825f7e084f8419fe0de1fcfc
@@ -16955,7 +20136,7 @@ Date:	Tue Aug 3 13:02:52 2010 +0200
     Fixes a crash reproducible with gtk-splash-test when opening document
     attached to bug #28842.
 
- poppler/PDFDoc.cc |   27 +++++++++++++++------------
+ poppler/PDFDoc.cc | 27 +++++++++++++++------------
  1 file changed, 15 insertions(+), 12 deletions(-)
 
 commit 842209782ca3ba8c1c783cccf565372a18b3fda5
@@ -16967,7 +20148,7 @@ Date:	Fri Jul 30 19:29:12 2010 +0100
     Fixes crash in file in kde bug 246269. The output is still wrong
     though
 
- fofi/FoFiType1C.cc |	12 +++++++-----
+ fofi/FoFiType1C.cc | 12 +++++++-----
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 commit 0dd7c80b7baf2622eb4780a867c4dc6291773f3b
@@ -16979,7 +20160,7 @@ Date:	Mon Jul 26 23:58:26 2010 +0100
     Recommended by Koji Otani in Re: [poppler] Question about code
     Passed the regression testing in my files
 
- poppler/GfxState.cc |	  1 -
+ poppler/GfxState.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 627edf88c8f5c073a68bd05990df56e1af547292
@@ -16993,7 +20174,7 @@ Date:	Sun Jul 25 13:56:03 2010 +0200
     object is
     actually de page object.
 
- poppler/Page.cc |    5 ++++-
+ poppler/Page.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 5d86f9b600b1e10de93bcaf1b925fadbc2a47522
@@ -17002,7 +20183,7 @@ Date:	Sat Jul 24 15:12:05 2010 +0100
 
     reindent correctly
 
- poppler/TextOutputDev.cc |   34 +++++++++++++++++-----------------
+ poppler/TextOutputDev.cc | 34 +++++++++++++++++-----------------
  1 file changed, 17 insertions(+), 17 deletions(-)
 
 commit d0a6f9abdab88ec43004b6766337db304cbf6a25
@@ -17015,8 +20196,8 @@ Date:	Thu Jul 22 21:28:55 2010 +0200
     correctly include_directories() for the include dirs, while add the
     cflags which are not include dirs as definitions
 
- glib/CMakeLists.txt	  |    5 +++--
- glib/demo/CMakeLists.txt |    5 ++++-
+ glib/CMakeLists.txt	  | 5 +++--
+ glib/demo/CMakeLists.txt | 5 ++++-
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 02d85dd2cc154dbb6caa04a349532033d833edd1
@@ -17025,8 +20206,8 @@ Date:	Tue Jul 20 13:53:56 2010 +0200
 
     [glib-demo] Add support for adding annots in annot demo
 
- glib/demo/annots.c |  114
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/annots.c | 114
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 114 insertions(+)
 
 commit 969cb850f5c2bc31de82c591b2b3210b5cfabf5f
@@ -17035,7 +20216,7 @@ Date:	Tue Jul 20 13:53:29 2010 +0200
 
     [glib] docs: Add new symbols to poppler-sections.txt
 
- glib/reference/poppler-sections.txt |	 18 ++++++++++++++++++
+ glib/reference/poppler-sections.txt | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 251959438b6257fe71ed58e79eec60cda68a66cf
@@ -17044,9 +20225,9 @@ Date:	Tue Jul 20 13:53:00 2010 +0200
 
     [glib] Add poppler_page_add_annot()
 
- glib/poppler-document.cc |    7 ++++---
- glib/poppler-page.cc	  |   19 +++++++++++++++++++
- glib/poppler-page.h	  |    2 ++
+ glib/poppler-document.cc |  7 ++++---
+ glib/poppler-page.cc	  | 19 +++++++++++++++++++
+ glib/poppler-page.h	  |  2 ++
  3 files changed, 25 insertions(+), 3 deletions(-)
 
 commit 78a4f6976e708f2cc23aac49fbff0faf00e74bc3
@@ -17055,10 +20236,10 @@ Date:	Tue Jul 20 13:51:16 2010 +0200
 
     [glib] annots: Add several setter methods
 
- glib/poppler-annot.cc	|  278
- +++++++++++++++++++++++++++++++++++++++++++-----
- glib/poppler-annot.h	|   26 +++++
- glib/poppler-private.h |    6 ++
+ glib/poppler-annot.cc	| 278
+ ++++++++++++++++++++++++++++++++++++++++++++-----
+ glib/poppler-annot.h	|  26 +++++
+ glib/poppler-private.h |   6 ++
  3 files changed, 285 insertions(+), 25 deletions(-)
 
 commit fee488c9db60ab691ce9ff5eef284be2af897aee
@@ -17067,8 +20248,8 @@ Date:	Sun Jul 18 11:26:59 2010 +0200
 
     [annots] Add AnnotMarkup::setOpacity
 
- poppler/Annot.cc |    8 ++++++++
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 8 ++++++++
+ poppler/Annot.h  | 1 +
  2 files changed, 9 insertions(+)
 
 commit d15a355ede2d8510c4df847ea0b92b5357b29914
@@ -17078,9 +20259,9 @@ Date:	Sun Jul 18 09:57:35 2010 +0200
     Set the page reference (P in annot dict) when adding a new annot to
     a page
 
- poppler/Annot.cc |    9 +++++++++
- poppler/Annot.h  |    3 +++
- poppler/Page.cc  |    2 ++
+ poppler/Annot.cc | 9 +++++++++
+ poppler/Annot.h  | 3 +++
+ poppler/Page.cc  | 2 ++
  3 files changed, 14 insertions(+)
 
 commit 49ffb46db3118db874d2d9830bb034762d625c61
@@ -17091,14 +20272,14 @@ Date:	Mon Jul 19 16:31:54 2010 +0100
 
     We don't use it and don't even support it properly
 
- CMakeLists.txt			|    1 -
- config.h.cmake			|    3 ---
- configure.ac			|    4 ---
- goo/gmem.cc			|   56
- ++++++++++++----------------------------
- goo/gmem.h			|   38 ++++++++-------------------
- poppler/poppler-config.h.cmake |    5 ----
- poppler/poppler-config.h.in	|    5 ----
+ CMakeLists.txt			|  1 -
+ config.h.cmake			|  3 ---
+ configure.ac			|  4 ---
+ goo/gmem.cc			| 56
+ ++++++++++++------------------------------
+ goo/gmem.h			| 38 +++++++++-------------------
+ poppler/poppler-config.h.cmake |  5 ----
+ poppler/poppler-config.h.in	|  5 ----
  7 files changed, 27 insertions(+), 85 deletions(-)
 
 commit dd2e9399868e3dbf2fa4ede050f8d74d29ebbbb4
@@ -17107,7 +20288,7 @@ Date:	Mon Jul 19 16:31:43 2010 +0100
 
     add uninstalled.pc to ignore
 
- .gitignore |	 7 +++++++
+ .gitignore | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit d1033006aae381a0f075e02d54638a1af997caf3
@@ -17117,7 +20298,7 @@ Date:	Sat Jul 17 21:46:14 2010 +0200
     add FindGObjectIntrospection.cmake and
     GObjectIntrospectionMacros.cmake to the dist
 
- Makefile.am |	  2 ++
+ Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit ce8d03950736cc35d035a44a7d88e5f2a9defa74
@@ -17137,11 +20318,11 @@ Date:	Sat Jul 17 21:39:08 2010 +0200
     by ALL, which have the gir and the typelib files as dependencies,
     to make them build with the usual `make all'.
 
- CMakeLists.txt					|    5 +-
- cmake/modules/FindGObjectIntrospection.cmake	|   61 +++++++++++++++
- cmake/modules/GObjectIntrospectionMacros.cmake |   94
- ++++++++++++++++++++++++
- glib/CMakeLists.txt				|   36 +++++++++
+ CMakeLists.txt					|  5 +-
+ cmake/modules/FindGObjectIntrospection.cmake	| 61 +++++++++++++++++
+ cmake/modules/GObjectIntrospectionMacros.cmake | 94
+ ++++++++++++++++++++++++++
+ glib/CMakeLists.txt				| 36 ++++++++++
  4 files changed, 194 insertions(+), 2 deletions(-)
 
 commit 78bf43d8e11aa52db9862af118c597e117d31083
@@ -17155,7 +20336,7 @@ Date:	Sat Jul 17 20:28:58 2010 +0200
     while turn GLIB2_CFLAGS into GLIB2_CFLAGS_OTHERS to add the remaining
     CFLAGS as definitions
 
- glib/CMakeLists.txt |	  3 ++-
+ glib/CMakeLists.txt | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 6f3082d677bc62aa3f8124132e3e337c01be2629
@@ -17165,7 +20346,7 @@ Date:	Sat Jul 17 19:28:09 2010 +0200
     [CMake] split the generated sources of poppler_glib_SRCS in an own
     poppler_glib_generated_SRCS
 
- glib/CMakeLists.txt |	  4 +++-
+ glib/CMakeLists.txt | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 2a252dd9b05857bbd10dee235e873886fc74ec17
@@ -17175,7 +20356,7 @@ Date:	Sat Jul 17 14:57:38 2010 +0200
     [CMake] add stub message and TODO for the gobject-introspection
     support
 
- CMakeLists.txt |    3 +++
+ CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 8a3d1794a8ef5d525bb454755fec018e3fcb3816
@@ -17184,7 +20365,7 @@ Date:	Fri Jul 16 14:00:32 2010 +0100
 
     update
 
- TODO |    2 +-
+ TODO | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 31ac578942b82cbd16b064abca586ccb89dfa7ce
@@ -17193,7 +20374,7 @@ Date:	Thu Jul 15 15:05:10 2010 +0200
 
     Rework ChangeLog generation to fix make distcheck
 
- Makefile.am |	 22 +++++++++++++++++++---
+ Makefile.am | 22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)
 
 commit 5da5825ecab63089a19aac694826271019a94e6d
@@ -17202,7 +20383,7 @@ Date:	Thu Jul 15 15:03:20 2010 +0200
 
     [glib] docs: Add version.xml to content_files var
 
- glib/reference/Makefile.am |	 2 +-
+ glib/reference/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fe69b474ae63c9d5d2538db9e51e666dd6ea9fb3
@@ -17215,7 +20396,7 @@ Date:	Thu Jul 15 10:51:21 2010 +0100
     is wrong as 100 needs 3
     characters, not 2
 
- utils/pdftoppm.cc |   14 +++++++++++++-
+ utils/pdftoppm.cc | 14 +++++++++++++-
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 commit e265ae2d8a46df00ab1bbd863f01f652068d265f
@@ -17224,15 +20405,15 @@ Date:	Wed Jul 14 20:26:25 2010 +0100
 
     Add uninstalled .pc file for poppler when using autoconf
 
- Makefile.am			  |    9 ++++++++-
- configure.ac			  |    9 ++++++++-
- poppler-cairo-uninstalled.pc.in  |    6 ++++++
- poppler-cpp-uninstalled.pc.in	  |    7 +++++++
- poppler-glib-uninstalled.pc.in   |    7 +++++++
- poppler-qt-uninstalled.pc.in	  |    7 +++++++
- poppler-qt4-uninstalled.pc.in	  |    7 +++++++
- poppler-splash-uninstalled.pc.in |    7 +++++++
- poppler-uninstalled.pc.in	  |    6 ++++++
+ Makefile.am			  | 9 ++++++++-
+ configure.ac			  | 9 ++++++++-
+ poppler-cairo-uninstalled.pc.in  | 6 ++++++
+ poppler-cpp-uninstalled.pc.in	  | 7 +++++++
+ poppler-glib-uninstalled.pc.in   | 7 +++++++
+ poppler-qt-uninstalled.pc.in	  | 7 +++++++
+ poppler-qt4-uninstalled.pc.in	  | 7 +++++++
+ poppler-splash-uninstalled.pc.in | 7 +++++++
+ poppler-uninstalled.pc.in	  | 6 ++++++
  9 files changed, 63 insertions(+), 2 deletions(-)
 
 commit 552ab99e60fe4068be8e4e415924e4be289e47cd
@@ -17243,8 +20424,8 @@ Date:	Tue Jul 13 10:18:01 2010 +0200
 
     Fixes bug #28873.
 
- poppler/DCTStream.cc |   30 ++++++++++++++++++++++++++++++
- poppler/DCTStream.h  |    1 +
+ poppler/DCTStream.cc | 30 ++++++++++++++++++++++++++++++
+ poppler/DCTStream.h  |  1 +
  2 files changed, 31 insertions(+)
 
 commit 8a6697f89625106f3c373dbc7b4dc521e22502f7
@@ -17255,7 +20436,7 @@ Date:	Sat Jul 3 16:42:04 2010 +0200
 
     Prevents a warning when building with win32 font backend.
 
- poppler/GlobalParams.cc |    2 +-
+ poppler/GlobalParams.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b1fdb87a4ebb5079c731256cce1870de8c54c65d
@@ -17264,13 +20445,13 @@ Date:	Fri Jul 2 10:53:20 2010 +0200
 
     Fix compile warnings on auto imports for mingw compiler
 
- cpp/Makefile.am       |    2 +-
- cpp/tests/Makefile.am |    2 ++
- glib/Makefile.am      |    2 ++
- poppler/Makefile.am   |    2 +-
- qt4/demos/Makefile.am |    2 ++
- qt4/src/Makefile.am   |    2 +-
- qt4/tests/Makefile.am |    2 ++
+ cpp/Makefile.am       | 2 +-
+ cpp/tests/Makefile.am | 2 ++
+ glib/Makefile.am      | 2 ++
+ poppler/Makefile.am   | 2 +-
+ qt4/demos/Makefile.am | 2 ++
+ qt4/src/Makefile.am   | 2 +-
+ qt4/tests/Makefile.am | 2 ++
  7 files changed, 11 insertions(+), 3 deletions(-)
 
 commit 9e577110134eb1e093e697b7504efca759000086
@@ -17287,7 +20468,7 @@ Date:	Fri Jul 2 10:51:24 2010 +0200
     Also, the checks must run in a C++ context because that is where
     gettimeofday() is used.
 
- configure.ac |    7 ++++---
+ configure.ac | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 58c8430ac584f3ba5e97aceb148e6287bfc45f95
@@ -17304,7 +20485,7 @@ Date:	Wed Jun 30 15:06:44 2010 +0200
     from declaring certain function (e.g. gettimeofday()) when the -ansi
     flag is set.
 
- configure.ac |    7 +++++--
+ configure.ac | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit e3663a855a9c86f0a3988a7a50fa40d37d0ea069
@@ -17318,9 +20499,9 @@ Date:	Fri Jul 2 14:45:15 2010 +0200
     in ansi mode. MAX_PATH is in the Windows api and thus always available
     when windows.h is included.
 
- goo/gfile.cc		 |    4 ++--
- poppler/GlobalParams.cc |    2 +-
- poppler/PDFDoc.cc	 |    4 ++--
+ goo/gfile.cc		 | 4 ++--
+ poppler/GlobalParams.cc | 2 +-
+ poppler/PDFDoc.cc	 | 4 ++--
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 7227c407d23a37f5d95e6c01cb7411be2f82ca85
@@ -17329,8 +20510,8 @@ Date:	Wed Jun 30 16:15:06 2010 +0200
 
     Check for _WIN32 instead of _MSC_VER
 
- goo/GooTimer.cc |    6 +++---
- goo/GooTimer.h  |    4 ++--
+ goo/GooTimer.cc | 6 +++---
+ goo/GooTimer.h  | 4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 34e727e011529be312313a1f4d4fa1ba9c545888
@@ -17344,7 +20525,7 @@ Date:	Tue Jun 29 16:43:31 2010 +0200
     poppler-optcontent.lo. Thus, explicitly using poppler-optcontent.lo to
     create poppler-optcontent.moc does not work well.
 
- qt4/src/Makefile.am |	  2 +-
+ qt4/src/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1bc2f4501ea4e56ca99ae4d94d6cf34cf33c2c7a
@@ -17355,7 +20536,7 @@ Date:	Tue Jun 29 15:34:22 2010 +0200
 
     Lets you build the qt4 bindings for Windows with automake/autoconf.
 
- qt4/src/Makefile.am |	  3 +++
+ qt4/src/Makefile.am | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 5825114a26cc6eece2e556063f640dda53ea1e11
@@ -17364,7 +20545,7 @@ Date:	Sun Jul 11 12:24:20 2010 +0100
 
     Compile++
 
- glib/demo/CMakeLists.txt |    1 +
+ glib/demo/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 5e4d8eeea0b9dba68420c164975418c76a53be85
@@ -17373,7 +20554,7 @@ Date:	Sat Jul 10 15:54:28 2010 +0200
 
     [pdf-inspector] Do not render for printing
 
- test/pdf-inspector.cc |    3 ++-
+ test/pdf-inspector.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit e6824972a213a888ca0185b7ae0a75fc23f75797
@@ -17385,11 +20566,11 @@ Date:	Sat Jul 10 15:52:15 2010 +0200
 
     Fixes bug #623616.
 
- poppler/Annot.cc |  346
- +++++++++++++++++++++++++-----------------------------
- poppler/Annot.h  |    3 +
- poppler/Gfx.cc   |    9 +-
- poppler/Gfx.h	  |    2 +-
+ poppler/Annot.cc | 346
+ +++++++++++++++++++++++++------------------------------
+ poppler/Annot.h  |   3 +
+ poppler/Gfx.cc   |   9 +-
+ poppler/Gfx.h	  |   2 +-
  4 files changed, 165 insertions(+), 195 deletions(-)
 
 commit 70ce0b6ea1a0d61f5048d2ae49c639d74a643b29
@@ -17402,7 +20583,7 @@ Date:	Fri Jul 9 17:04:00 2010 +0200
     Fixes appearance stream generation for document attached to bug
     #623616.
 
- poppler/Annot.cc |   38 +++++++++++++++++++++-----------------
+ poppler/Annot.cc | 38 +++++++++++++++++++++-----------------
  1 file changed, 21 insertions(+), 17 deletions(-)
 
 commit 8a9e561bfe64f71e9f38c43e5c6be7e5069b2349
@@ -17411,7 +20592,7 @@ Date:	Fri Jul 2 21:07:53 2010 +0200
 
     Nicer autogen.sh output
 
- autogen.sh |	 1 +
+ autogen.sh | 1 +
  1 file changed, 1 insertion(+)
 
 commit ce4d328294cea73f4b7368691dc1fed6bd45d569
@@ -17427,7 +20608,7 @@ Date:	Fri Jul 2 20:51:47 2010 +0200
 
     This feature is modeled after gnome-autogen.sh behaviour.
 
- autogen.sh |	 8 +++++++-
+ autogen.sh | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit d7ee87c5d0a35c8d4fcc88bde4b8496c49f397c6
@@ -17436,8 +20617,8 @@ Date:	Tue Jul 6 15:16:08 2010 +0100
 
     warnings-=2
 
- poppler/GfxFont.cc	|    3 ++-
- utils/HtmlOutputDev.cc |    3 ++-
+ poppler/GfxFont.cc	| 3 ++-
+ utils/HtmlOutputDev.cc | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 1e7f457ca1617fd8c958feef8dd7e694476dedd9
@@ -17448,7 +20629,7 @@ Date:	Fri Jul 9 12:29:14 2010 +0200
 
     Fixes rendering of page 2 of document attached to bug #28954.
 
- poppler/CairoOutputDev.cc |	8 ++++++--
+ poppler/CairoOutputDev.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 91a7605eb51144f2e7dea69aa9454fff47c49bd2
@@ -17457,7 +20638,7 @@ Date:	Fri Jul 9 11:42:56 2010 +0200
 
     [glib] Fix build when GDK is enabled
 
- glib/test-poppler-glib.cc |	8 +-------
+ glib/test-poppler-glib.cc | 8 +-------
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 commit 09e3e0e9c5134688c4ed2af5cd3a12aa2986474c
@@ -17468,7 +20649,7 @@ Date:	Thu Jul 8 18:56:38 2010 +0200
 
     Fixes bug #27927
 
- glib/poppler-page.cc |    2 +-
+ glib/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 25427bdecb219ffe6f0592d2ac36de60c247bfd9
@@ -17477,7 +20658,7 @@ Date:	Thu Jul 8 17:46:22 2010 +0200
 
     Fix build when compiling without glib frontend
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit 550684731356a66753ec19f5a8ca4b572db6d2d5
@@ -17486,11 +20667,11 @@ Date:	Thu Jul 8 17:16:02 2010 +0200
 
     [glib-demo] Add selections demo
 
- glib/demo/Makefile.am	|    2 +
- glib/demo/main.c	|    4 +-
- glib/demo/selections.c |  687
- ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/selections.h |   31 +++
+ glib/demo/Makefile.am	|   2 +
+ glib/demo/main.c	|   4 +-
+ glib/demo/selections.c | 687
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/selections.h |  31 +++
  4 files changed, 723 insertions(+), 1 deletion(-)
 
 commit b257428150e2c13dcc24fd8f75e4ee2c679ab414
@@ -17513,11 +20694,11 @@ Date:	Thu Jul 8 14:45:29 2010 +0200
        anymore
        before calling the method.
 
- glib/demo/text.c		     |	  9 +-------
- glib/poppler-page.cc		     |	 43
- ++++++++++++++++++++++++++---------
- glib/poppler-page.h		     |	  3 ++-
- glib/reference/poppler-sections.txt |	  1 +
+ glib/demo/text.c		     |	9 +-------
+ glib/poppler-page.cc		     | 43
+ +++++++++++++++++++++++++++----------
+ glib/poppler-page.h		     |	3 ++-
+ glib/reference/poppler-sections.txt |	1 +
  4 files changed, 36 insertions(+), 20 deletions(-)
 
 commit bedc88225c948ad1288b69c6c106adce36233442
@@ -17526,8 +20707,8 @@ Date:	Wed Jul 7 11:55:47 2010 +0200
 
     [cairo] Fix warning on signed/unsigned comparison
 
- poppler/CairoFontEngine.cc |	12 ++++++------
- poppler/CairoFontEngine.h  |	 8 ++++----
+ poppler/CairoFontEngine.cc | 12 ++++++------
+ poppler/CairoFontEngine.h  |  8 ++++----
  2 files changed, 10 insertions(+), 10 deletions(-)
 
 commit 092aa901b9ec35a48bc1fb229ad16a3b00eef5f2
@@ -17536,10 +20717,10 @@ Date:	Mon Jul 5 11:16:49 2010 +0200
 
     [glib] docs: add some more introspection annotations
 
- glib/poppler-attachment.cc |	 4 ++--
- glib/poppler-document.cc   |	12 ++++++------
- glib/poppler-media.cc	    |	 4 ++--
- glib/poppler-page.cc	    |	 4 ++--
+ glib/poppler-attachment.cc |  4 ++--
+ glib/poppler-document.cc   | 12 ++++++------
+ glib/poppler-media.cc	    |  4 ++--
+ glib/poppler-page.cc	    |  4 ++--
  4 files changed, 12 insertions(+), 12 deletions(-)
 
 commit 6c4e14fd90d5ef2d6670a980ab2476b6fab58df7
@@ -17548,7 +20729,7 @@ Date:	Mon Jul 5 10:49:59 2010 +0200
 
     [glib] docs: fix POPPLER_CHECK_VERSION() docs
 
- glib/poppler-features.h.in |	 6 ++++--
+ glib/poppler-features.h.in | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit ed324a867ecf1f616c4b2dc575f01d5cf1b67c38
@@ -17557,7 +20738,7 @@ Date:	Fri Jul 2 18:28:45 2010 +0200
 
     [glib] Rename instrospection files as 0.16 instead of 0.14
 
- glib/Makefile.am |   14 +++++++-------
+ glib/Makefile.am | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit a55f567ff1ea0858eda13a024ed765a016f3bff0
@@ -17566,7 +20747,7 @@ Date:	Fri Jul 2 18:23:03 2010 +0200
 
     [glib] docs: Remove unneeded empty line in doc comment
 
- glib/poppler-features.h.in |	 1 -
+ glib/poppler-features.h.in | 1 -
  1 file changed, 1 deletion(-)
 
 commit f16015303422280eaa21c3144eca0f1a330dce8a
@@ -17575,11 +20756,11 @@ Date:	Fri Jul 2 18:19:13 2010 +0200
 
     [glib] docs: Add GObject introspection annotations
 
- glib/poppler-annot.cc		  |   45
- +++++++++++++++++++-------------------
- glib/poppler-document.cc	  |    8 +++----
- glib/poppler-page.cc		  |   23 ++++++++++++-------
- glib/reference/poppler-docs.sgml |    2 ++
+ glib/poppler-annot.cc		  | 45
+ ++++++++++++++++++++--------------------
+ glib/poppler-document.cc	  |  8 +++----
+ glib/poppler-page.cc		  | 23 +++++++++++++-------
+ glib/reference/poppler-docs.sgml |  2 ++
  4 files changed, 43 insertions(+), 35 deletions(-)
 
 commit 60242038e4dce7f0c90f2bfa0e771120247dbc9d
@@ -17588,10 +20769,10 @@ Date:	Wed Jun 30 09:35:29 2010 +0200
 
     [glib] Add GObject introspection support
 
- configure.ac	     |	  5 +++
- glib/Makefile.am    |	 29 ++++++++++++++++
- m4/introspection.m4 |	 94
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	     |	5 +++
+ glib/Makefile.am    | 29 +++++++++++++++++
+ m4/introspection.m4 | 94
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 128 insertions(+)
 
 commit 3160950a7d7161457405c9084c31af230329b3f0
@@ -17600,7 +20781,7 @@ Date:	Fri Jul 2 12:47:04 2010 +0200
 
     [glib] docs: Add index of deprecated symbols
 
- glib/reference/poppler-docs.sgml |    4 ++++
+ glib/reference/poppler-docs.sgml | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 593db7acf6edce1267f69d12310bf4098ff24c97
@@ -17609,7 +20790,7 @@ Date:	Fri Jul 2 12:44:39 2010 +0200
 
     [glib] docs: deprecate GDK API
 
- glib/poppler-page.cc |    8 ++++++++
+ glib/poppler-page.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 6facefb3fa8f97a9d330545308fb2d89c7f57fa0
@@ -17618,16 +20799,16 @@ Date:	Thu Jul 1 18:01:45 2010 +0200
 
     [glib] docs: Add index of new symbols for versions 0.12, 0.14 and 0.16
 
- glib/poppler-action.h		  |   10 +++++++---
- glib/poppler-annot.cc		  |   17 +++++++++++++++++
- glib/poppler-date.cc		  |    2 ++
- glib/poppler-document.cc	  |   16 +++++++++++++++-
- glib/poppler-layer.cc		  |   12 ++++++++++++
- glib/poppler-media.cc		  |   14 ++++++++++++--
- glib/poppler-media.h		  |    3 +++
- glib/poppler-movie.cc		  |    6 ++++++
- glib/poppler-page.cc		  |    2 ++
- glib/reference/poppler-docs.sgml |   12 ++++++++++++
+ glib/poppler-action.h		  | 10 +++++++---
+ glib/poppler-annot.cc		  | 17 +++++++++++++++++
+ glib/poppler-date.cc		  |  2 ++
+ glib/poppler-document.cc	  | 16 +++++++++++++++-
+ glib/poppler-layer.cc		  | 12 ++++++++++++
+ glib/poppler-media.cc		  | 14 ++++++++++++--
+ glib/poppler-media.h		  |  3 +++
+ glib/poppler-movie.cc		  |  6 ++++++
+ glib/poppler-page.cc		  |  2 ++
+ glib/reference/poppler-docs.sgml | 12 ++++++++++++
  10 files changed, 88 insertions(+), 6 deletions(-)
 
 commit 166b78c0ce8a4536873c4f60b392c24c8a68e7aa
@@ -17636,7 +20817,7 @@ Date:	Thu Jul 1 17:25:03 2010 +0200
 
     [glib] docs: document PopplerMediaSaveFunc
 
- glib/poppler-media.h |   18 +++++++++++++++++-
+ glib/poppler-media.h | 18 +++++++++++++++++-
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 commit 5cc0a51f88580c65ac2d5c6ff02b8cf14697b70c
@@ -17645,8 +20826,8 @@ Date:	Thu Jul 1 17:20:13 2010 +0200
 
     [glib] Use the same name for parameter in function prototype
 
- glib/poppler-media.h |   10 +++++-----
- glib/poppler-movie.h |    6 +++---
+ glib/poppler-media.h | 10 +++++-----
+ glib/poppler-movie.h |  6 +++---
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 commit 6793fd8fd2d33d3d58c6556b5dbe6d0497e56646
@@ -17655,8 +20836,8 @@ Date:	Thu Jul 1 15:49:49 2010 +0200
 
     [glib] docs: document some enums in poppler-action
 
- glib/poppler-action.h |   92
- +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-action.h | 92
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 92 insertions(+)
 
 commit 8e139696dbe19f54ad54364a711b929146f11080
@@ -17665,7 +20846,7 @@ Date:	Thu Jul 1 15:02:58 2010 +0200
 
     [glib] docs: mark structures in poppler-private.h as private
 
- glib/poppler-private.h |    7 +++++++
+ glib/poppler-private.h | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit ccae7e574047d66c638003cc36fa1edeef4d35ed
@@ -17674,8 +20855,8 @@ Date:	Thu Jul 1 14:59:50 2010 +0200
 
     [glib] docs: document PopplerDocument enums
 
- glib/poppler-document.h |   65
- +++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h | 65
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 65 insertions(+)
 
 commit 4fbff172693c38cdc4ae8070a55ceb706aa213cd
@@ -17684,8 +20865,8 @@ Date:	Thu Jul 1 14:26:53 2010 +0200
 
     [glib] docs: document PopplerFontInfo
 
- glib/poppler-document.cc |  106
- ++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.cc | 106
+ +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 106 insertions(+)
 
 commit 465dd4897ff603a6fd96503cf4746fc808b0f827
@@ -17694,7 +20875,7 @@ Date:	Thu Jul 1 12:59:39 2010 +0200
 
     [glib] docs: document some enums
 
- glib/poppler.h |   55
+ glib/poppler.h | 55
  +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 55 insertions(+)
 
@@ -17704,9 +20885,9 @@ Date:	Thu Jul 1 12:31:10 2010 +0200
 
     [glib] docs: document boxed types defined in poppler-page
 
- glib/poppler-page.cc |  147
- ++++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h  |   79 +++++++++++++++++++++++++++
+ glib/poppler-page.cc | 147
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h  |  79 +++++++++++++++++++++++++++
  2 files changed, 226 insertions(+)
 
 commit 34c52190e1dbf4d3effa44b4408faa1fbae0d12d
@@ -17715,7 +20896,7 @@ Date:	Thu Jul 1 09:33:08 2010 +0200
 
     [glib] Remove splash header file
 
- glib/poppler-page.cc |    1 -
+ glib/poppler-page.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 6910545a487f206ccd059bb295d2312228dbf2ba
@@ -17724,7 +20905,7 @@ Date:	Wed Jun 30 19:03:04 2010 +0200
 
     [glib] docs: Remove invalid symbol from poppler-sections.txt
 
- glib/reference/poppler-sections.txt |	  1 -
+ glib/reference/poppler-sections.txt | 1 -
  1 file changed, 1 deletion(-)
 
 commit 65ea3b636cb5a38660e526a483a4d95f5acdf8db
@@ -17733,7 +20914,7 @@ Date:	Wed Jun 30 19:02:32 2010 +0200
 
     [glib] docs: fix typo
 
- glib/poppler-form-field.cc |	 2 +-
+ glib/poppler-form-field.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 689bfec40b5b3030c2819cb4aac42c3ab6279278
@@ -17742,7 +20923,7 @@ Date:	Wed Jun 30 19:01:47 2010 +0200
 
     [glib] docs: Add missing doc for parameter
 
- glib/poppler-document.cc |    1 +
+ glib/poppler-document.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0b3d77627f255a4bf3da6ee875ad8d9eb931c96e
@@ -17751,7 +20932,7 @@ Date:	Wed Jun 30 19:00:59 2010 +0200
 
     [glib] Use the same name for parameter in function prototype
 
- glib/poppler-page.h |	  2 +-
+ glib/poppler-page.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 19e1944c00ac2da6b18b015721fc3a8d1898a23a
@@ -17760,9 +20941,9 @@ Date:	Wed Jun 30 18:01:52 2010 +0200
 
     [glib] docs: Add media and movie to docs
 
- glib/poppler-media.cc		  |    6 ++++++
- glib/poppler-movie.cc		  |    6 ++++++
- glib/reference/poppler-docs.sgml |    3 ++-
+ glib/poppler-media.cc		  | 6 ++++++
+ glib/poppler-movie.cc		  | 6 ++++++
+ glib/reference/poppler-docs.sgml | 3 ++-
  3 files changed, 14 insertions(+), 1 deletion(-)
 
 commit ca48bee07e6b4a20ea7b40b472a335e75feb4739
@@ -17771,7 +20952,7 @@ Date:	Wed Jun 30 17:56:50 2010 +0200
 
     [glib] docs: Add missing types to poppler.types
 
- glib/reference/poppler.types |    4 ++++
+ glib/reference/poppler.types | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 613ccf81317a007ed5017ee788466613a6699bb5
@@ -17785,8 +20966,8 @@ Date:	Wed Jun 30 17:54:22 2010 +0200
      - Add missing sections
      - Remove enums section
 
- glib/reference/poppler-sections.txt |	424
- ++++++++++++++++++++++++-----------
+ glib/reference/poppler-sections.txt | 424
+ +++++++++++++++++++++++++-----------
  1 file changed, 295 insertions(+), 129 deletions(-)
 
 commit b37556a32b79f8711ed7eca24abf19511872a70a
@@ -17795,7 +20976,7 @@ Date:	Wed Jun 30 12:01:44 2010 +0200
 
     [glib] docs: Add index of symbols
 
- glib/reference/poppler-docs.sgml |    5 +++++
+ glib/reference/poppler-docs.sgml | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 7f5fa4e19b4e324a396d64261b9125c1a557ac84
@@ -17804,10 +20985,10 @@ Date:	Wed Jun 30 12:00:35 2010 +0200
 
     [glib] docs: Add version information
 
- configure.ac			  |    1 +
- glib/reference/Makefile.am	  |    2 +-
- glib/reference/poppler-docs.sgml |    7 ++++++-
- glib/reference/version.xml.in	  |    1 +
+ configure.ac			  | 1 +
+ glib/reference/Makefile.am	  | 2 +-
+ glib/reference/poppler-docs.sgml | 7 ++++++-
+ glib/reference/version.xml.in	  | 1 +
  4 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 848d5e158fa9eadd19a658db314ba3fff9d026e8
@@ -17816,33 +20997,33 @@ Date:	Wed Jun 30 11:30:41 2010 +0200
 
     [glib] docs: do not use gtk-doc templates
 
- configure.ac				      |    2 +-
- glib/poppler-action.cc			      |    6 +
- glib/poppler-annot.cc			      |    6 +
- glib/poppler-attachment.cc		      |    6 +
- glib/poppler-attachment.h		      |   16 +
- glib/poppler-document.cc		      |    8 +
- glib/poppler-features.h.in		      |   59 ++++
- glib/poppler-form-field.cc		      |    6 +
- glib/poppler-layer.cc			      |    6 +
- glib/poppler-page.cc			      |    6 +
- glib/reference/tmpl/poppler-action.sgml      |  216 ------------
- glib/reference/tmpl/poppler-annot.sgml       |  377 --------------------
- glib/reference/tmpl/poppler-attachment.sgml  |   68 ----
- glib/reference/tmpl/poppler-document.sgml    |  410
- ----------------------
- glib/reference/tmpl/poppler-enums.sgml       |  246 -------------
- glib/reference/tmpl/poppler-features.sgml    |   83 -----
- glib/reference/tmpl/poppler-form-field.sgml  |  318 -----------------
- glib/reference/tmpl/poppler-layer.sgml       |   83 -----
- glib/reference/tmpl/poppler-page.sgml	      |  483
- --------------------------
- glib/reference/tmpl/poppler-private.sgml     |  148 --------
- glib/reference/tmpl/poppler-unused.sgml      |    8 -
- glib/reference/tmpl/poppler.sgml	      |  285 ---------------
- glib/reference/tmpl/stamp-poppler-enums.sgml |   22 --
- gtk-doc.make				      |   78 +++--
- m4/gtk-doc.m4				      |    2 +-
+ configure.ac				      |   2 +-
+ glib/poppler-action.cc			      |   6 +
+ glib/poppler-annot.cc			      |   6 +
+ glib/poppler-attachment.cc		      |   6 +
+ glib/poppler-attachment.h		      |  16 +
+ glib/poppler-document.cc		      |   8 +
+ glib/poppler-features.h.in		      |  59 ++++
+ glib/poppler-form-field.cc		      |   6 +
+ glib/poppler-layer.cc			      |   6 +
+ glib/poppler-page.cc			      |   6 +
+ glib/reference/tmpl/poppler-action.sgml      | 216 ------------
+ glib/reference/tmpl/poppler-annot.sgml       | 377 ---------------------
+ glib/reference/tmpl/poppler-attachment.sgml  |  68 ----
+ glib/reference/tmpl/poppler-document.sgml    | 410
+ -----------------------
+ glib/reference/tmpl/poppler-enums.sgml       | 246 --------------
+ glib/reference/tmpl/poppler-features.sgml    |  83 -----
+ glib/reference/tmpl/poppler-form-field.sgml  | 318 ------------------
+ glib/reference/tmpl/poppler-layer.sgml       |  83 -----
+ glib/reference/tmpl/poppler-page.sgml	      | 483
+ ---------------------------
+ glib/reference/tmpl/poppler-private.sgml     | 148 --------
+ glib/reference/tmpl/poppler-unused.sgml      |   8 -
+ glib/reference/tmpl/poppler.sgml	      | 285 ----------------
+ glib/reference/tmpl/stamp-poppler-enums.sgml |  22 --
+ gtk-doc.make				      |  78 +++--
+ m4/gtk-doc.m4				      |   2 +-
  25 files changed, 171 insertions(+), 2777 deletions(-)
 
 commit 16e15ac845206217086e2adac9f220e75c0c630d
@@ -17851,7 +21032,7 @@ Date:	Tue Jun 29 21:44:02 2010 +0100
 
     bitmap can be null at this stage, check it isn't
 
- poppler/JBIG2Stream.cc |    3 +++
+ poppler/JBIG2Stream.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 38e5d28a184d0ca8df71a7ea910ce85d7a225e4e
@@ -17860,7 +21041,7 @@ Date:	Mon Jun 21 20:38:00 2010 +0100
 
     more pow 0.5 -> sqrt
 
- poppler/GfxState.cc |	 12 ++++++------
+ poppler/GfxState.cc | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 58a53ca0a4e8434e8478f8fe121067dcf05c017d
@@ -17869,7 +21050,7 @@ Date:	Mon Jun 21 19:24:20 2010 +0100
 
     sqrt is much faster than pow 0.5
 
- poppler/GfxState.cc |	  6 +++---
+ poppler/GfxState.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit bf86a9fc464aca57ebec207a213dcc2cc6031940
@@ -17880,18 +21061,18 @@ Date:	Mon Jun 21 19:20:47 2010 +0100
 
     Can give us a decent speedup when we go a lot though this methods
 
- poppler/Catalog.cc	   |   12 +----
- poppler/DCTStream.cc	   |   51 ++++++++++++++------
- poppler/DCTStream.h	   |	3 ++
- poppler/GfxFont.cc	   |   22 ++-------
- poppler/GfxState.cc	   |   30 +++---------
- poppler/JPEG2000Stream.cc |   67 +++++++------------------
- poppler/JPEG2000Stream.h  |   38 ++++++++++++++-
- poppler/Link.cc	   |   14 ++----
- poppler/Object.h	   |	4 ++
- poppler/Stream.cc	   |   90 ++++++++++++++++++----------------
- poppler/Stream.h	   |  118
- ++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Catalog.cc	   |  12 +----
+ poppler/DCTStream.cc	   |  51 ++++++++++++++------
+ poppler/DCTStream.h	   |   3 ++
+ poppler/GfxFont.cc	   |  22 ++-------
+ poppler/GfxState.cc	   |  30 ++++--------
+ poppler/JPEG2000Stream.cc |  67 +++++++-------------------
+ poppler/JPEG2000Stream.h  |  38 ++++++++++++++-
+ poppler/Link.cc	   |  14 ++----
+ poppler/Object.h	   |   4 ++
+ poppler/Stream.cc	   |  90 +++++++++++++++++++----------------
+ poppler/Stream.h	   | 118
+ +++++++++++++++++++++++++++++++++++++++++++++-
  11 files changed, 279 insertions(+), 170 deletions(-)
 
 commit 65c14073a3b1035ca5fe3bd6667abd315272841e
@@ -17903,7 +21084,7 @@ Date:	Mon Jun 21 17:19:22 2010 +0200
     We were doing the same pow operation 3 times!. It makes document
     attached to bug #28591 render a little faster.
 
- poppler/GfxState.cc |	 12 ++++++------
+ poppler/GfxState.cc | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 9365c05c1f66b3000febf32c45cef2ffe79e041a
@@ -17915,7 +21096,7 @@ Date:	Sat Jun 19 10:36:39 2010 +0200
 
     Fixes bug #28588.
 
- glib/poppler-page.cc |   25 ++++++++++---------------
+ glib/poppler-page.cc | 25 ++++++++++---------------
  1 file changed, 10 insertions(+), 15 deletions(-)
 
 commit d9504c0a288c84b68a516f715505d6bc94b911f5
@@ -17927,7 +21108,7 @@ Date:	Fri Jun 18 23:59:04 2010 +0200
     ... this way gatof() can be found correctly
     should fix bug #28605
 
- cpp/tests/Makefile.am |    1 +
+ cpp/tests/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 62975737bcaa6e0a2ecab981aa3e0c8f2ff10571
@@ -17936,9 +21117,9 @@ Date:	Fri Jun 18 19:22:17 2010 +0100
 
     Compile with Sun Studio
 
- goo/ImgWriter.h	    |	 3 ++-
- goo/JpegWriter.h	    |	 3 ++-
- poppler/SplashOutputDev.cc |	 6 ++++++
+ goo/ImgWriter.h	    | 3 ++-
+ goo/JpegWriter.h	    | 3 ++-
+ poppler/SplashOutputDev.cc | 6 ++++++
  3 files changed, 10 insertions(+), 2 deletions(-)
 
 commit 7cbe3d1521aea8b484efb8663e75684e05b6fb61
@@ -17952,7 +21133,7 @@ Date:	Thu Jun 17 23:01:21 2010 +0100
     being painted at all (alpha == 0) meaning we just copy the paperColor
     and the pixel being opage meaning we have to do nothing
 
- splash/Splash.cc |   34 ++++++++++++++++++++++++++--------
+ splash/Splash.cc | 34 ++++++++++++++++++++++++++--------
  1 file changed, 26 insertions(+), 8 deletions(-)
 
 commit f323e5e4cdcc20075ee7c722f7adc088c0772249
@@ -17963,7 +21144,7 @@ Date:	Thu Jun 17 22:59:37 2010 +0100
 
     Might have caused the kde bug #241995
 
- poppler/GfxState.cc |	 11 +++++++----
+ poppler/GfxState.cc | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit 35e87d2062b1d82db0d765de5a6187122a0fa99c
@@ -17972,8 +21153,8 @@ Date:	Wed Jun 16 11:52:25 2010 +0200
 
     [gib-demo] Add demo for poppler_page_get_text_layout()
 
- glib/demo/text.c |  182
- ++++++++++++++++++++++++++++++++++++++++++++++++------
+ glib/demo/text.c | 182
+ +++++++++++++++++++++++++++++++++++++++++++++++++------
  1 file changed, 164 insertions(+), 18 deletions(-)
 
 commit ddcea568b3a7334e062d6214f43d0a2c2ec95be4
@@ -17988,9 +21169,9 @@ Date:	Tue Jun 15 16:57:32 2010 +0200
     The position in this array represent the offset in text returned by
     poppler_page_get_text
 
- glib/poppler-page.cc |   91
- ++++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h  |    4 ++-
+ glib/poppler-page.cc | 91
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h  |  4 ++-
  2 files changed, 94 insertions(+), 1 deletion(-)
 
 commit 6e9fe8832c37b560ac4d0b0e32d618bde70ee117
@@ -17999,7 +21180,7 @@ Date:	Wed Jun 16 00:22:59 2010 +0200
 
     [Qt4] and support 'Print' named action here too...
 
- qt4/src/poppler-annotation.cc |    2 ++
+ qt4/src/poppler-annotation.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 53c003f36af5d77f50fe238eaec4c5f7c3a485c7
@@ -18008,7 +21189,7 @@ Date:	Wed Jun 16 00:18:13 2010 +0200
 
     [CMake] install the new goo/GooLikely.h
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2ba752aabc8dad4bb35a351697b1590795c54ca4
@@ -18017,8 +21198,8 @@ Date:	Wed Jun 16 00:06:30 2010 +0200
 
     update copyrights
 
- qt4/src/poppler-link.h  |    3 ++-
- qt4/src/poppler-page.cc |    1 +
+ qt4/src/poppler-link.h  | 3 ++-
+ qt4/src/poppler-page.cc | 1 +
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 38bf54bbad40288be763c6a1a89d90477c9ef89d
@@ -18027,10 +21208,10 @@ Date:	Tue Jun 15 23:05:43 2010 +0100
 
     move the declaration of likely/unlikely to an own file in goo/
 
- goo/GooLikely.h  |   22 ++++++++++++++++++++++
- goo/Makefile.am  |    1 +
- poppler/Object.h |    9 +--------
- splash/Splash.cc |    4 +---
+ goo/GooLikely.h  | 22 ++++++++++++++++++++++
+ goo/Makefile.am  |  1 +
+ poppler/Object.h |  9 +--------
+ splash/Splash.cc |  4 +---
  4 files changed, 25 insertions(+), 11 deletions(-)
 
 commit 9838edf8c7497858e3bac2743784a3259f61cfdd
@@ -18041,7 +21222,7 @@ Date:	Tue Jun 15 22:54:34 2010 +0100
 
     Happens very rarely, like in bug 28480
 
- splash/Splash.cc |    6 ++++++
+ splash/Splash.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 8b32c3e9826d4462fd9d16fab4200ebb23251046
@@ -18050,7 +21231,7 @@ Date:	Tue Jun 15 23:55:01 2010 +0200
 
     [Qt4/apidox] ok, now the *proper* version for 'Print'...
 
- qt4/src/poppler-link.h |    2 +-
+ qt4/src/poppler-link.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b54e5ac49f69bd1c906e517edcb436e042199cd5
@@ -18059,7 +21240,7 @@ Date:	Tue Jun 15 23:53:50 2010 +0200
 
     [Qt4/apidox] add the proper version for the new 'Print'
 
- qt4/src/poppler-link.h |    3 ++-
+ qt4/src/poppler-link.h | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 71ad18c3b6b73e23d71600d07ce00bdfaf0bef60
@@ -18068,7 +21249,7 @@ Date:	Tue Jun 15 23:51:01 2010 +0200
 
     [Qt4] recognize the 'Print' named action here too
 
- qt4/src/poppler-annotation.cc |    3 +++
+ qt4/src/poppler-annotation.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 96f60f2748ba76de0d296a9838dbd7181f506e36
@@ -18077,8 +21258,8 @@ Date:	Tue Jun 15 23:47:46 2010 +0200
 
     [Qt4] recognize 'Print' as name in named actions
 
- qt4/src/poppler-link.h  |    3 ++-
- qt4/src/poppler-page.cc |    2 ++
+ qt4/src/poppler-link.h  | 3 ++-
+ qt4/src/poppler-page.cc | 2 ++
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 25494311c5b8eb88d43df420ec91a1aedad20d05
@@ -18087,8 +21268,8 @@ Date:	Tue Jun 15 17:44:23 2010 +0200
 
     [glib] Add some G_UNLIKELY()
 
- glib/poppler-document.cc |   12 ++++++------
- glib/poppler-page.cc	  |   17 ++++++++++-------
+ glib/poppler-document.cc | 12 ++++++------
+ glib/poppler-page.cc	  | 17 ++++++++++-------
  2 files changed, 16 insertions(+), 13 deletions(-)
 
 commit 52f133fb962256edb577b7f639c5c13221c6365d
@@ -18097,7 +21278,7 @@ Date:	Tue Jun 15 14:20:49 2010 +0200
 
     [glib] Use g_slice for actions and destinations
 
- glib/poppler-action.cc |   21 +++++++++------------
+ glib/poppler-action.cc | 21 +++++++++------------
  1 file changed, 9 insertions(+), 12 deletions(-)
 
 commit f035c94d8b5b34c0c3bb47b8cfc2f9c720a4fc71
@@ -18106,7 +21287,7 @@ Date:	Tue Jun 15 14:01:07 2010 +0200
 
     [glib] Use g_slice_dup in _copy() function for iterators
 
- glib/poppler-document.cc |    9 +++------
+ glib/poppler-document.cc | 9 +++------
  1 file changed, 3 insertions(+), 6 deletions(-)
 
 commit c84f69681828c7e3b969f666f9b84f1531976c6f
@@ -18115,7 +21296,7 @@ Date:	Tue Jun 15 13:57:18 2010 +0200
 
     [glib] Use g_slice for mappings and PopplerRectangle
 
- glib/poppler-page.cc |   50
+ glib/poppler-page.cc | 50
  ++++++++++++++++++--------------------------------
  1 file changed, 18 insertions(+), 32 deletions(-)
 
@@ -18125,7 +21306,7 @@ Date:	Tue Jun 15 13:49:27 2010 +0200
 
     [glib] Use poppler_image_mapping_free() instead of g_free()
 
- glib/poppler-page.cc |    2 +-
+ glib/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fb791a15f7472042fb2174e6f5df6924dd4eeb9b
@@ -18135,7 +21316,7 @@ Date:	Tue Jun 15 13:37:52 2010 +0200
     [glib] Remove poppler_mapping_free and use poppler_link_mapping_free
     instead
 
- glib/poppler-page.cc |    9 +--------
+ glib/poppler-page.cc | 9 +--------
  1 file changed, 1 insertion(+), 8 deletions(-)
 
 commit 6186d7220e545eb89597626933a10acd0cd25173
@@ -18144,7 +21325,7 @@ Date:	Tue Jun 15 13:16:59 2010 +0200
 
     [glib] Use _new() methods instead of g_new() to create boxed structs
 
- glib/poppler-page.cc |    6 +++---
+ glib/poppler-page.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 44639cb7b10ab6d66122ae2b6b7f3e5745f933bd
@@ -18153,7 +21334,7 @@ Date:	Tue Jun 15 10:39:00 2010 +0200
 
     [glib-demo] Use poppler_rectangle_free() instead of g_free()
 
- glib/demo/find.c |    2 +-
+ glib/demo/find.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3ca304f3837af27ae49541a5f441d8729264a945
@@ -18164,9 +21345,9 @@ Date:	Mon Jun 14 19:16:41 2010 +0100
 
     Makes opening of file from bug 26759 ten times faster
 
- poppler/XRef.cc |   62
- +++++++++++++++++++++++++++++++++++++++++++++++--------
- poppler/XRef.h  |    4 ++--
+ poppler/XRef.cc | 62
+ ++++++++++++++++++++++++++++++++++++++++++++++++---------
+ poppler/XRef.h  |  4 ++--
  2 files changed, 55 insertions(+), 11 deletions(-)
 
 commit cc2e5f190e19ee8169f67df2541302a2816873d3
@@ -18175,8 +21356,8 @@ Date:	Mon Jun 14 18:17:01 2010 +0200
 
     [glib-demo] Support password protected documents
 
- glib/demo/main.c |  175
- ++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ glib/demo/main.c | 175
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 170 insertions(+), 5 deletions(-)
 
 commit 34b2dbb6bbaf0189c92eea6b7924999ab2b6ad11
@@ -18186,8 +21367,8 @@ Date:	Mon Jun 14 17:41:51 2010 +0200
     [glib-demo] Remove GLIB_CHECK_VERSION(), we already depend on
     glib 2.18
 
- glib/demo/attachments.c |    5 -----
- glib/demo/main.c	 |   32 +-------------------------------
+ glib/demo/attachments.c |  5 -----
+ glib/demo/main.c	 | 32 +-------------------------------
  2 files changed, 1 insertion(+), 36 deletions(-)
 
 commit a52670a46c0561025d8b86cd2865603f0720c695
@@ -18198,8 +21379,8 @@ Date:	Sun Jun 13 15:31:15 2010 +0100
 
     they are generated on configure/cmake time and depend on the machine
 
- glib/Makefile.am    |	  7 +++----
- poppler/Makefile.am |	  4 ++--
+ glib/Makefile.am    | 7 +++----
+ poppler/Makefile.am | 4 ++--
  2 files changed, 5 insertions(+), 6 deletions(-)
 
 commit eb0206ba8458f1dba004ac7bef856dcbb2ccbba5
@@ -18210,7 +21391,7 @@ Date:	Wed Jun 9 18:56:16 2010 +0100
 
     Bug 28458
 
- Makefile.am |	  2 ++
+ Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 7dfdf1ee293b7d36a049a90d8a17462ed0e50f2c
@@ -18219,7 +21400,7 @@ Date:	Tue Jun 8 21:54:52 2010 +0100
 
     Typo--
 
- utils/pdftoppm.1 |    2 +-
+ utils/pdftoppm.1 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 57cc04ee1a122794b338c0d9818dbdaea46a42d6
@@ -18228,7 +21409,7 @@ Date:	Tue Jun 8 21:49:40 2010 +0100
 
     Add cropbox to the manpage
 
- utils/pdftoppm.1 |    3 +++
+ utils/pdftoppm.1 | 3 +++
  1 file changed, 3 insertions(+)
 
 commit f9e6cb9647981f7afbb20261b3ccedaf003657d2
@@ -18237,11 +21418,11 @@ Date:	Tue Jun 8 20:43:11 2010 +0100
 
     0.14.0
 
- CMakeLists.txt   |    4 ++--
- NEWS		  |   18 ++++++++++++++++++
- configure.ac	  |    4 ++--
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  4 ++--
+ NEWS		  | 18 ++++++++++++++++++
+ configure.ac	  |  4 ++--
+ cpp/Doxyfile	  |  2 +-
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 24 insertions(+), 6 deletions(-)
 
 commit 963afdc39153fee69ecb939c98deeef4f64638de
@@ -18250,8 +21431,8 @@ Date:	Tue Jun 8 20:29:58 2010 +0100
 
     libpoppler-qt4.so.3.2.0 -> libpoppler-qt4.so.3.3.0
 
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Makefile.am	|    2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit c1629be8011f3bddbf619246090640d62136d521
@@ -18260,8 +21441,8 @@ Date:	Tue Jun 8 20:23:00 2010 +0100
 
     Increase soname as _PopplerActionMovie struct grew
 
- glib/CMakeLists.txt |	  2 +-
- glib/Makefile.am    |	  2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 5ef45b1e72aed88ece0905b1204edee641f3c8fc
@@ -18272,7 +21453,7 @@ Date:	Tue Jun 8 19:35:20 2010 +0100
 
     See bug 28406
 
- poppler/XRef.cc |    6 +++++-
+ poppler/XRef.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit e7a5e9f70ee1283a2ca6734552d905279c97989b
@@ -18281,7 +21462,7 @@ Date:	Fri Jun 4 08:46:33 2010 +0100
 
     a bit of docu
 
- poppler/Object.h |    2 +-
+ poppler/Object.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9ff4dab2558f7c2700fd7fcaccacdad9619dbdda
@@ -18297,10 +21478,10 @@ Date:	Fri Jun 4 08:44:34 2010 +0100
     in a
     32 bit unsigned integer
 
- poppler/Lexer.cc	    |	32 +++++++++++++++++++++++++-------
- poppler/Object.cc	    |	 5 ++++-
- poppler/Object.h	    |	14 +++++++++++---
- poppler/SecurityHandler.cc |	22 ++++++++++++++++++++++
+ poppler/Lexer.cc	    | 32 +++++++++++++++++++++++++-------
+ poppler/Object.cc	    |  5 ++++-
+ poppler/Object.h	    | 14 +++++++++++---
+ poppler/SecurityHandler.cc | 22 ++++++++++++++++++++++
  4 files changed, 62 insertions(+), 11 deletions(-)
 
 commit 41e9af7f505dbfbda36f6ac97df90f2a42ab3160
@@ -18309,7 +21490,7 @@ Date:	Tue Jun 1 21:40:07 2010 +0100
 
     If the document is not encrypted it is ok to print
 
- poppler/XRef.cc |   16 ++++++++++------
+ poppler/XRef.cc | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 commit b15c793a8a58b17a7fe7b32c1037726e1e0e1bf0
@@ -18322,7 +21503,7 @@ Date:	Tue Jun 1 20:57:16 2010 +0100
     but can not check if this really fixes it since he can not share the
     document
 
- poppler/Lexer.h |    8 ++++----
+ poppler/Lexer.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit a72c68117ba05f3934e2df227cdcaf53a375f0ce
@@ -18331,8 +21512,8 @@ Date:	Fri May 28 18:11:02 2010 +0200
 
     [cpp apidox] add a start of API documentation for the 'page' class
 
- cpp/poppler-page.cpp |   68
- ++++++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-page.cpp | 68
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 68 insertions(+)
 
 commit acf7729e8e270e1b4b2a552272dc280ae6d7b352
@@ -18341,7 +21522,7 @@ Date:	Fri May 28 17:38:35 2010 +0200
 
     [cpp] fix the font_iterator current page status
 
- cpp/poppler-font.cpp |    8 ++++++--
+ cpp/poppler-font.cpp | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 4e017ff24a01cbbf1b39eedc3d7697f8b180fdd9
@@ -18351,8 +21532,8 @@ Date:	Fri May 28 17:15:28 2010 +0200
     [cpp apidox] add API documentation for the 'font_info' and
     'font_iterator' classes
 
- cpp/poppler-font.cpp |   71
- ++++++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-font.cpp | 71
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 71 insertions(+)
 
 commit 2ff840b62e41e2fc98e9fcff7330f40216de58a5
@@ -18365,11 +21546,11 @@ Date:	Fri May 28 14:34:37 2010 +0200
     this way it is possible to call it from inside poppler-cpp without
     an implicit conversion to std::string
 
- cpp/poppler-document.cpp      |    2 +-
- cpp/poppler-embedded-file.cpp |    4 ++--
- cpp/poppler-global.cpp        |   23 ++---------------------
- cpp/poppler-private.cpp       |   25 +++++++++++++++++++++++++
- cpp/poppler-private.h	       |    2 ++
+ cpp/poppler-document.cpp      |  2 +-
+ cpp/poppler-embedded-file.cpp |  4 ++--
+ cpp/poppler-global.cpp        | 23 ++---------------------
+ cpp/poppler-private.cpp       | 25 +++++++++++++++++++++++++
+ cpp/poppler-private.h	       |  2 ++
  5 files changed, 32 insertions(+), 24 deletions(-)
 
 commit 8112e9111313eaded4cd2e89d0e67efb0f3e29db
@@ -18381,12 +21562,12 @@ Date:	Fri May 28 13:13:50 2010 +0200
     ... defined as unsigned int, and use it all around
     (it changes nothing for client code)
 
- cpp/poppler-document.cpp      |    8 ++++----
- cpp/poppler-document.h        |    2 +-
- cpp/poppler-embedded-file.cpp |    4 ++--
- cpp/poppler-embedded-file.h   |    4 ++--
- cpp/poppler-global.cpp        |    4 ++--
- cpp/poppler-global.h	       |    4 +++-
+ cpp/poppler-document.cpp      | 8 ++++----
+ cpp/poppler-document.h        | 2 +-
+ cpp/poppler-embedded-file.cpp | 4 ++--
+ cpp/poppler-embedded-file.h   | 4 ++--
+ cpp/poppler-global.cpp        | 4 ++--
+ cpp/poppler-global.h	       | 4 +++-
  6 files changed, 14 insertions(+), 12 deletions(-)
 
 commit bc5bdb43b12437e00aaddc27a74b9ac4b6498446
@@ -18395,7 +21576,7 @@ Date:	Fri May 28 13:01:53 2010 +0200
 
     use the proper type for iterating on a GooVector
 
- poppler/XRef.cc |    2 +-
+ poppler/XRef.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 87128ab0dfec6be1a034361512ee41301b078831
@@ -18404,7 +21585,7 @@ Date:	Thu May 27 17:31:00 2010 +0200
 
     [CMake] Do not force -O2, preserve compiler flags instead.
 
- cmake/modules/PopplerMacros.cmake |	4 ++--
+ cmake/modules/PopplerMacros.cmake | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 241c338facb45641ef1a271c904355a014bbf28d
@@ -18413,10 +21594,10 @@ Date:	Thu May 27 20:37:55 2010 +0100
 
     Allow quality & progressive mode to be utilised in JpegWriter
 
- goo/JpegWriter.cc	|   15 +++++++++++++--
- goo/JpegWriter.h	|    4 ++++
- splash/SplashBitmap.cc |   18 +++++++++---------
- splash/SplashBitmap.h	|    4 ++++
+ goo/JpegWriter.cc	| 15 +++++++++++++--
+ goo/JpegWriter.h	|  4 ++++
+ splash/SplashBitmap.cc | 18 +++++++++---------
+ splash/SplashBitmap.h	|  4 ++++
  4 files changed, 30 insertions(+), 11 deletions(-)
 
 commit 9eda6e8aaae412a9882141d1b5b8c7bf0c823c68
@@ -18427,8 +21608,8 @@ Date:	Tue May 25 23:44:30 2010 +0100
 
     Fixes crash in pdf in bug 28172
 
- poppler/XRef.cc |   21 +++++++++++++++------
- poppler/XRef.h  |    7 ++++---
+ poppler/XRef.cc | 21 +++++++++++++++------
+ poppler/XRef.h  |  7 ++++---
  2 files changed, 19 insertions(+), 9 deletions(-)
 
 commit bbee6e0c8c9b181f8d19c167c867d74a765685fb
@@ -18437,7 +21618,7 @@ Date:	Tue May 25 23:13:38 2010 +0100
 
     update copyright
 
- poppler/JBIG2Stream.cc |    2 +-
+ poppler/JBIG2Stream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 80b72b9f2fd70395580205b8b176e0576e132cf5
@@ -18448,7 +21629,7 @@ Date:	Wed May 26 13:07:57 2010 +0200
 
     In addition to commit 69c2cf76cef9c190ac07726f60f1dccd3df5cb6d
 
- poppler/poppler-config.h.in |	  4 ++++
+ poppler/poppler-config.h.in | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 30ea3ab8a1eecafb3366aef193910098fdb7ccc8
@@ -18459,7 +21640,7 @@ Date:	Tue May 25 23:07:56 2010 +0100
 
     This code is a can of crashing worms :-7
 
- poppler/JBIG2Stream.cc |   23 ++++++++++++++++-------
+ poppler/JBIG2Stream.cc | 23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 
 commit b5a9021037c4e6cbbfd622433f3de693d1f47671
@@ -18468,23 +21649,23 @@ Date:	Tue May 25 20:00:57 2010 +0100
 
     0.13.4
 
- CMakeLists.txt				      |    2 +-
- NEWS					      |   16 ++++++++++++++++
- configure.ac				      |    2 +-
- cpp/Doxyfile				      |    2 +-
- glib/reference/tmpl/poppler-action.sgml      |    5 +++++
- glib/reference/tmpl/poppler-annot.sgml       |   18 ++++++++++++++++++
- glib/reference/tmpl/poppler-attachment.sgml  |    3 +++
- glib/reference/tmpl/poppler-document.sgml    |    5 +++++
- glib/reference/tmpl/poppler-enums.sgml       |   17 +++++++++++++++++
- glib/reference/tmpl/poppler-features.sgml    |    3 +++
- glib/reference/tmpl/poppler-form-field.sgml  |    3 +++
- glib/reference/tmpl/poppler-layer.sgml       |    4 ++++
- glib/reference/tmpl/poppler-page.sgml	      |   13 +++++++++++++
- glib/reference/tmpl/poppler-private.sgml     |    3 +++
- glib/reference/tmpl/poppler.sgml	      |    6 ++++++
- glib/reference/tmpl/stamp-poppler-enums.sgml |    3 +++
- qt4/src/Doxyfile			      |    2 +-
+ CMakeLists.txt				      |  2 +-
+ NEWS					      | 16 ++++++++++++++++
+ configure.ac				      |  2 +-
+ cpp/Doxyfile				      |  2 +-
+ glib/reference/tmpl/poppler-action.sgml      |  5 +++++
+ glib/reference/tmpl/poppler-annot.sgml       | 18 ++++++++++++++++++
+ glib/reference/tmpl/poppler-attachment.sgml  |  3 +++
+ glib/reference/tmpl/poppler-document.sgml    |  5 +++++
+ glib/reference/tmpl/poppler-enums.sgml       | 17 +++++++++++++++++
+ glib/reference/tmpl/poppler-features.sgml    |  3 +++
+ glib/reference/tmpl/poppler-form-field.sgml  |  3 +++
+ glib/reference/tmpl/poppler-layer.sgml       |  4 ++++
+ glib/reference/tmpl/poppler-page.sgml	      | 13 +++++++++++++
+ glib/reference/tmpl/poppler-private.sgml     |  3 +++
+ glib/reference/tmpl/poppler.sgml	      |  6 ++++++
+ glib/reference/tmpl/stamp-poppler-enums.sgml |  3 +++
+ qt4/src/Doxyfile			      |  2 +-
  17 files changed, 103 insertions(+), 4 deletions(-)
 
 commit 57ab0ebe993d79fe551bba58e0a70d55d32828f8
@@ -18493,7 +21674,7 @@ Date:	Wed May 12 20:49:31 2010 +0100
 
     better copyright
 
- poppler/strtok_r.cpp |   23 +++++++++++++++++++++++
+ poppler/strtok_r.cpp | 23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
 
 commit 69c2cf76cef9c190ac07726f60f1dccd3df5cb6d
@@ -18504,11 +21685,11 @@ Date:	Wed May 12 20:47:25 2010 +0100
 
     Copy the glibc implementation
 
- CMakeLists.txt			|    1 +
- poppler/Makefile.am		|    1 +
- poppler/poppler-config.h.cmake |    4 +
- poppler/strtok_r.cpp		|  189
- ++++++++++++++++++++++++++++++++++++++++
+ CMakeLists.txt			|   1 +
+ poppler/Makefile.am		|   1 +
+ poppler/poppler-config.h.cmake |   4 +
+ poppler/strtok_r.cpp		| 189
+ +++++++++++++++++++++++++++++++++++++++++
  4 files changed, 195 insertions(+)
 
 commit 9e9b5e0d87a7450bd2223538673321ecec720c36
@@ -18520,7 +21701,7 @@ Date:	Tue May 11 12:06:17 2010 +0200
     Add check for overlapping of upper right cell with lower left cell
     of assumed table (related to #3188).
 
- poppler/TextOutputDev.cc |    5 ++++-
+ poppler/TextOutputDev.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit a3e40b460b7690ef73ccf143b10da07e91d9ee7f
@@ -18534,7 +21715,7 @@ Date:	Mon May 10 17:41:04 2010 +0200
     though the
     annot bbox is empty.
 
- poppler/Annot.cc |   10 ++++++++++
+ poppler/Annot.cc | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit e30d24c506a9ff742f8af5d6c71273abeddaa265
@@ -18543,7 +21724,7 @@ Date:	Tue May 4 15:19:26 2010 +0200
 
     [cpp] ustring::{from,to}_utf8(): fix in/out buffer sizes
 
- cpp/poppler-global.cpp |    4 ++--
+ cpp/poppler-global.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit aaa19a673020e12dbfceb4d25ade0ece7875fd83
@@ -18552,8 +21733,8 @@ Date:	Tue May 4 12:07:43 2010 +0200
 
     [cpp] make the pkg-config files really working
 
- poppler-cpp.pc.cmake |    6 +++++-
- poppler-cpp.pc.in    |    6 +++++-
+ poppler-cpp.pc.cmake | 6 +++++-
+ poppler-cpp.pc.in    | 6 +++++-
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 commit 8f963ccde41ef1faa719254fccc5bdfe75e9fa87
@@ -18562,8 +21743,8 @@ Date:	Sun May 2 18:42:10 2010 +0200
 
     Windows: define strtok_r as strtok_s
 
- poppler/poppler-config.h.cmake |    4 ++++
- poppler/poppler-config.h.in	|    4 ++++
+ poppler/poppler-config.h.cmake | 4 ++++
+ poppler/poppler-config.h.in	| 4 ++++
  2 files changed, 8 insertions(+)
 
 commit c9d8df51c96e50ad72f7954baba2254259fc894c
@@ -18572,8 +21753,8 @@ Date:	Sat May 1 19:52:51 2010 +0100
 
     2010 in these copyrights
 
- poppler/poppler-config.h.cmake |    2 +-
- poppler/poppler-config.h.in	|    2 +-
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 9ce71fb35fdd66c55872956432160a5c76a62080
@@ -18584,11 +21765,11 @@ Date:	Sat May 1 19:50:54 2010 +0100
 
     strtok is not thread safe
 
- fofi/FoFiType1.cc	      |    8 +++++---
- poppler/CharCodeToUnicode.cc |    6 ++++--
- poppler/GlobalParams.cc      |    6 ++++--
- poppler/PDFDoc.cc	      |    4 +++-
- poppler/UnicodeMap.cc	      |   21 ++++++++++++++++++---
+ fofi/FoFiType1.cc	      |  8 +++++---
+ poppler/CharCodeToUnicode.cc |  6 ++++--
+ poppler/GlobalParams.cc      |  6 ++++--
+ poppler/PDFDoc.cc	      |  4 +++-
+ poppler/UnicodeMap.cc	      | 21 ++++++++++++++++++---
  5 files changed, 34 insertions(+), 11 deletions(-)
 
 commit 6b2983f89e87792a393880dab6dc1fedb748db2c
@@ -18600,7 +21781,7 @@ Date:	Fri Apr 30 14:48:50 2010 +0200
 
     It seems to fix all of my test cases. Fixes bug #27208.
 
- poppler/CairoOutputDev.cc |   21 +++++++++++++++------
+ poppler/CairoOutputDev.cc | 21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
 
 commit ac32021704178721ee007a6b6831283e323e500f
@@ -18609,7 +21790,7 @@ Date:	Fri Apr 30 01:14:14 2010 +0200
 
     demote the #warning to a simple FIXME comment
 
- poppler/ArthurOutputDev.cc |	 4 +---
+ poppler/ArthurOutputDev.cc | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 8c1bc17552c989c15f318d9d109607a9a594ca6b
@@ -18622,8 +21803,8 @@ Date:	Fri Apr 30 01:12:19 2010 +0200
     the existing max()/mix() macros.
     Thanks to Patrick Spendrin for the hint!
 
- poppler/poppler-config.h.cmake |    5 +++++
- poppler/poppler-config.h.in	|    5 +++++
+ poppler/poppler-config.h.cmake | 5 +++++
+ poppler/poppler-config.h.in	| 5 +++++
  2 files changed, 10 insertions(+)
 
 commit 71063d51a45835b0267a7e3f823ef49689cfd06f
@@ -18634,7 +21815,7 @@ Date:	Thu Apr 29 20:28:07 2010 +0200
 
     This is actually the right fix for the previous commit.
 
- poppler/Gfx.cc |   10 +++++-----
+ poppler/Gfx.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit e909219d8e92994bd52976f9676015fa6ca9fc91
@@ -18647,7 +21828,7 @@ Date:	Thu Apr 29 18:34:22 2010 +0200
     Fixes cairo backend regressions caused by commit
     ccf238b32e236f69c0507a5421ac2649dfa8d865.
 
- poppler/Gfx.cc |    4 ++--
+ poppler/Gfx.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 29572d6ac7829b60efce2d8e489473c55e370f26
@@ -18656,7 +21837,7 @@ Date:	Tue Apr 27 23:39:23 2010 +0100
 
     fabs for doubles
 
- poppler/TextOutputDev.cc |   24 ++++++++++++------------
+ poppler/TextOutputDev.cc | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit 4905e2bd764ea601e3bf9c5195c740e5bf186af5
@@ -18665,7 +21846,7 @@ Date:	Tue Apr 27 23:34:34 2010 +0100
 
     fix include
 
- splash/SplashBitmap.cc |    1 +
+ splash/SplashBitmap.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit f9f0e4b747a1527bd6354897cdba7954d58651de
@@ -18676,7 +21857,7 @@ Date:	Tue Apr 27 14:26:23 2010 +0200
 
     Fixes bug #27837.
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5b822011029f3721fbafd4a7bf01b9d6fee35d25
@@ -18685,7 +21866,7 @@ Date:	Sat Apr 24 18:18:08 2010 +0200
 
     include standard float.h instead of unportable values.h
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit dee7cb8691528293bb5b8f266970cdb6771e301b
@@ -18694,11 +21875,11 @@ Date:	Sat Apr 24 15:39:23 2010 +0100
 
     0.13.3
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   31 +++++++++++++++++++++++++++++++
- configure.ac	  |    2 +-
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 31 +++++++++++++++++++++++++++++++
+ configure.ac	  |  2 +-
+ cpp/Doxyfile	  |  2 +-
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 35 insertions(+), 4 deletions(-)
 
 commit 07864c9e2a7a32b48bdbab92c8b2f79bce1d9f5b
@@ -18707,8 +21888,8 @@ Date:	Sat Apr 24 13:07:02 2010 +0100
 
     minor cleanups
 
- utils/HtmlLinks.cc |	15 ++-------------
- utils/HtmlLinks.h  |	16 ++++++++++++++--
+ utils/HtmlLinks.cc | 15 ++-------------
+ utils/HtmlLinks.h  | 16 ++++++++++++++--
  2 files changed, 16 insertions(+), 15 deletions(-)
 
 commit e501eabb2f0775444a2bf64005a3a3f1ffa281b4
@@ -18717,7 +21898,7 @@ Date:	Sat Apr 24 13:06:12 2010 +0100
 
     Do not assume the parameter will have more than 5 chars
 
- utils/pdftohtml.cc |	30 ++++++++++++++++++------------
+ utils/pdftohtml.cc | 30 ++++++++++++++++++------------
  1 file changed, 18 insertions(+), 12 deletions(-)
 
 commit 6cc4d571339214e9eeeb682ba48fb220cef905f9
@@ -18726,7 +21907,7 @@ Date:	Sat Apr 24 13:04:05 2010 +0100
 
     Fix end() to return the correct last valid value
 
- goo/GooVector.h |    5 +++--
+ goo/GooVector.h | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 4ed53e30e735b79c46eab9d54883531c6e187b17
@@ -18737,7 +21918,7 @@ Date:	Fri Apr 23 22:52:24 2010 +0100
 
     Fixes #27728
 
- poppler/CharCodeToUnicode.cc |    7 +++++--
+ poppler/CharCodeToUnicode.cc | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit 16a004784043e2a8587c0c3c6d23889df8a80470
@@ -18746,7 +21927,7 @@ Date:	Thu Apr 22 19:39:01 2010 +0100
 
     Avoid the usage of std::
 
- poppler/TextOutputDev.cc |   25 +++++++++++--------------
+ poppler/TextOutputDev.cc | 25 +++++++++++--------------
  1 file changed, 11 insertions(+), 14 deletions(-)
 
 commit a7dcb2b4ffee57b7f78529cbaeaab647ab93de86
@@ -18762,7 +21943,7 @@ Date:	Thu Apr 22 13:31:41 2010 +0200
     as safety check, check for PACKAGE_NAME (#define'd in config.h)
     before #include'ing it again
 
- poppler/GlobalParamsWin.cc |	 2 ++
+ poppler/GlobalParamsWin.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit fba076e17af24a9c9883504282316bba119a908c
@@ -18775,7 +21956,7 @@ Date:	Thu Apr 22 13:24:04 2010 +0200
     compilers won't try to replace their macro max(a, b) there; in any
     case, empty spaces are just fine
 
- poppler/TextOutputDev.cc |   11 +++++++----
+ poppler/TextOutputDev.cc | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit ccf238b32e236f69c0507a5421ac2649dfa8d865
@@ -18786,11 +21967,11 @@ Date:	Wed Apr 21 19:21:37 2010 +0100
 
     Bug #27482
 
- poppler/Gfx.cc		    |  137
- +++++++++++++++++++++-----------------------
- poppler/Gfx.h		    |	 4 +-
- poppler/SplashOutputDev.cc |	41 +++++++++++--
- poppler/SplashOutputDev.h  |	 3 +-
+ poppler/Gfx.cc		    | 137
+ ++++++++++++++++++++++-----------------------
+ poppler/Gfx.h		    |	4 +-
+ poppler/SplashOutputDev.cc |  41 ++++++++++++--
+ poppler/SplashOutputDev.h  |	3 +-
  4 files changed, 106 insertions(+), 79 deletions(-)
 
 commit 8e86dfb328d94939ecf390d34af533b831b2837b
@@ -18799,8 +21980,8 @@ Date:	Wed Apr 21 19:19:53 2010 +0100
 
     Add copyright
 
- poppler/TextOutputDev.cc |    1 +
- poppler/TextOutputDev.h  |    1 +
+ poppler/TextOutputDev.cc | 1 +
+ poppler/TextOutputDev.h  | 1 +
  2 files changed, 2 insertions(+)
 
 commit 6f9f3d33ff8058e28243ba45b8547e21ad0d088a
@@ -18811,9 +21992,9 @@ Date:	Wed Apr 21 19:57:15 2010 +0200
 
     Fixes bug #27579.
 
- glib/demo/images.c |	 2 +-
- glib/demo/layers.c |	 4 ++--
- glib/demo/render.c |	 8 ++++----
+ glib/demo/images.c | 2 +-
+ glib/demo/layers.c | 4 ++--
+ glib/demo/render.c | 8 ++++----
  3 files changed, 7 insertions(+), 7 deletions(-)
 
 commit 6b14c18d60cae130869f9a5c7688dfe880602224
@@ -18826,7 +22007,7 @@ Date:	Wed Apr 21 19:56:49 2010 +0200
     http://acroeng.adobe.com/Test_Files/images/transparency/Untitled-2.pdf
     when rendering with cairo backend.
 
- poppler/CairoOutputDev.cc |	1 +
+ poppler/CairoOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 4f71d64c69500ed78daf4d797c8af6cfbd3d970e
@@ -18835,7 +22016,7 @@ Date:	Wed Apr 21 11:44:49 2010 +0200
 
     [cairo] Fix pattern size when bbox is not at 0,0
 
- poppler/CairoOutputDev.cc |   11 +++++++++--
+ poppler/CairoOutputDev.cc | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 commit 9c5612f6e013a8698eff6531ec388a7e6c1fb89a
@@ -18858,9 +22039,9 @@ Date:	Fri Feb 12 14:31:01 2010 +0100
     correctly
     (even with multi line cells).
 
- poppler/TextOutputDev.cc |  490
- ++++++++++++++++++++++++++++++++++++++++------
- poppler/TextOutputDev.h  |    5 +
+ poppler/TextOutputDev.cc | 490
+ +++++++++++++++++++++++++++++++++++++++++------
+ poppler/TextOutputDev.h  |   5 +
  2 files changed, 437 insertions(+), 58 deletions(-)
 
 commit db014ffb357e760d9397544c5a8fe747cdb497ab
@@ -18873,8 +22054,8 @@ Date:	Mon Nov 23 08:58:19 2009 +0000
     Rendering of the selection is poor and the dumped text appears
     to still be in reverse order to me.
 
- poppler/TextOutputDev.cc |   57
- ++++++++++++++++++++++++++++++++++------------
+ poppler/TextOutputDev.cc | 57
+ ++++++++++++++++++++++++++++++++++++------------
  1 file changed, 43 insertions(+), 14 deletions(-)
 
 commit b1d43fa052d9160c4f319a67415ecf3ebf2cf9b3
@@ -18889,7 +22070,7 @@ Date:	Sun Nov 22 09:47:40 2009 +0000
     a hyphenation is being supressed, and an extra
     newline at the end of each flow.
 
- poppler/TextOutputDev.cc |   17 +++--------------
+ poppler/TextOutputDev.cc | 17 +++--------------
  1 file changed, 3 insertions(+), 14 deletions(-)
 
 commit f83b677a8eb44d65698b77edb13a5c7de3a72c0f
@@ -18904,9 +22085,9 @@ Date:	Thu Nov 12 02:50:29 2009 +0000
 
     Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
 
- poppler/TextOutputDev.cc |  164
- ++++++++++++++++++++++++++++++++++++++++++++--
- poppler/TextOutputDev.h  |    8 +++
+ poppler/TextOutputDev.cc | 164
+ +++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/TextOutputDev.h  |   8 +++
  2 files changed, 167 insertions(+), 5 deletions(-)
 
 commit a2191a4d45e0abaec97c19aacae37c4c5824bd36
@@ -18923,8 +22104,8 @@ Date:	Mon Nov 9 06:24:51 2009 +0000
 
     Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
 
- poppler/TextOutputDev.cc |   96
- ++++++++--------------------------------------
+ poppler/TextOutputDev.cc | 96
+ +++++++++---------------------------------------
  1 file changed, 17 insertions(+), 79 deletions(-)
 
 commit 345ed51af9b9e7ea53af42727b91ed68dcc52370
@@ -18943,8 +22124,8 @@ Date:	Thu Oct 29 01:46:29 2009 +0000
 
     Signed-off-by: Brian Ewins <brian.ewins@gmail.com>
 
- poppler/TextOutputDev.cc |  334
- ++++++++++++++++++++++++----------------------
+ poppler/TextOutputDev.cc | 334
+ +++++++++++++++++++++++++----------------------
  1 file changed, 178 insertions(+), 156 deletions(-)
 
 commit 12d83931ae1b899b70c7ea5c01f03f123b1bb9a8
@@ -18957,7 +22138,7 @@ Date:	Sun Apr 18 17:53:48 2010 +0200
     Fixes rendering of document attached to kde bug
     http://bugs.kde.org/show_bug.cgi?id=135417.
 
- poppler/CairoOutputDev.cc |   34 ++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.cc | 34 ++++++++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
 
 commit ff6d501a2fc887fd49a985161f756d6d6b8e6c0d
@@ -18968,7 +22149,7 @@ Date:	Sun Apr 18 17:51:42 2010 +0200
 
     See kde bug http://bugs.kde.org/show_bug.cgi?id=135417
 
- poppler/CairoOutputDev.cc |	3 +++
+ poppler/CairoOutputDev.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 84cd2186861436fbaa7c29aa691e69fcd543a1c2
@@ -18977,7 +22158,7 @@ Date:	Tue Apr 13 23:42:28 2010 +0200
 
     Properly initialize variable
 
- poppler/CachedFile.cc |    1 +
+ poppler/CachedFile.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 24f244f486f332b0bd76c6525c5d9d03168a76e6
@@ -18986,7 +22167,7 @@ Date:	Tue Apr 13 23:54:28 2010 +0200
 
     pdftops: require output filename when reading from stdin
 
- utils/pdftops.cc |    3 +++
+ utils/pdftops.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 955f9f53ff225f6794a494fdd0f0fe5ee1a41d88
@@ -18995,7 +22176,7 @@ Date:	Tue Apr 13 23:47:40 2010 +0200
 
     pdftotext: require output filename when reading from stdin
 
- utils/pdftotext.cc |	 3 +++
+ utils/pdftotext.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 31388aa8b5117619878431b7fed2d033000af541
@@ -19004,7 +22185,7 @@ Date:	Tue Apr 13 23:27:20 2010 +0200
 
     pdftohtml: require output filename when reading from stdin
 
- utils/pdftohtml.cc |	 3 +++
+ utils/pdftohtml.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit a8d43ec1c7f5448a7f63d9bbd9062d56ee1c7c58
@@ -19015,8 +22196,8 @@ Date:	Wed Apr 14 19:21:33 2010 +0100
 
     it seems helps compiling on some BSD
 
- cmake/modules/PopplerMacros.cmake |	2 +-
- configure.ac			   |	2 +-
+ cmake/modules/PopplerMacros.cmake | 2 +-
+ configure.ac			   | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 4cce1f14e964edf1bf2d9fb8286ee002a67dc212
@@ -19025,8 +22206,8 @@ Date:	Tue Apr 13 21:57:16 2010 +0100
 
     include strings.h on non windows platforms
 
- poppler/GlobalParams.cc |    2 ++
- test/perf-test.cc	 |    2 ++
+ poppler/GlobalParams.cc | 2 ++
+ test/perf-test.cc	 | 2 ++
  2 files changed, 4 insertions(+)
 
 commit 55c76069c52f9f51c6b8c60fe1aa8de499012ea8
@@ -19037,8 +22218,8 @@ Date:	Mon Apr 12 19:32:46 2010 +0200
 
     I should fix bug #5589 for the GDK api too.
 
- glib/poppler-page.cc |  227
- +++++++++++++++++++++-----------------------------
+ glib/poppler-page.cc | 227
+ +++++++++++++++++++++------------------------------
  1 file changed, 93 insertions(+), 134 deletions(-)
 
 commit 51aefe1423a068e8c119c21a8791d265aecbeaf5
@@ -19047,7 +22228,7 @@ Date:	Fri Apr 9 12:50:00 2010 +0200
 
     [cairo] Implement colorizing image masks with pattern colorspace
 
- poppler/CairoOutputDev.cc |	9 +++++++++
+ poppler/CairoOutputDev.cc | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit bd8f44289770175a17ac45e4788b0d374cc93d5a
@@ -19060,7 +22241,7 @@ Date:	Fri Apr 9 12:02:38 2010 +0200
     a32f6f9ebaed3e4827b9dc6cb37e307c2798f521.
     It fixed bug #27208, but it's causing regressions on other documents.
 
- poppler/CairoOutputDev.cc |   11 ++++++++++-
+ poppler/CairoOutputDev.cc | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit bcb405c43fb7140f5d601d00de4d30913a0050ef
@@ -19071,7 +22252,7 @@ Date:	Thu Apr 8 12:02:48 2010 +0200
 
     Use getForm() instead of form when creating a page object.
 
- poppler/Catalog.cc |	 2 +-
+ poppler/Catalog.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d46581c574b3088a82555cbc3b76e95e2571b9c0
@@ -19080,8 +22261,8 @@ Date:	Wed Apr 7 20:25:23 2010 +0100
 
     Fix destructor
 
- poppler/Catalog.cc |	19 +++++++------------
- poppler/Catalog.h  |	 3 +--
+ poppler/Catalog.cc | 19 +++++++------------
+ poppler/Catalog.h  |  3 +--
  2 files changed, 8 insertions(+), 14 deletions(-)
 
 commit ab14433f8b3d7c67f279cece65dfdd40c6675ac0
@@ -19090,8 +22271,8 @@ Date:	Thu Mar 25 15:33:33 2010 +0100
 
     Parse Form on demand
 
- poppler/Catalog.cc |	21 +++++++++++++--------
- poppler/Catalog.h  |	 2 +-
+ poppler/Catalog.cc | 21 +++++++++++++--------
+ poppler/Catalog.h  |  2 +-
  2 files changed, 14 insertions(+), 9 deletions(-)
 
 commit c72a2c7f70b13a7b7b531b3c983d9a9bc104bac7
@@ -19100,9 +22281,9 @@ Date:	Thu Mar 25 17:33:11 2010 +0100
 
     Parse Names on demand
 
- poppler/Catalog.cc |  112
- ++++++++++++++++++++++++++++++++++++++++++----------
- poppler/Catalog.h  |	18 ++++++---
+ poppler/Catalog.cc | 112
+ +++++++++++++++++++++++++++++++++++++++++++----------
+ poppler/Catalog.h  |  18 ++++++---
  2 files changed, 104 insertions(+), 26 deletions(-)
 
 commit 32053360c93607cf9bdc092257cefad5d4df9ec5
@@ -19111,8 +22292,8 @@ Date:	Thu Mar 25 16:32:22 2010 +0100
 
     Parse Dests on demand
 
- poppler/Catalog.cc |	27 +++++++++++++++++++++------
- poppler/Catalog.h  |	 2 +-
+ poppler/Catalog.cc | 27 +++++++++++++++++++++------
+ poppler/Catalog.h  |  2 +-
  2 files changed, 22 insertions(+), 7 deletions(-)
 
 commit da0f8e69eecb944e128474f62829f729eeabd189
@@ -19121,8 +22302,8 @@ Date:	Thu Mar 25 16:48:07 2010 +0100
 
     Parse Outline on demand in PDFDoc
 
- poppler/PDFDoc.cc |   17 ++++++++++++-----
- poppler/PDFDoc.h  |	2 +-
+ poppler/PDFDoc.cc | 17 ++++++++++++-----
+ poppler/PDFDoc.h  |  2 +-
  2 files changed, 13 insertions(+), 6 deletions(-)
 
 commit d7a69c8cad112cb6616d0192d8a4028fdaee2f73
@@ -19131,8 +22312,8 @@ Date:	Thu Mar 25 16:05:02 2010 +0100
 
     Parse Outline on demand
 
- poppler/Catalog.cc |	23 ++++++++++++++++++++---
- poppler/Catalog.h  |	 2 +-
+ poppler/Catalog.cc | 23 ++++++++++++++++++++---
+ poppler/Catalog.h  |  2 +-
  2 files changed, 21 insertions(+), 4 deletions(-)
 
 commit c149e027fa76824221a78fe6d3bf9bfe953491d4
@@ -19141,8 +22322,8 @@ Date:	Thu Mar 25 15:51:51 2010 +0100
 
     Parse StructTreeRoot on demand
 
- poppler/Catalog.cc |	22 +++++++++++++++++++---
- poppler/Catalog.h  |	 2 +-
+ poppler/Catalog.cc | 22 +++++++++++++++++++---
+ poppler/Catalog.h  |  2 +-
  2 files changed, 20 insertions(+), 4 deletions(-)
 
 commit 3c6effe44d6d97f175c2ee7f3913d8c4ba34d612
@@ -19151,7 +22332,7 @@ Date:	Thu Mar 25 14:55:22 2010 +0100
 
     Parse Metadata on demand
 
- poppler/Catalog.cc |	16 +++++++++++++---
+ poppler/Catalog.cc | 16 +++++++++++++---
  1 file changed, 13 insertions(+), 3 deletions(-)
 
 commit 749d67ea2346a3453ef41dc37ba59d419ad900b0
@@ -19160,8 +22341,8 @@ Date:	Thu Mar 25 15:09:58 2010 +0100
 
     Parse PageLabelInfo on demand
 
- poppler/Catalog.cc |	37 +++++++++++++++++++++++++++++--------
- poppler/Catalog.h  |	 3 +++
+ poppler/Catalog.cc | 37 +++++++++++++++++++++++++++++--------
+ poppler/Catalog.h  |  3 +++
  2 files changed, 32 insertions(+), 8 deletions(-)
 
 commit 78f7d106714fa489a66c39410163a6902ba24856
@@ -19170,9 +22351,9 @@ Date:	Sat Mar 27 14:43:57 2010 +0100
 
     Parse PageMode and PageLayout on demand
 
- poppler/Catalog.cc |  109
- +++++++++++++++++++++++++++++++++++-----------------
- poppler/Catalog.h  |	11 ++++--
+ poppler/Catalog.cc | 109
+ ++++++++++++++++++++++++++++++++++++-----------------
+ poppler/Catalog.h  |  11 ++++--
  2 files changed, 81 insertions(+), 39 deletions(-)
 
 commit f5dd5be64d09186ee289632c1a61979d15edd605
@@ -19190,7 +22371,7 @@ Date:	Wed Apr 7 19:48:39 2010 +0200
 
     Fixes bug #27450.
 
- poppler/PDFDoc.cc |	9 ++++-----
+ poppler/PDFDoc.cc | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 commit 3f302fdd78cd78873bf5376af84e83741a8daadb
@@ -19199,7 +22380,7 @@ Date:	Tue Apr 6 23:58:46 2010 +0200
 
     use a GooVector<bool> instead of a non-standard variable-length-array
 
- poppler/CachedFile.cc |    6 +++---
+ poppler/CachedFile.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 425a62b5fa8e4e69bfc1c64ed126b5baac06d78a
@@ -19208,8 +22389,8 @@ Date:	Tue Apr 6 10:57:30 2010 +0200
 
     pdfutils: fix deleting fileName
 
- utils/pdfinfo.cc  |	2 +-
- utils/pdftoabw.cc |	2 +-
+ utils/pdfinfo.cc  | 2 +-
+ utils/pdftoabw.cc | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 198c9d61ba93ba62ea2da44a23cd948d43556c3e
@@ -19220,7 +22401,7 @@ Date:	Tue Apr 6 22:00:14 2010 +0100
 
     Not use the full rect when we are drawing "our" notes
 
- poppler/Annot.cc |    9 +++++++--
+ poppler/Annot.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 1422802f029483ad3e62a3a13e66b2d3990ac58f
@@ -19231,7 +22412,7 @@ Date:	Tue Apr 6 12:32:12 2010 +0200
 
     Fixes GNOME Bug https://bugzilla.gnome.org/show_bug.cgi?id=614915
 
- poppler/CairoOutputDev.cc |   27 ++++++++++++++++++++-------
+ poppler/CairoOutputDev.cc | 27 ++++++++++++++++++++-------
  1 file changed, 20 insertions(+), 7 deletions(-)
 
 commit c152d30f879e6cde45de58bb9249035e127e84e7
@@ -19240,9 +22421,9 @@ Date:	Mon Apr 5 18:55:29 2010 +0200
 
     delete fileName in utils
 
- utils/pdftohtml.cc |	 1 +
- utils/pdftops.cc   |	 1 +
- utils/pdftotext.cc |	 1 +
+ utils/pdftohtml.cc | 1 +
+ utils/pdftops.cc   | 1 +
+ utils/pdftotext.cc | 1 +
  3 files changed, 3 insertions(+)
 
 commit f091c83414ab32a4ecf1fa2bd15f13a3cf113a86
@@ -19251,12 +22432,12 @@ Date:	Mon Apr 5 20:12:01 2010 +0100
 
     add some docu
 
- poppler/CachedFile.h	      |   30 ++++++++++++++++++++++++++++++
- poppler/CurlPDFDocBuilder.h  |    2 ++
- poppler/LocalPDFDocBuilder.h |    2 ++
- poppler/PDFDocBuilder.h      |    9 +++++++++
- poppler/PDFDocFactory.h      |   12 ++++++++++++
- poppler/StdinPDFDocBuilder.h |    2 ++
+ poppler/CachedFile.h	      | 30 ++++++++++++++++++++++++++++++
+ poppler/CurlPDFDocBuilder.h  |  2 ++
+ poppler/LocalPDFDocBuilder.h |  2 ++
+ poppler/PDFDocBuilder.h      |  9 +++++++++
+ poppler/PDFDocFactory.h      | 12 ++++++++++++
+ poppler/StdinPDFDocBuilder.h |  2 ++
  6 files changed, 57 insertions(+)
 
 commit fc071d800cb4329a3ccf898d7bf16b4db7323ad8
@@ -19267,9 +22448,9 @@ Date:	Mon Apr 5 19:11:26 2010 +0100
 
     Fixes bug 26280
 
- poppler/DCTStream.cc	|   35 ++++++++++++++---------------------
- poppler/DCTStream.h	|    5 +++--
- utils/HtmlOutputDev.cc |    4 ++--
+ poppler/DCTStream.cc	| 35 ++++++++++++++---------------------
+ poppler/DCTStream.h	|  5 +++--
+ utils/HtmlOutputDev.cc |  4 ++--
  3 files changed, 19 insertions(+), 25 deletions(-)
 
 commit a9d801b2db20ecb08734ee5cdb703abf11994b6e
@@ -19278,29 +22459,29 @@ Date:	Mon Apr 5 16:55:02 2010 +0100
 
     Make some paremeters const & to clearly show we just read them
 
- poppler/CachedFile.cc	       |   18 ++++++++++--------
- poppler/CachedFile.h	       |    8 +++++---
- poppler/CurlCachedFile.cc     |    9 +++++----
- poppler/CurlCachedFile.h      |    3 ++-
- poppler/CurlPDFDocBuilder.cc  |    9 +++++----
- poppler/CurlPDFDocBuilder.h   |    5 +++--
- poppler/LocalPDFDocBuilder.cc |   15 ++++++++-------
- poppler/LocalPDFDocBuilder.h  |    5 +++--
- poppler/PDFDocBuilder.h       |    5 +++--
- poppler/PDFDocFactory.cc      |    7 ++++---
- poppler/PDFDocFactory.h       |    3 ++-
- poppler/StdinCachedFile.cc    |    3 ++-
- poppler/StdinCachedFile.h     |    3 ++-
- poppler/StdinPDFDocBuilder.cc |    7 ++++---
- poppler/StdinPDFDocBuilder.h  |    5 +++--
- utils/pdffonts.cc	       |    4 ++--
- utils/pdfimages.cc	       |    4 ++--
- utils/pdfinfo.cc	       |    4 ++--
- utils/pdftoabw.cc	       |    4 ++--
- utils/pdftohtml.cc	       |    4 ++--
- utils/pdftoppm.cc	       |    2 +-
- utils/pdftops.cc	       |    4 ++--
- utils/pdftotext.cc	       |    4 ++--
+ poppler/CachedFile.cc	       | 18 ++++++++++--------
+ poppler/CachedFile.h	       |  8 +++++---
+ poppler/CurlCachedFile.cc     |  9 +++++----
+ poppler/CurlCachedFile.h      |  3 ++-
+ poppler/CurlPDFDocBuilder.cc  |  9 +++++----
+ poppler/CurlPDFDocBuilder.h   |  5 +++--
+ poppler/LocalPDFDocBuilder.cc | 15 ++++++++-------
+ poppler/LocalPDFDocBuilder.h  |  5 +++--
+ poppler/PDFDocBuilder.h       |  5 +++--
+ poppler/PDFDocFactory.cc      |  7 ++++---
+ poppler/PDFDocFactory.h       |  3 ++-
+ poppler/StdinCachedFile.cc    |  3 ++-
+ poppler/StdinCachedFile.h     |  3 ++-
+ poppler/StdinPDFDocBuilder.cc |  7 ++++---
+ poppler/StdinPDFDocBuilder.h  |  5 +++--
+ utils/pdffonts.cc	       |  4 ++--
+ utils/pdfimages.cc	       |  4 ++--
+ utils/pdfinfo.cc	       |  4 ++--
+ utils/pdftoabw.cc	       |  4 ++--
+ utils/pdftohtml.cc	       |  4 ++--
+ utils/pdftoppm.cc	       |  2 +-
+ utils/pdftops.cc	       |  4 ++--
+ utils/pdftotext.cc	       |  4 ++--
  23 files changed, 76 insertions(+), 59 deletions(-)
 
 commit a04ee3ea6066c97d41fc40d5d97c600a1870855a
@@ -19309,7 +22490,7 @@ Date:	Mon Apr 5 16:50:58 2010 +0100
 
     forgot my (C)
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ed723c8ac4a21a50d7d236cdcf7a635defd8dffb
@@ -19318,7 +22499,7 @@ Date:	Mon Apr 5 16:50:15 2010 +0100
 
     The copy constructor of GooString never worked, so do not use it
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a28be8e4009b86fdfd92da928def194225a736c6
@@ -19327,8 +22508,8 @@ Date:	Mon Apr 5 16:49:06 2010 +0100
 
     Add some const correctnes to GooString
 
- goo/GooString.cc |   12 ++++++------
- goo/GooString.h  |   21 ++++++++++++---------
+ goo/GooString.cc | 12 ++++++------
+ goo/GooString.h  | 21 ++++++++++++---------
  2 files changed, 18 insertions(+), 15 deletions(-)
 
 commit 46aee9e4d225b88a3dfd4afbe57259f337bb15d3
@@ -19337,14 +22518,14 @@ Date:	Mon Apr 5 14:36:09 2010 +0200
 
     Use PDFDocFactory in utils
 
- utils/pdffonts.cc  |	16 ++++++++--------
- utils/pdfimages.cc |	11 ++++++++++-
- utils/pdfinfo.cc   |	31 +++++++------------------------
- utils/pdftoabw.cc  |	10 +++++++++-
- utils/pdftohtml.cc |	10 +++++++++-
- utils/pdftoppm.cc  |	17 +++++++++++------
- utils/pdftops.cc   |	 9 ++++++++-
- utils/pdftotext.cc |	14 +++++++-------
+ utils/pdffonts.cc  | 16 ++++++++--------
+ utils/pdfimages.cc | 11 ++++++++++-
+ utils/pdfinfo.cc   | 31 +++++++------------------------
+ utils/pdftoabw.cc  | 10 +++++++++-
+ utils/pdftohtml.cc | 10 +++++++++-
+ utils/pdftoppm.cc  | 17 +++++++++++------
+ utils/pdftops.cc   |  9 ++++++++-
+ utils/pdftotext.cc | 14 +++++++-------
  8 files changed, 69 insertions(+), 49 deletions(-)
 
 commit d487a90688c4431075c9e4db040b3b02625e208f
@@ -19353,11 +22534,11 @@ Date:	Mon Apr 5 14:35:52 2010 +0200
 
     Add PDFDocFactory
 
- CMakeLists.txt		  |    2 ++
- poppler/Makefile.am	  |    2 ++
- poppler/PDFDocFactory.cc |   71
- ++++++++++++++++++++++++++++++++++++++++++++++
- poppler/PDFDocFactory.h  |   42 +++++++++++++++++++++++++++
+ CMakeLists.txt		  |  2 ++
+ poppler/Makefile.am	  |  2 ++
+ poppler/PDFDocFactory.cc | 71
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PDFDocFactory.h  | 42 ++++++++++++++++++++++++++++
  4 files changed, 117 insertions(+)
 
 commit 869135920831fb0d15db734f3dcd7a67146cc241
@@ -19366,11 +22547,11 @@ Date:	Wed Feb 24 15:24:26 2010 +0100
 
     Add CurlPDFDocBuilder
 
- CMakeLists.txt		      |    2 ++
- poppler/CurlPDFDocBuilder.cc |   46
- ++++++++++++++++++++++++++++++++++++++++++
- poppler/CurlPDFDocBuilder.h  |   30 +++++++++++++++++++++++++++
- poppler/Makefile.am	      |    6 ++++--
+ CMakeLists.txt		      |  2 ++
+ poppler/CurlPDFDocBuilder.cc | 46
+ ++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CurlPDFDocBuilder.h  | 30 +++++++++++++++++++++++++++++
+ poppler/Makefile.am	      |  6 ++++--
  4 files changed, 82 insertions(+), 2 deletions(-)
 
 commit ec5c6117a64f9cb03560091c4d7948d4287b6975
@@ -19379,14 +22560,14 @@ Date:	Thu Feb 25 11:23:28 2010 +0100
 
     Add LocalPDFDocBuilder and StdinPDFDocBuilder
 
- CMakeLists.txt		       |    4 ++++
- poppler/LocalPDFDocBuilder.cc |   45
- +++++++++++++++++++++++++++++++++++++++++
- poppler/LocalPDFDocBuilder.h  |   30 +++++++++++++++++++++++++++
- poppler/Makefile.am	       |    4 ++++
- poppler/StdinPDFDocBuilder.cc |   42
- ++++++++++++++++++++++++++++++++++++++
- poppler/StdinPDFDocBuilder.h  |   30 +++++++++++++++++++++++++++
+ CMakeLists.txt		       |  4 ++++
+ poppler/LocalPDFDocBuilder.cc | 45
+ +++++++++++++++++++++++++++++++++++++++++++
+ poppler/LocalPDFDocBuilder.h  | 30 +++++++++++++++++++++++++++++
+ poppler/Makefile.am	       |  4 ++++
+ poppler/StdinPDFDocBuilder.cc | 42
+ ++++++++++++++++++++++++++++++++++++++++
+ poppler/StdinPDFDocBuilder.h  | 30 +++++++++++++++++++++++++++++
  6 files changed, 155 insertions(+)
 
 commit 919b735d1c0b99bf72280aff8db87ba503954498
@@ -19395,9 +22576,9 @@ Date:	Sun Apr 4 11:05:35 2010 +0200
 
     Add PDFDocBuilder
 
- CMakeLists.txt		 |    1 +
- poppler/Makefile.am	 |    1 +
- poppler/PDFDocBuilder.h |   32 ++++++++++++++++++++++++++++++++
+ CMakeLists.txt		 |  1 +
+ poppler/Makefile.am	 |  1 +
+ poppler/PDFDocBuilder.h | 32 ++++++++++++++++++++++++++++++++
  3 files changed, 34 insertions(+)
 
 commit 1ab07faf05661d6d92186974c4b1c279b6178747
@@ -19406,8 +22587,8 @@ Date:	Sun Apr 4 11:29:53 2010 +0200
 
     Add PDFDoc::ErrorPDFDoc
 
- poppler/PDFDoc.cc |   14 ++++++++++++++
- poppler/PDFDoc.h  |	3 +++
+ poppler/PDFDoc.cc | 14 ++++++++++++++
+ poppler/PDFDoc.h  |  3 +++
  2 files changed, 17 insertions(+)
 
 commit efc7e5efeddd8f70b7c74573d3194aba0a7d4631
@@ -19416,8 +22597,8 @@ Date:	Sun Apr 4 11:17:37 2010 +0200
 
     Cleanup PDFDoc
 
- poppler/PDFDoc.cc |   40 +++++++++++++++-------------------------
- poppler/PDFDoc.h  |	3 ++-
+ poppler/PDFDoc.cc | 40 +++++++++++++++-------------------------
+ poppler/PDFDoc.h  |  3 ++-
  2 files changed, 17 insertions(+), 26 deletions(-)
 
 commit 08a3435e67ebf21beac2fefcbd21ad65f9293fd1
@@ -19428,16 +22609,16 @@ Date:	Tue Feb 23 02:29:26 2010 +0100
 
     With libcurl, poppler can handle documents over http.
 
- CMakeLists.txt			|   18 ++++++++
- config.h.cmake			|    6 +++
- configure.ac			|   16 +++++++
- poppler/CurlCachedFile.cc	|   95
- ++++++++++++++++++++++++++++++++++++++++
- poppler/CurlCachedFile.h	|   39 +++++++++++++++++
- poppler/Makefile.am		|   20 +++++++++
- poppler/poppler-config.h.cmake |    5 +++
- poppler/poppler-config.h.in	|    5 +++
- utils/pdfinfo.cc		|   16 ++++++-
+ CMakeLists.txt			| 18 ++++++++
+ config.h.cmake			|  6 +++
+ configure.ac			| 16 +++++++
+ poppler/CurlCachedFile.cc	| 95
+ ++++++++++++++++++++++++++++++++++++++++++
+ poppler/CurlCachedFile.h	| 39 +++++++++++++++++
+ poppler/Makefile.am		| 20 +++++++++
+ poppler/poppler-config.h.cmake |  5 +++
+ poppler/poppler-config.h.in	|  5 +++
+ utils/pdfinfo.cc		| 16 ++++++-
  9 files changed, 219 insertions(+), 1 deletion(-)
 
 commit a87abf6ad9fb66d35a70c9412adc5d8ba2889b96
@@ -19448,7 +22629,7 @@ Date:	Wed Feb 24 14:46:59 2010 +0100
 
     This fixes reading from stdin.
 
- utils/pdfinfo.cc |    6 +++++-
+ utils/pdfinfo.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 958b04b14baf03c07492fa1cbd225d9968b9efc1
@@ -19457,10 +22638,10 @@ Date:	Tue Feb 23 02:02:10 2010 +0100
 
     Add support for reading a cached file from stdin
 
- CMakeLists.txt		    |	 2 ++
- poppler/Makefile.am	    |	 2 ++
- poppler/StdinCachedFile.cc |	37 +++++++++++++++++++++++++++++++++++++
- poppler/StdinCachedFile.h  |	26 ++++++++++++++++++++++++++
+ CMakeLists.txt		    |  2 ++
+ poppler/Makefile.am	    |  2 ++
+ poppler/StdinCachedFile.cc | 37 +++++++++++++++++++++++++++++++++++++
+ poppler/StdinCachedFile.h  | 26 ++++++++++++++++++++++++++
  4 files changed, 67 insertions(+)
 
 commit 9539f75bd06150a3868209c5b04a75f5253722cc
@@ -19469,13 +22650,13 @@ Date:	Sat Apr 3 15:08:20 2010 +0200
 
     Add support for cached files
 
- CMakeLists.txt        |    2 +
- poppler/CachedFile.cc |  246
- +++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/CachedFile.h  |  113 +++++++++++++++++++++++
- poppler/Makefile.am   |    2 +
- poppler/Stream.cc     |  102 ++++++++++++++++++++
- poppler/Stream.h      |   58 ++++++++++++
+ CMakeLists.txt        |   2 +
+ poppler/CachedFile.cc | 246
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CachedFile.h  | 113 +++++++++++++++++++++++
+ poppler/Makefile.am   |   2 +
+ poppler/Stream.cc     | 102 +++++++++++++++++++++
+ poppler/Stream.h      |  58 ++++++++++++
  6 files changed, 523 insertions(+)
 
 commit 8c6aefb8aa8929b9c47791d3062ed3ac8512626f
@@ -19486,7 +22667,7 @@ Date:	Sun Apr 4 16:08:12 2010 +0200
 
     See GNOME Bug: https://bugzilla.gnome.org/show_bug.cgi?id=614549
 
- poppler/Lexer.cc |    5 +++--
+ poppler/Lexer.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit ab5044e451e3714d385295f0b4ce9a15c8f2562c
@@ -19499,8 +22680,8 @@ Date:	Sun Apr 4 12:32:42 2010 +0100
     unapply
     it each time
 
- utils/pdftoppm.1  |	6 ++++++
- utils/pdftoppm.cc |	8 ++++++++
+ utils/pdftoppm.1  | 6 ++++++
+ utils/pdftoppm.cc | 8 ++++++++
  2 files changed, 14 insertions(+)
 
 commit 0e371fb628a7e7d0cc1656e6405af4c97dbebf5d
@@ -19511,7 +22692,7 @@ Date:	Sun Apr 4 12:30:34 2010 +0100
 
     Thanks Carlos for noticing
 
- poppler/Function.cc |	 12 +++++++-----
+ poppler/Function.cc | 12 +++++++-----
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 commit a32f6f9ebaed3e4827b9dc6cb37e307c2798f521
@@ -19524,7 +22705,7 @@ Date:	Sun Mar 28 18:43:14 2010 +0200
     background.
     Fixes bug #27208.
 
- poppler/CairoOutputDev.cc |   13 ++-----------
+ poppler/CairoOutputDev.cc | 13 ++-----------
  1 file changed, 2 insertions(+), 11 deletions(-)
 
 commit efa5d9544d29252e3df36cc4e65c3d880b3c5172
@@ -19533,7 +22714,7 @@ Date:	Sat Mar 27 22:11:49 2010 +0000
 
     remove empty section
 
- NEWS |    2 --
+ NEWS | 2 --
  1 file changed, 2 deletions(-)
 
 commit 5722df7a5387e43ec73f659ca58d2d07b9c4be3b
@@ -19542,11 +22723,11 @@ Date:	Sat Mar 27 22:04:43 2010 +0000
 
     poppler 0.13.2
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   39 +++++++++++++++++++++++++++++++++++++++
- configure.ac	  |    2 +-
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 39 +++++++++++++++++++++++++++++++++++++++
+ configure.ac	  |  2 +-
+ cpp/Doxyfile	  |  2 +-
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 43 insertions(+), 4 deletions(-)
 
 commit b82fd707747b9d87ebf3c8f7ce5ab70ccdf82809
@@ -19555,11 +22736,11 @@ Date:	Sat Mar 27 22:00:58 2010 +0000
 
     gtk-doc changes
 
- glib/reference/tmpl/poppler-action.sgml  |    7 +++----
- glib/reference/tmpl/poppler-annot.sgml   |    9 ---------
- glib/reference/tmpl/poppler-private.sgml |   10 ++++++++++
- glib/reference/tmpl/poppler-unused.sgml  |    8 ++++++++
- glib/reference/tmpl/poppler.sgml	  |   10 ++++++++++
+ glib/reference/tmpl/poppler-action.sgml  |  7 +++----
+ glib/reference/tmpl/poppler-annot.sgml   |  9 ---------
+ glib/reference/tmpl/poppler-private.sgml | 10 ++++++++++
+ glib/reference/tmpl/poppler-unused.sgml  |  8 ++++++++
+ glib/reference/tmpl/poppler.sgml	  | 10 ++++++++++
  5 files changed, 31 insertions(+), 13 deletions(-)
 
 commit ed0354be4eac615b80e7a868984cc527853788b4
@@ -19568,10 +22749,10 @@ Date:	Sat Mar 27 21:44:59 2010 +0000
 
     some forgotten copyrights
 
- qt/poppler-page.cc	     |	  2 +-
- qt4/src/poppler-document.cc |	  2 +-
- qt4/src/poppler-movie.cc    |	  3 ++-
- qt4/src/poppler-page.cc     |	  2 +-
+ qt/poppler-page.cc	     | 2 +-
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-movie.cc    | 3 ++-
+ qt4/src/poppler-page.cc     | 2 +-
  4 files changed, 5 insertions(+), 4 deletions(-)
 
 commit 2aedeedf9ef2e2d3eb17bc36d728e68c2f7af762
@@ -19580,7 +22761,7 @@ Date:	Sat Mar 27 14:38:27 2010 +0000
 
     Correctly initialize actualText
 
- poppler/TextOutputDev.cc |    3 ++-
+ poppler/TextOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit b53f9b203598555d6d706c3804aba013b8566921
@@ -19589,9 +22770,9 @@ Date:	Sat Mar 27 13:23:42 2010 +0000
 
     make qt3 detection use pkgconfig
 
- m4/qt.m4	|  101
- +++++---------------------------------------------------
- qt/Makefile.am |    4 +--
+ m4/qt.m4	| 101
+ +++++----------------------------------------------------
+ qt/Makefile.am |   4 +--
  2 files changed, 10 insertions(+), 95 deletions(-)
 
 commit 320d4cee46e108498440179d8f9eab22cd5383d9
@@ -19603,7 +22784,7 @@ Date:	Wed Mar 24 21:51:58 2010 +0100
     This reverts commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52.
     It is actually needed.
 
- cpp/tests/CMakeLists.txt |    1 +
+ cpp/tests/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit af21b5ab366bfdda203c26a77f4ae6ed0e70f64e
@@ -19616,10 +22797,10 @@ Date:	Tue Mar 23 00:13:21 2010 +0100
     this way each bit (GLIB, GDK, and GTK) can be enabled/disabled
     independently from the others
 
- CMakeLists.txt		      |    4 +++-
- cmake/modules/FindGDK.cmake  |   14 +-------------
- cmake/modules/FindGLIB.cmake |   14 +-------------
- cmake/modules/FindGTK.cmake  |   14 +-------------
+ CMakeLists.txt		      |  4 +++-
+ cmake/modules/FindGDK.cmake  | 14 +-------------
+ cmake/modules/FindGLIB.cmake | 14 +-------------
+ cmake/modules/FindGTK.cmake  | 14 +-------------
  4 files changed, 6 insertions(+), 40 deletions(-)
 
 commit 9b93ed5ce6712ec4cdf58148628e95685c289ef5
@@ -19630,8 +22811,8 @@ Date:	Tue Mar 23 00:02:27 2010 +0100
 
     this way FindGTK.cmake can be split in the various parts
 
- cmake/modules/FindGDK.cmake  |   34 ++++++++++++++++++++++++++++++++++
- cmake/modules/FindGLIB.cmake |   34 ++++++++++++++++++++++++++++++++++
+ cmake/modules/FindGDK.cmake  | 34 ++++++++++++++++++++++++++++++++++
+ cmake/modules/FindGLIB.cmake | 34 ++++++++++++++++++++++++++++++++++
  2 files changed, 68 insertions(+)
 
 commit 0ec21cae0b4623644c3efca1d2836a9f38f25737
@@ -19640,7 +22821,7 @@ Date:	Mon Mar 22 22:11:04 2010 +0100
 
     [Qt] add the unhandled cases for 'actionOCGState'
 
- qt/poppler-page.cc |	 1 +
+ qt/poppler-page.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 5211e09595135b8e6c68efd1b8b689b518092b84
@@ -19649,8 +22830,8 @@ Date:	Mon Mar 22 22:07:44 2010 +0100
 
     [CMake/cpp] move the BUILD_CPP_TESTS option to the main CMakeLists.txt
 
- CMakeLists.txt		  |    1 +
- cpp/tests/CMakeLists.txt |    3 ---
+ CMakeLists.txt		  | 1 +
+ cpp/tests/CMakeLists.txt | 3 ---
  2 files changed, 1 insertion(+), 3 deletions(-)
 
 commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52
@@ -19659,7 +22840,7 @@ Date:	Mon Mar 22 22:00:55 2010 +0100
 
     no more needed
 
- cpp/tests/CMakeLists.txt |    1 -
+ cpp/tests/CMakeLists.txt | 1 -
  1 file changed, 1 deletion(-)
 
 commit a07ef8f703ab896f89ed211a5780e4a669b04fc7
@@ -19671,7 +22852,7 @@ Date:	Mon Mar 22 22:00:15 2010 +0100
 
     for now it is safer without it
 
- cmake/modules/PopplerMacros.cmake |	6 ------
+ cmake/modules/PopplerMacros.cmake | 6 ------
  1 file changed, 6 deletions(-)
 
 commit 86debcc9bba28a7c86f01ca9e63bde5fcd541846
@@ -19680,7 +22861,7 @@ Date:	Mon Mar 22 21:49:22 2010 +0100
 
     [CMake] add "-ansi" to the CXXFLAGS only on Linux
 
- cmake/modules/PopplerMacros.cmake |	9 +++++++--
+ cmake/modules/PopplerMacros.cmake | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 0819acd52a2ce74f0e176626d7b2233e10232d53
@@ -19699,8 +22880,8 @@ Date:	Mon Mar 22 20:28:15 2010 +0000
     QRectF is evil and is float in some arch and causes search to loop
     infinitely because of double->float conversion
 
- qt4/src/poppler-page.cc |   22 +++++++++++++++-------
- qt4/src/poppler-qt4.h	 |   16 ++++++++++++++--
+ qt4/src/poppler-page.cc | 22 +++++++++++++++-------
+ qt4/src/poppler-qt4.h	 | 16 ++++++++++++++--
  2 files changed, 29 insertions(+), 9 deletions(-)
 
 commit 0a895f14c8125c5de7b97e8e799459c431eb51cb
@@ -19711,7 +22892,7 @@ Date:	Mon Mar 22 19:03:54 2010 +0000
 
     Fixes file with sha1sum e6e1576803a1bd74ad822eebbd750ee7b8357d25
 
- poppler/SplashOutputDev.cc |	 9 +++++++--
+ poppler/SplashOutputDev.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit c4ddbe89df9e48343a9606728b7c182080d87ece
@@ -19723,7 +22904,7 @@ Date:	Sat Mar 20 21:55:17 2010 +0100
 
     ... as done with autotools as well
 
- CMakeLists.txt |    6 ++++++
+ CMakeLists.txt | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 97da1f9d060493d9fb54a20e980c3f6e2b82c97e
@@ -19736,7 +22917,7 @@ Date:	Sat Mar 20 17:51:07 2010 +0100
     this way we can add -Wl,--as-needed and -Wl,--no-add-needed only if
     the current GCC/LD supports them
 
- cmake/modules/PopplerMacros.cmake |   23 ++++++++++++++++++++---
+ cmake/modules/PopplerMacros.cmake | 23 ++++++++++++++++++++---
  1 file changed, 20 insertions(+), 3 deletions(-)
 
 commit 223bce6d14e632f457a81b2ec091fe16369d2eb6
@@ -19751,7 +22932,7 @@ Date:	Sat Mar 20 14:08:58 2010 +0100
     automatically, so we have to always make sure we specify all the
     libraries actually used in a exe/lib
 
- cmake/modules/PopplerMacros.cmake |	4 ++++
+ cmake/modules/PopplerMacros.cmake | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit fc761f0d385708daaef1b95968532795b04f11b0
@@ -19761,7 +22942,7 @@ Date:	Sat Mar 20 14:05:59 2010 +0100
     [CMake] poppler-dump uses parseargs.c which uses the poppler core API,
     so it must link to it
 
- cpp/tests/CMakeLists.txt |    1 +
+ cpp/tests/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit a210440b05d14efc53224a10e8b3ac7d508043b5
@@ -19771,7 +22952,7 @@ Date:	Sat Mar 20 14:04:02 2010 +0100
     [CMake] poppler-glib uses the freetype API, so it must explicitly
     link to it
 
- glib/CMakeLists.txt |	  2 +-
+ glib/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f5d352666b92cee0390470d7b892ec8dcbf046a5
@@ -19781,7 +22962,7 @@ Date:	Sat Mar 20 14:03:19 2010 +0100
     [CMake] pdftoabw uses the libxml2 API, so it must explicitly link
     to it
 
- utils/CMakeLists.txt |    2 +-
+ utils/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3fc2c4affe825f4aabcee161ec794338bd359403
@@ -19791,7 +22972,7 @@ Date:	Thu Mar 18 13:52:52 2010 +0100
     [glib] Use g_slice_new/free instead of g_new/free to alloc/free
     iterators
 
- glib/poppler-document.cc |   27 +++++++++++++--------------
+ glib/poppler-document.cc | 27 +++++++++++++--------------
  1 file changed, 13 insertions(+), 14 deletions(-)
 
 commit 7bd6a8558646983669ce699f83d5ed42d7fce476
@@ -19802,10 +22983,10 @@ Date:	Thu Mar 18 13:34:03 2010 +0100
 
     And remove _poppler_action_movie_set_movie().
 
- glib/poppler-action.cc |   93
- ++++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.cc	|   79 ----------------------------------------
- glib/poppler-private.h |    2 --
+ glib/poppler-action.cc | 93
+ ++++++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.cc	| 79 ------------------------------------------
+ glib/poppler-private.h |  2 --
  3 files changed, 82 insertions(+), 92 deletions(-)
 
 commit e5e3d310aa488638431dd85ac3383a12056674bf
@@ -19814,8 +22995,8 @@ Date:	Thu Mar 18 12:20:26 2010 +0100
 
     Update copyright header
 
- poppler/Link.cc |    2 +-
- poppler/Link.h  |    1 +
+ poppler/Link.cc | 2 +-
+ poppler/Link.h  | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit c76870178a031e437de3f9ed7baa64efb96955d6
@@ -19824,8 +23005,8 @@ Date:	Thu Mar 18 12:13:36 2010 +0100
 
     [glib-demo] OCG State Actions demo
 
- glib/demo/utils.c |   64
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/utils.c | 64
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 64 insertions(+)
 
 commit 456e42f91dfbf73b71a5dbdde13d7ccdb5637d79
@@ -19834,10 +23015,10 @@ Date:	Thu Mar 18 12:12:51 2010 +0100
 
     [glib] Add support for OCG State actions
 
- glib/poppler-action.cc |  125
- ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-action.h	|   25 +++++++++-
- glib/poppler.h		|    1 +
+ glib/poppler-action.cc | 125
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-action.h	|  25 +++++++++-
+ glib/poppler.h		|   1 +
  3 files changed, 150 insertions(+), 1 deletion(-)
 
 commit 4b109899e0732bbf65cacd875829e869e61eda48
@@ -19847,8 +23028,8 @@ Date:	Thu Mar 18 12:10:19 2010 +0100
     [glib] Make get_layer_rbgroup() and get_layers() doc funcs public
     for internal use
 
- glib/poppler-document.cc |   12 ++++++------
- glib/poppler-private.h   |    3 +++
+ glib/poppler-document.cc | 12 ++++++------
+ glib/poppler-private.h   |  3 +++
  2 files changed, 9 insertions(+), 6 deletions(-)
 
 commit 38a55f6118debf994ce1fc41e987b0e3766047ba
@@ -19859,9 +23040,9 @@ Date:	Thu Mar 18 12:08:30 2010 +0100
 
     Fixes bug #23522.
 
- poppler/Link.cc |   80
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Link.h  |   31 +++++++++++++++++++++
+ poppler/Link.cc | 80
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Link.h  | 31 ++++++++++++++++++++++
  2 files changed, 111 insertions(+)
 
 commit bf398e53b0823d0a6272679858b67c5ffd704425
@@ -19870,7 +23051,7 @@ Date:	Wed Mar 17 23:06:44 2010 +0100
 
     [CMake] fix pkg-config executable variable name
 
- CMakeLists.txt |    6 +++---
+ CMakeLists.txt | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit ab1a37666704d6b15c19b694ee191327847c23da
@@ -19879,7 +23060,7 @@ Date:	Wed Mar 17 23:04:01 2010 +0100
 
     [CMake] proper way of looking for pkg-config
 
- cmake/modules/FindGTK.cmake |	  2 +-
+ cmake/modules/FindGTK.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7f07a7dcea031f99a9a6d7c424184a2e69ee0062
@@ -19890,7 +23071,7 @@ Date:	Wed Mar 17 22:58:08 2010 +0100
 
     ... present in KDE (as before)
 
- cmake/modules/FindFontconfig.cmake |	15 +++++++++------
+ cmake/modules/FindFontconfig.cmake | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 commit beee143ffbdc699ab19f10a01e5747200ea1927a
@@ -19903,8 +23084,8 @@ Date:	Wed Mar 17 18:36:32 2010 +0100
     this should reduce the libraries linked by frontends and utility
     applications
 
- CMakeLists.txt     |	 1 +
- cpp/CMakeLists.txt |	 1 +
+ CMakeLists.txt     | 1 +
+ cpp/CMakeLists.txt | 1 +
  2 files changed, 2 insertions(+)
 
 commit 5ab791cb2a029edcde84b00a47165adfe4d98a98
@@ -19917,7 +23098,7 @@ Date:	Wed Mar 17 16:39:38 2010 +0100
     - add my copyright for this year
     - remove no more useful UsePkgConfig inclusion
 
- cmake/modules/FindGTK.cmake |	 17 ++++++++++++-----
+ cmake/modules/FindGTK.cmake | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)
 
 commit fcbc76d82e3059c8288fbdc8da117ac9b38a70f2
@@ -19927,7 +23108,7 @@ Date:	Wed Mar 17 16:36:41 2010 +0100
     [CMake] switch gtk2 (gtk+, gdk-pixbuf, gthread, gio) search to use
     the new pkg_check_modules() way
 
- cmake/modules/FindGTK.cmake |	 27 ++-------------------------
+ cmake/modules/FindGTK.cmake | 27 ++-------------------------
  1 file changed, 2 insertions(+), 25 deletions(-)
 
 commit 5b8135e0899aa3578045eca40940a3495c48d895
@@ -19936,7 +23117,7 @@ Date:	Wed Mar 17 16:27:40 2010 +0100
 
     [CMake] link poppler-glib to the gdk2 libraries, if gdk2 was found
 
- glib/CMakeLists.txt |	  3 +++
+ glib/CMakeLists.txt | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 3dc4979d72048e81ae3b2d60dab11e791ac95696
@@ -19945,7 +23126,7 @@ Date:	Wed Mar 17 16:26:04 2010 +0100
 
     [CMake] switch gdk2 search to use the new pkg_check_modules() way
 
- cmake/modules/FindGTK.cmake |	 13 +------------
+ cmake/modules/FindGTK.cmake | 13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
 
 commit 0ef3d899cb8dea75c97ae1038cac5006f97bc0d2
@@ -19954,7 +23135,7 @@ Date:	Wed Mar 17 16:05:07 2010 +0100
 
     [CMake] switch glib2 search to use the new pkg_check_modules() way
 
- cmake/modules/FindGTK.cmake |	 18 ++----------------
+ cmake/modules/FindGTK.cmake | 18 ++----------------
  1 file changed, 2 insertions(+), 16 deletions(-)
 
 commit d2dc83cb8de481e44ea584eee77881978af920fa
@@ -19966,8 +23147,8 @@ Date:	Wed Mar 17 15:56:16 2010 +0100
     this way it matches autotools, and it is going to not conflict with
     my next changes
 
- CMakeLists.txt		     |	  4 ++--
- cmake/modules/FindGTK.cmake |	  2 +-
+ CMakeLists.txt		     | 4 ++--
+ cmake/modules/FindGTK.cmake | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 34accfe27305cae18e09243ab2a607287b86fa47
@@ -19976,7 +23157,7 @@ Date:	Wed Mar 17 13:55:09 2010 +0100
 
     [CMake] set all the definitions for poppler-glib in a single place
 
- glib/CMakeLists.txt |	  4 ++--
+ glib/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3d93daf50c61019ca70f42e7ccf33897800b262a
@@ -19987,8 +23168,8 @@ Date:	Wed Mar 17 13:49:22 2010 +0100
 
     poppler_add_test(... BUILD_GTK_TESTS ...) takes care of that already
 
- glib/CMakeLists.txt |	  4 ++--
- test/CMakeLists.txt |	  4 ++--
+ glib/CMakeLists.txt | 4 ++--
+ test/CMakeLists.txt | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 946a11345d01d39538d22114e50aa3e179059883
@@ -19997,8 +23178,8 @@ Date:	Mon Mar 15 20:24:25 2010 +0100
 
     [build] Update cmake files
 
- CMakeLists.txt      |	  2 ++
- glib/CMakeLists.txt |	  4 ++++
+ CMakeLists.txt      | 2 ++
+ glib/CMakeLists.txt | 4 ++++
  2 files changed, 6 insertions(+)
 
 commit 922c0fe392ba439453edb5b2e88b74f0caa586b3
@@ -20007,8 +23188,8 @@ Date:	Mon Mar 15 20:08:23 2010 +0100
 
     [glib-demo] Rendition actions demo
 
- glib/demo/utils.c |  112
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/utils.c | 112
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 112 insertions(+)
 
 commit 163b3f79d67543bc37b64875e30dcc9b7053e1d5
@@ -20017,8 +23198,8 @@ Date:	Mon Mar 15 20:08:00 2010 +0100
 
     [glib] Add support for rendition actions
 
- glib/poppler-action.cc |   22 ++++++++++++++++++++++
- glib/poppler-action.h	|   14 +++++++++++++-
+ glib/poppler-action.cc | 22 ++++++++++++++++++++++
+ glib/poppler-action.h	| 14 +++++++++++++-
  2 files changed, 35 insertions(+), 1 deletion(-)
 
 commit d9b1e40751beddf48a8694b20bfcc4b4cb41060a
@@ -20027,12 +23208,12 @@ Date:	Mon Mar 15 20:06:45 2010 +0100
 
     [glib] Add PopplerMedia representing a Rendition Media Clip
 
- glib/Makefile.am	|    2 +
- glib/poppler-media.cc	|  302
- ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-media.h	|   53 +++++++++
- glib/poppler-private.h |    2 +
- glib/poppler.h		|    2 +
+ glib/Makefile.am	|   2 +
+ glib/poppler-media.cc	| 302
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-media.h	|  53 +++++++++
+ glib/poppler-private.h |   2 +
+ glib/poppler.h		|   2 +
  5 files changed, 361 insertions(+)
 
 commit 0224b81c4729a98a56b7a68054422ea655018d6a
@@ -20041,7 +23222,7 @@ Date:	Mon Mar 15 17:54:03 2010 +0100
 
     [glib-demo] Add page number to annots demo
 
- glib/demo/annots.c |	 4 ++++
+ glib/demo/annots.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 0153b892c63e4fccd0819150cf7b4213857a11c5
@@ -20051,8 +23232,8 @@ Date:	Mon Mar 15 17:49:51 2010 +0100
     [glib] Add poppler_annot_get_page_index() to get the page associated
     to annot
 
- glib/poppler-annot.cc |   19 +++++++++++++++++++
- glib/poppler-annot.h  |    1 +
+ glib/poppler-annot.cc | 19 +++++++++++++++++++
+ glib/poppler-annot.h  |  1 +
  2 files changed, 20 insertions(+)
 
 commit b47337ea91696fea8f42a68a6fa160681ab284b2
@@ -20062,7 +23243,7 @@ Date:	Mon Mar 15 17:49:17 2010 +0100
     [annots] Checks screen annots associated with a rendition action
     have a valid page ref
 
- poppler/Annot.cc |    6 ++++++
+ poppler/Annot.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 9417fd793ec8d806822669aa614193073e7dfe50
@@ -20071,8 +23252,8 @@ Date:	Mon Mar 15 16:52:30 2010 +0100
 
     [annots] Save page index of the page associated with the annot
 
- poppler/Annot.cc |   14 +++++---------
- poppler/Annot.h  |    4 ++--
+ poppler/Annot.cc | 14 +++++---------
+ poppler/Annot.h  |  4 ++--
  2 files changed, 7 insertions(+), 11 deletions(-)
 
 commit 36b76a5d01b74c6381433b6f6f7ffb9f02696a60
@@ -20081,9 +23262,9 @@ Date:	Mon Mar 15 14:12:11 2010 +0100
 
     Rework LinkRendition to follow the spec
 
- poppler/Link.cc |   68
- ++++++++++++++++++++++++++++++++++---------------------
- poppler/Link.h  |   12 ++++++----
+ poppler/Link.cc | 68
+ +++++++++++++++++++++++++++++++++++----------------------
+ poppler/Link.h  | 12 ++++++----
  2 files changed, 50 insertions(+), 30 deletions(-)
 
 commit 7b5885ee7d2026df9a6e87327b6d02f37d79b8b2
@@ -20092,7 +23273,7 @@ Date:	Mon Mar 15 12:25:12 2010 +0100
 
     [glib-demo] Annot screen demo
 
- glib/demo/annots.c |	17 +++++++++++++++++
+ glib/demo/annots.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit bdb76c7cb89bcb6fb139b0ef348d96b7780d57ed
@@ -20103,12 +23284,12 @@ Date:	Mon Mar 15 12:24:19 2010 +0100
 
     Based on patch by Sam Kaplan.
 
- glib/poppler-annot.cc	|   75
- ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h	|    8 ++++++
- glib/poppler-page.cc	|    3 ++
- glib/poppler-private.h |    1 +
- glib/poppler.h		|    1 +
+ glib/poppler-annot.cc	| 75
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h	|  8 ++++++
+ glib/poppler-page.cc	|  3 ++
+ glib/poppler-private.h |  1 +
+ glib/poppler.h		|  1 +
  5 files changed, 88 insertions(+)
 
 commit 54892b1375e360113432b07c6ba058f861d21fe8
@@ -20117,8 +23298,8 @@ Date:	Mon Mar 15 12:21:30 2010 +0100
 
     [annots] Save the action already parsed in AnnotScreen
 
- poppler/Annot.cc |    9 +++++++--
- poppler/Annot.h  |    5 +++--
+ poppler/Annot.cc | 9 +++++++--
+ poppler/Annot.h  | 5 +++--
  2 files changed, 10 insertions(+), 4 deletions(-)
 
 commit 5a84a2d749478f19631dbfad2be06ec4ea85038c
@@ -20127,10 +23308,10 @@ Date:	Mon Mar 15 11:16:17 2010 +0100
 
     [glib-demo] Annot and links movie demo
 
- glib/demo/annots.c |	20 +++++++++
- glib/demo/utils.c  |  115
- +++++++++++++++++++++++++++++++++++++++++++++++++++-
- glib/demo/utils.h  |	 3 ++
+ glib/demo/annots.c |  20 ++++++++++
+ glib/demo/utils.c  | 115
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/demo/utils.h  |	3 ++
  3 files changed, 137 insertions(+), 1 deletion(-)
 
 commit 2cf5ee4f62089df099f78cd4d39a4eb7589d1b47
@@ -20141,11 +23322,11 @@ Date:	Mon Mar 15 11:04:17 2010 +0100
 
     Based on patch by Hugo Mercier.
 
- glib/poppler-action.cc |   35 ++++++++++++++++++---
- glib/poppler-action.h	|   15 +++++++--
- glib/poppler-page.cc	|   81
- +++++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-private.h |    2 ++
+ glib/poppler-action.cc | 35 ++++++++++++++++++----
+ glib/poppler-action.h	| 15 ++++++++--
+ glib/poppler-page.cc	| 81
+ +++++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-private.h |  2 ++
  4 files changed, 125 insertions(+), 8 deletions(-)
 
 commit 132b6f072fefd231d42f31626f1b5009c4e8319e
@@ -20156,12 +23337,12 @@ Date:	Mon Mar 15 10:56:23 2010 +0100
 
     Based on patch by Hugo Mercier.
 
- glib/poppler-annot.cc	|   97
- ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h	|   10 +++++
- glib/poppler-page.cc	|    3 ++
- glib/poppler-private.h |    1 +
- glib/poppler.h		|    1 +
+ glib/poppler-annot.cc	| 97
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h	| 10 ++++++
+ glib/poppler-page.cc	|  3 ++
+ glib/poppler-private.h |  1 +
+ glib/poppler.h		|  1 +
  5 files changed, 112 insertions(+)
 
 commit aecad2bb12be44825d273e364ec6a0444dac5605
@@ -20170,12 +23351,12 @@ Date:	Mon Mar 15 10:48:03 2010 +0100
 
     [glib] Add PopplerMovie class
 
- glib/Makefile.am	|    2 +
- glib/poppler-movie.cc	|  140
- ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-movie.h	|   42 +++++++++++++++
- glib/poppler-private.h |    2 +
- glib/poppler.h		|    2 +
+ glib/Makefile.am	|   2 +
+ glib/poppler-movie.cc	| 140
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-movie.h	|  42 +++++++++++++++
+ glib/poppler-private.h |   2 +
+ glib/poppler.h		|   2 +
  5 files changed, 188 insertions(+)
 
 commit 5b3234a16e0d465bff2b5e277cb64b4f4b0a8dbd
@@ -20184,17 +23365,17 @@ Date:	Sun Mar 14 16:10:26 2010 +0100
 
     Split Movie class into Rendition and Movie classes to follow the spec
 
- poppler/Annot.cc	  |   16 +-
- poppler/Link.cc	  |   10 +-
- poppler/Link.h		  |    6 +-
- poppler/Makefile.am	  |    2 +
- poppler/Movie.cc	  |  438
- +++++-----------------------------------------
- poppler/Movie.h	  |  138 +++------------
- poppler/Rendition.cc	  |  400
- ++++++++++++++++++++++++++++++++++++++++++
- poppler/Rendition.h	  |  157 +++++++++++++++++
- qt4/src/poppler-movie.cc |    9 +-
+ poppler/Annot.cc	  |  16 +-
+ poppler/Link.cc	  |  10 +-
+ poppler/Link.h		  |   6 +-
+ poppler/Makefile.am	  |   2 +
+ poppler/Movie.cc	  | 438
+ +++++------------------------------------------
+ poppler/Movie.h	  | 138 +++------------
+ poppler/Rendition.cc	  | 400
+ +++++++++++++++++++++++++++++++++++++++++++
+ poppler/Rendition.h	  | 157 +++++++++++++++++
+ qt4/src/poppler-movie.cc |   9 +-
  9 files changed, 657 insertions(+), 519 deletions(-)
 
 commit f9c163730478e3b6d8a1e73dbae6c52c28ae1e84
@@ -20203,7 +23384,7 @@ Date:	Mon Mar 8 14:49:12 2010 +0100
 
     [Qt4] include Object.h and Annot.h, now needed
 
- qt4/src/poppler-movie.cc |    2 ++
+ qt4/src/poppler-movie.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit a00532f509c19c5455e0db5068db95dd4583e8dd
@@ -20214,7 +23395,7 @@ Date:	Mon Mar 8 14:22:53 2010 +0100
 
     Dict::lookup returns obj->initNull() when the key is not found.
 
- poppler/Movie.cc |    6 +++---
+ poppler/Movie.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit b51e66c9a7e2f7f39ae1edf8bda02a7bc1ad4ebd
@@ -20226,9 +23407,9 @@ Date:	Mon Mar 8 14:15:22 2010 +0100
 
     See bug #23108
 
- poppler/Annot.cc |  103
- +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h  |    4 ++-
+ poppler/Annot.cc | 103
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h  |   4 ++-
  2 files changed, 105 insertions(+), 2 deletions(-)
 
 commit fae59411852e5c2c45825c5ea963318f1ed5dc6a
@@ -20240,8 +23421,8 @@ Date:	Mon Mar 8 14:07:09 2010 +0100
     Poster is not always a stream, it can be a boolean too. Also, get the
     reference when available instead of fetching the stream.
 
- poppler/Movie.cc |   25 ++++++++++++-------------
- poppler/Movie.h  |    6 ++++--
+ poppler/Movie.cc | 25 ++++++++++++-------------
+ poppler/Movie.h  |  6 ++++--
  2 files changed, 16 insertions(+), 15 deletions(-)
 
 commit a451f83d101bf265a1e7e2a17c0b320895e70f4e
@@ -20251,8 +23432,8 @@ Date:	Sun Mar 7 12:22:57 2010 +0100
     Save width, height (aspect) in Movie object and provide getAspect()
     method
 
- poppler/Movie.cc |    3 ++-
- poppler/Movie.h  |    4 ++++
+ poppler/Movie.cc | 3 ++-
+ poppler/Movie.h  | 4 ++++
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit f88d469f860da17055fc4b98b64aef241fcf0185
@@ -20261,14 +23442,14 @@ Date:	Sat Mar 6 12:33:40 2010 +0100
 
     Move Movie objects parsing code from Annot to Movie
 
- poppler/Annot.cc	  |  244
- ++------------------------------------------
- poppler/Annot.h	  |   73 +------------
- poppler/Link.cc	  |    4 +-
- poppler/Movie.cc	  |  255
- ++++++++++++++++++++++++++++++++++++++--------
- poppler/Movie.h	  |   25 +++--
- qt4/src/poppler-movie.cc |   11 +-
+ poppler/Annot.cc	  | 244
+ ++-------------------------------------------
+ poppler/Annot.h	  |  73 +-------------
+ poppler/Link.cc	  |   4 +-
+ poppler/Movie.cc	  | 255
+ +++++++++++++++++++++++++++++++++++++++--------
+ poppler/Movie.h	  |  25 +++--
+ qt4/src/poppler-movie.cc |  11 +-
  6 files changed, 246 insertions(+), 366 deletions(-)
 
 commit ec9138b574c7226ad733880d3d43b86bb72073f4
@@ -20277,7 +23458,7 @@ Date:	Sun Mar 7 23:17:50 2010 +0100
 
     [autotools] add also cpp/tests/CMakeLists.txt to the "dist files"
 
- Makefile.am |	  1 +
+ Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit ef3258d6fc57e7a62d951cc826804e50e8e1b526
@@ -20286,7 +23467,7 @@ Date:	Sun Mar 7 23:14:12 2010 +0100
 
     [autotools] fix location of poppler-config.h.cmake
 
- Makefile.am |	  2 +-
+ Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fd1d9c882997ff35acd5a458e9dfeba3ad6c8b25
@@ -20295,7 +23476,7 @@ Date:	Sun Mar 7 22:42:06 2010 +0100
 
     [CMake] just enable what needed each time
 
- CMakeLists.txt |    4 ++--
+ CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 476bde472a7e694afde96a04ea335fe9582d6fad
@@ -20306,7 +23487,7 @@ Date:	Sun Mar 7 22:39:45 2010 +0100
 
     taken from two bits in configure.ac
 
- CMakeLists.txt |    2 +-
+ CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1267d7e0c36e262984070a3b55fea46e7289a4b4
@@ -20315,7 +23496,7 @@ Date:	Sun Mar 7 19:34:03 2010 +0100
 
     [CMake] add a note about gtk-doc not supported yet
 
- CMakeLists.txt |    2 +-
+ CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 201b18ad0837e84d874b56e1b0469d1b2d45378b
@@ -20325,7 +23506,7 @@ Date:	Sun Mar 7 19:30:36 2010 +0100
     [CMake] sync with poppler-config.h.in: add
     WITH_FONTCONFIGURATION_{FONTCONFIG,WIN32}
 
- poppler/poppler-config.h.cmake |   10 ++++++++++
+ poppler/poppler-config.h.cmake | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 0d0044e8cc2d406f066338102ec73e1b56214cc3
@@ -20335,11 +23516,11 @@ Date:	Sun Mar 7 19:25:27 2010 +0100
     [CMake] move poppler-config.h.cmake in the poppler subdirectory,
     where poppler-config.h.in is
 
- CMakeLists.txt			|    2 +-
- poppler-config.h.cmake		|   90
- ----------------------------------------
- poppler/poppler-config.h.cmake |   90
- ++++++++++++++++++++++++++++++++++++++++
+ CMakeLists.txt			|  2 +-
+ poppler-config.h.cmake		| 90
+ ------------------------------------------
+ poppler/poppler-config.h.cmake | 90
+ ++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 91 insertions(+), 91 deletions(-)
 
 commit f785e29a901d2c76204dd26e9585446fdd817ebd
@@ -20350,7 +23531,7 @@ Date:	Sun Mar 7 18:35:34 2010 +0100
 
     ie usually when doing `make clean'
 
- glib/CMakeLists.txt |	  4 ++++
+ glib/CMakeLists.txt | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 369604603375dbe3516136b6f8f9d0c26e0b744f
@@ -20360,7 +23541,7 @@ Date:	Sun Mar 7 18:26:45 2010 +0100
     [CMake] use the --template option of glib-mkenums (like done with
     autotools)
 
- glib/CMakeLists.txt |	 24 ++++--------------------
+ glib/CMakeLists.txt | 24 ++++--------------------
  1 file changed, 4 insertions(+), 20 deletions(-)
 
 commit bbcbb34fec10c90edd5960bdbcc6849bc8f39526
@@ -20370,8 +23551,8 @@ Date:	Sun Mar 7 17:34:40 2010 +0100
     [CMake] set POPPLER_GLIB_DISABLE_DEPRECATED and
     POPPLER_GLIB_DISABLE_SINGLE_INCLUDES as done with autotools
 
- CMakeLists.txt      |	  6 ++++++
- glib/CMakeLists.txt |	  6 +++++-
+ CMakeLists.txt      | 6 ++++++
+ glib/CMakeLists.txt | 6 +++++-
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 190fa971c12ca1b3007f6ba349a77a7c15c47490
@@ -20380,7 +23561,7 @@ Date:	Sun Mar 7 17:24:25 2010 +0100
 
     reorder to match what's in the correspondent .in
 
- glib/poppler-features.h.cmake |    2 +-
+ glib/poppler-features.h.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ff46def8b178420a86a974ec2ce767a538bba8be
@@ -20389,7 +23570,7 @@ Date:	Sun Mar 7 17:23:16 2010 +0100
 
     [CMake] GDK_FEATURE is no more needed here
 
- glib/CMakeLists.txt |	  1 -
+ glib/CMakeLists.txt | 1 -
  1 file changed, 1 deletion(-)
 
 commit 1eb8026a3060ef61a88c535177510f7ac7e7fc25
@@ -20398,7 +23579,7 @@ Date:	Sun Mar 7 17:19:58 2010 +0100
 
     [CMake] set in one place whether to build the glib frontend
 
- CMakeLists.txt |   11 ++++++-----
+ CMakeLists.txt | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit a1a6f23e2345814e147a72211ce9139555385223
@@ -20407,8 +23588,8 @@ Date:	Sun Mar 7 17:09:58 2010 +0100
 
     [CMake] correctly set the GLIB_REQ stuff
 
- CMakeLists.txt        |    1 +
- poppler-glib.pc.cmake |    2 +-
+ CMakeLists.txt        | 1 +
+ poppler-glib.pc.cmake | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 0f2e5d6925c5938281d9bafc297a43867c4a915b
@@ -20417,8 +23598,8 @@ Date:	Sun Mar 7 17:03:21 2010 +0100
 
     [CMake] move the minimum GLib version to the main CMakeLists.txt
 
- CMakeLists.txt		     |	  1 +
- cmake/modules/FindGTK.cmake |	  2 +-
+ CMakeLists.txt		     | 1 +
+ cmake/modules/FindGTK.cmake | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit efdffba45d15b538dbfb294403e99f3a6470b4d9
@@ -20428,8 +23609,8 @@ Date:	Sun Mar 7 16:58:27 2010 +0100
     [CMake] align the GDK stuff (GDK_{FEATURE,REQ}) to what done with
     autotools
 
- CMakeLists.txt        |    6 +++++-
- poppler-glib.pc.cmake |    2 +-
+ CMakeLists.txt        | 6 +++++-
+ poppler-glib.pc.cmake | 2 +-
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit cfecc69b7f05920f543ee7e9aafeafaa4c3506fb
@@ -20439,7 +23620,7 @@ Date:	Sun Mar 7 16:49:14 2010 +0100
     [CMake] apparently there's not a minimum version requirement for GDK,
     so drop the check
 
- cmake/modules/FindGTK.cmake |	  5 +----
+ cmake/modules/FindGTK.cmake | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 8ff1cf03d2607b0f13bbbbf272f2b03d8927bd24
@@ -20451,8 +23632,8 @@ Date:	Sun Mar 7 16:47:21 2010 +0100
     this starts to align to the searches done with autotools
     also, move the CAIRO_FEATURE to the main CMakeLists.txt
 
- CMakeLists.txt      |	 19 +++++++++++--------
- glib/CMakeLists.txt |	  1 -
+ CMakeLists.txt      | 19 +++++++++++--------
+ glib/CMakeLists.txt |	1 -
  2 files changed, 11 insertions(+), 9 deletions(-)
 
 commit bcaf62b8e252594530d3050761ba563cf3b1fb6e
@@ -20474,10 +23655,10 @@ Date:	Sun Mar 7 16:00:03 2010 +0100
     apply the changes to the rest of the build system (specify the
     version needed, use the correct variable for includes)
 
- CMakeLists.txt		       |    2 +-
- cmake/modules/FindCairo.cmake |   64
- ++++++++++++++++++++++++++---------------
- glib/CMakeLists.txt	       |    2 +-
+ CMakeLists.txt		       |  2 +-
+ cmake/modules/FindCairo.cmake | 64
+ +++++++++++++++++++++++++++----------------
+ glib/CMakeLists.txt	       |  2 +-
  3 files changed, 43 insertions(+), 25 deletions(-)
 
 commit c96aa0f5fc74ae04f483485b787aaf65f1791991
@@ -20486,10 +23667,10 @@ Date:	Sun Mar 7 02:01:13 2010 +0100
 
     add Patrick's copyright notices
 
- cpp/poppler-global.h	    |	 1 +
- goo/gtypes.h		    |	14 ++++++++++++++
- poppler/GlobalParams.cc    |	 1 +
- poppler/SplashOutputDev.cc |	 1 +
+ cpp/poppler-global.h	    |  1 +
+ goo/gtypes.h		    | 14 ++++++++++++++
+ poppler/GlobalParams.cc    |  1 +
+ poppler/SplashOutputDev.cc |  1 +
  4 files changed, 17 insertions(+)
 
 commit 3311bedd2eb831ef1fd553f3f50960331cf6885f
@@ -20499,7 +23680,7 @@ Date:	Sun Mar 7 01:56:15 2010 +0100
     MSVC: disable for the 'ustring' class the warning C4251 (which does
     not apply)
 
- cpp/poppler-global.h |    8 ++++++++
+ cpp/poppler-global.h | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 9efa18397bd05fbd27c7811fa6e0f34ce94012e0
@@ -20508,7 +23689,7 @@ Date:	Sun Mar 7 01:48:03 2010 +0100
 
     MSVC: disable warning C4800, which is of no use for now
 
- goo/gtypes.h |    4 ++++
+ goo/gtypes.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 3a88d1bf8d2c5a9e8014e0d46e24c9ec06556469
@@ -20517,7 +23698,7 @@ Date:	Sun Mar 7 01:26:10 2010 +0100
 
     MSVC: no isfinite(), so provide it using _finite()
 
- poppler/SplashOutputDev.cc |	 5 +++++
+ poppler/SplashOutputDev.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 7774912c46f832f25c51b4cfc0e9430b1cd7fa1f
@@ -20527,7 +23708,7 @@ Date:	Sun Mar 7 01:22:31 2010 +0100
     MSVC: do not force constness here, so the right overload will
     be chosen
 
- poppler/GlobalParams.cc |    4 ++--
+ poppler/GlobalParams.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit cf07a5d85b402b6956c9605fbdc88bddcb94a3cf
@@ -20538,7 +23719,7 @@ Date:	Sun Mar 7 00:49:07 2010 +0100
 
     just like done with autotools
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 42c98f8eabe304d5e3dc8c1ebdd5b0b6c221e696
@@ -20554,7 +23735,7 @@ Date:	Sat Mar 6 17:18:08 2010 +0100
     as a consequence, make fontconfig a requirement only if the font
     backend chosen is "fontconfig"
 
- CMakeLists.txt |   39 +++++++++++++++++++++++++++++----------
+ CMakeLists.txt | 39 +++++++++++++++++++++++++++++----------
  1 file changed, 29 insertions(+), 10 deletions(-)
 
 commit bda6e7cd089f2970af2e9540b4415633ffcf0ebb
@@ -20567,7 +23748,7 @@ Date:	Sat Mar 6 17:13:30 2010 +0100
     make show_end_message_yesno() call it with the proper "yes" or
     "no" string
 
- cmake/modules/PopplerMacros.cmake |	9 +++++++--
+ cmake/modules/PopplerMacros.cmake | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit d313c0f508711b3b7166b84608c43ebf1f07194b
@@ -20577,8 +23758,8 @@ Date:	Sat Mar 6 17:08:59 2010 +0100
     [CMake] rename the show_end_message() macro to
     show_end_message_yesno()
 
- CMakeLists.txt			   |   26 +++++++++++++-------------
- cmake/modules/PopplerMacros.cmake |	4 ++--
+ CMakeLists.txt			   | 26 +++++++++++++-------------
+ cmake/modules/PopplerMacros.cmake |  4 ++--
  2 files changed, 15 insertions(+), 15 deletions(-)
 
 commit 0425ff835fa26df5e25e628a6c56f3a180713905
@@ -20587,7 +23768,7 @@ Date:	Fri Mar 5 22:21:56 2010 +0100
 
     update copyright
 
- poppler/ArthurOutputDev.cc |	 2 +-
+ poppler/ArthurOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c5ea135ca58e112110be3ae10d887f3188172765
@@ -20596,7 +23777,7 @@ Date:	Fri Mar 5 22:14:57 2010 +0100
 
     [arthur] update the miter limit
 
- poppler/ArthurOutputDev.cc |	 4 ++--
+ poppler/ArthurOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 552f344b3e3df7c796afa6946149b0a5590cc4f7
@@ -20605,7 +23786,7 @@ Date:	Fri Mar 5 22:04:39 2010 +0100
 
     [arthur] update the line dash style
 
- poppler/ArthurOutputDev.cc |	12 +++++++++++-
+ poppler/ArthurOutputDev.cc | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit bc42ee05fceef0d0dd2ab0587c184dfc37cf29bf
@@ -20614,7 +23795,7 @@ Date:	Fri Mar 5 18:54:32 2010 +0000
 
     fix copyright year
 
- poppler/CairoOutputDev.cc |	2 +-
+ poppler/CairoOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b21461e91ed671ef29fd3cf4780fda44f82a0679
@@ -20623,7 +23804,7 @@ Date:	Fri Mar 5 15:14:08 2010 +0100
 
     [cairo] Close image stream before resetting it again
 
- poppler/CairoOutputDev.cc |	2 ++
+ poppler/CairoOutputDev.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 866bcc7edb47fe11355081045e2d316a4d530649
@@ -20632,7 +23813,7 @@ Date:	Thu Mar 4 14:19:50 2010 +0100
 
     [Qt4] no need to save&restore on a newly created painter
 
- qt4/src/poppler-page.cc |    2 --
+ qt4/src/poppler-page.cc | 2 --
  1 file changed, 2 deletions(-)
 
 commit 654698b556eb53eab7c2d55fc6b3fdd9e35173bb
@@ -20643,8 +23824,8 @@ Date:	Thu Mar 4 13:16:11 2010 +0100
 
     arthur is no more tied to splash, so can be used in an occasion
 
- qt4/src/poppler-document.cc |	  2 +-
- qt4/src/poppler-page.cc     |	  4 +---
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-page.cc     | 4 +---
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 commit 41931b6310d2ae81e622db904246f019ceb8410d
@@ -20656,9 +23837,9 @@ Date:	Thu Mar 4 13:13:11 2010 +0100
     as the arthur output dev does not require splash anymore, we can
     always compile it with poppler-qt4
 
- poppler/Makefile.am	|    4 ++--
- qt4/src/CMakeLists.txt |    6 +-----
- qt4/src/Makefile.am	|    6 +-----
+ poppler/Makefile.am	| 4 ++--
+ qt4/src/CMakeLists.txt | 6 +-----
+ qt4/src/Makefile.am	| 6 +-----
  3 files changed, 4 insertions(+), 12 deletions(-)
 
 commit 48a29e2bbc9aa9bd0cb2775a2365c0ffdeb6ce87
@@ -20669,7 +23850,7 @@ Date:	Thu Mar 4 13:11:43 2010 +0100
 
     text rendering is disabled in that case for now
 
- poppler/ArthurOutputDev.cc |	11 ++++++++++-
+ poppler/ArthurOutputDev.cc | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 2013a19b6457753890affad8c4049f2ce4627df7
@@ -20678,7 +23859,7 @@ Date:	Thu Mar 4 13:02:43 2010 +0100
 
     [CMake/tests] compile gtk-splash-test only if splash is enabled
 
- test/CMakeLists.txt |	 14 +++++++++-----
+ test/CMakeLists.txt | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 commit ae740c5cfefbae13f82b750e39fa3dbbdc94858b
@@ -20687,18 +23868,18 @@ Date:	Tue Mar 2 23:22:06 2010 +0100
 
     [cpp] update the copyrights
 
- cpp/poppler-document-private.h |    2 +-
- cpp/poppler-document.cpp	|    2 +-
- cpp/poppler-embedded-file.cpp	|    2 +-
- cpp/poppler-embedded-file.h	|    2 +-
- cpp/poppler-global.cpp		|    3 ++-
- cpp/poppler-global.h		|    2 +-
- cpp/poppler-page.cpp		|    2 +-
- cpp/poppler-page.h		|    2 +-
- cpp/poppler-rectangle.h	|    2 +-
- cpp/poppler-toc.cpp		|    2 +-
- cpp/poppler-version.cpp	|    2 +-
- cpp/tests/poppler-dump.cpp	|    2 +-
+ cpp/poppler-document-private.h | 2 +-
+ cpp/poppler-document.cpp	| 2 +-
+ cpp/poppler-embedded-file.cpp	| 2 +-
+ cpp/poppler-embedded-file.h	| 2 +-
+ cpp/poppler-global.cpp		| 3 ++-
+ cpp/poppler-global.h		| 2 +-
+ cpp/poppler-page.cpp		| 2 +-
+ cpp/poppler-page.h		| 2 +-
+ cpp/poppler-rectangle.h	| 2 +-
+ cpp/poppler-toc.cpp		| 2 +-
+ cpp/poppler-version.cpp	| 2 +-
+ cpp/tests/poppler-dump.cpp	| 2 +-
  12 files changed, 13 insertions(+), 12 deletions(-)
 
 commit 24b1d8d0b4ae7cea9fbc331f19cd5ce3917b8b4d
@@ -20707,9 +23888,9 @@ Date:	Tue Mar 2 23:15:56 2010 +0100
 
     [cpp] {from,to}_utf_8() -> {from,to}_utf8()
 
- cpp/poppler-global.cpp |    4 ++--
- cpp/poppler-global.h	|    4 ++--
- cpp/poppler-page.cpp	|    2 +-
+ cpp/poppler-global.cpp | 4 ++--
+ cpp/poppler-global.h	| 4 ++--
+ cpp/poppler-page.cpp	| 2 +-
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 690af1bc58de1ebe710c5e599f1cb635e4838fc8
@@ -20720,7 +23901,7 @@ Date:	Tue Mar 2 16:33:04 2010 +0100
 
     fixes building on Windows
 
- cpp/Makefile.am |    3 +++
+ cpp/Makefile.am | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 7492a376e7e5ec35534276ac15485123645617b0
@@ -20729,7 +23910,7 @@ Date:	Tue Mar 2 22:16:07 2010 +0100
 
     [cpp/tests] use gmtime() when gmtime_r() is not available
 
- cpp/tests/poppler-dump.cpp |	 9 ++++++++-
+ cpp/tests/poppler-dump.cpp | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit de013cc14a0621782c53f481ed7e559f241855a3
@@ -20738,7 +23919,7 @@ Date:	Tue Mar 2 22:05:25 2010 +0100
 
     [cpp] include config.h _after_ the other includes
 
- cpp/poppler-global.cpp |    4 ++--
+ cpp/poppler-global.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 388e5d6aebcabbfc90894c86248159c63701cb0a
@@ -20747,7 +23928,7 @@ Date:	Tue Mar 2 15:51:23 2010 +0100
 
     Use ICONV_CONST when necessary
 
- cpp/poppler-global.cpp |   10 ++++++----
+ cpp/poppler-global.cpp | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit aaa58b26733a2f7c778632da4942b588050cf33f
@@ -20756,9 +23937,9 @@ Date:	Tue Mar 2 21:53:55 2010 +0100
 
     [CMake] properly define ICONV_CONST
 
- CMakeLists.txt		       |    1 -
- cmake/modules/FindIconv.cmake |    3 +++
- config.h.cmake		       |    2 +-
+ CMakeLists.txt		       | 1 -
+ cmake/modules/FindIconv.cmake | 3 +++
+ config.h.cmake		       | 2 +-
  3 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 6304b0d8959fccf96b030c757d78e845d04757e4
@@ -20767,11 +23948,11 @@ Date:	Sun Feb 28 15:33:53 2010 +0100
 
     poppler 0.13.1
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   33 +++++++++++++++++++++++++++++++++
- configure.ac	  |    2 +-
- cpp/Doxyfile	  |    2 +-
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 33 +++++++++++++++++++++++++++++++++
+ configure.ac	  |  2 +-
+ cpp/Doxyfile	  |  2 +-
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 37 insertions(+), 4 deletions(-)
 
 commit 9eac71862915c851c07075e3ca3af82eb9e4e775
@@ -20780,7 +23961,7 @@ Date:	Sun Feb 28 15:33:19 2010 +0100
 
     Make sure the private headers end up in the tarball on make dist
 
- cpp/Makefile.am |    5 +++++
+ cpp/Makefile.am | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit b488172311c2921ab4c365d71ad8b1ab7f596c71
@@ -20789,8 +23970,8 @@ Date:	Sun Feb 28 14:25:36 2010 +0100
 
     Add copyright notices
 
- poppler/CairoFontEngine.cc |	 3 ++-
- poppler/CairoFontEngine.h  |	 2 +-
+ poppler/CairoFontEngine.cc | 3 ++-
+ poppler/CairoFontEngine.h  | 2 +-
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 5453cff5b7cb47cadfdae585a58409117af8c1f1
@@ -20804,9 +23985,9 @@ Date:	Sun Feb 28 13:51:22 2010 +0100
 
     See bugs #25268, #9860
 
- poppler/CairoOutputDev.cc |   64
- +++++++++++++++++++++++++++++++++------------
- poppler/CairoOutputDev.h  |	2 ++
+ poppler/CairoOutputDev.cc | 64
+ ++++++++++++++++++++++++++++++++++-------------
+ poppler/CairoOutputDev.h  |  2 ++
  2 files changed, 49 insertions(+), 17 deletions(-)
 
 commit e65456cbd5cae2750426aabeb2d66a10537616f0
@@ -20815,9 +23996,9 @@ Date:	Sun Feb 28 13:13:13 2010 +0100
 
     [cairo] Refactor scaled size computation into a new method
 
- poppler/CairoOutputDev.cc |   52
- ++++++++++++++++++++++-----------------------
- poppler/CairoOutputDev.h  |	2 ++
+ poppler/CairoOutputDev.cc | 52
+ +++++++++++++++++++++++------------------------
+ poppler/CairoOutputDev.h  |  2 ++
  2 files changed, 28 insertions(+), 26 deletions(-)
 
 commit 32aa9ae7d0087298661829265de00e93398272b3
@@ -20828,8 +24009,8 @@ Date:	Sat Feb 27 17:58:46 2010 +0100
 
     Fixes bug #26694.
 
- poppler/CairoFontEngine.cc |  146
- ++++++++++++++++++++++++--------------------
+ poppler/CairoFontEngine.cc | 146
+ +++++++++++++++++++++++++--------------------
  1 file changed, 80 insertions(+), 66 deletions(-)
 
 commit 7ba52a32343ca73730a80b64c136e3f03348e7d9
@@ -20838,8 +24019,8 @@ Date:	Sat Feb 27 17:42:46 2010 +0100
 
     [cairo] Remove unused 'face' from CairoFreeTypeFont class
 
- poppler/CairoFontEngine.cc |	 6 ++----
- poppler/CairoFontEngine.h  |	 3 +--
+ poppler/CairoFontEngine.cc | 6 ++----
+ poppler/CairoFontEngine.h  | 3 +--
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 commit 7c3140c88c00282e10888143fffe3c402d48fb05
@@ -20848,7 +24029,7 @@ Date:	Sat Feb 27 13:13:47 2010 +0100
 
     Don't use '\' character in PostScript names
 
- poppler/PSOutputDev.cc |    4 ++--
+ poppler/PSOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8e354a15a1861719c00799937ad9f9bb1bb71e9f
@@ -20862,7 +24043,7 @@ Date:	Wed Feb 24 18:58:11 2010 +0000
     so it is clipped to this bbox, too. But when coloring text or masks in
     pattern colorspace, this is definely wrong.
 
- poppler/Gfx.cc |    3 ++-
+ poppler/Gfx.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit fcbc571a98775b1daa8f562fc8674fb2d15b6626
@@ -20875,9 +24056,9 @@ Date:	Tue Feb 23 17:02:47 2010 +0100
     such instead of pretending it is a string
     accordingly adapt the mini dump application
 
- cpp/poppler-embedded-file.cpp |   10 ++++++++--
- cpp/poppler-embedded-file.h   |    2 +-
- cpp/tests/poppler-dump.cpp    |    4 ++--
+ cpp/poppler-embedded-file.cpp | 10 ++++++++--
+ cpp/poppler-embedded-file.h   |  2 +-
+ cpp/tests/poppler-dump.cpp    |  4 ++--
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 commit fbefb9bef9f7a099d51919255a98f412d1e1d696
@@ -20886,8 +24067,8 @@ Date:	Tue Feb 23 16:56:47 2010 +0100
 
     [cpp apidox] add API documentation for the 'embedded_file' class
 
- cpp/poppler-embedded-file.cpp |   43
- +++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-embedded-file.cpp | 43
+ +++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 43 insertions(+)
 
 commit 6d39cca0a035fc656d3b86ba66dedaccee532fcb
@@ -20897,8 +24078,8 @@ Date:	Tue Feb 23 16:41:56 2010 +0100
     [cpp apidox] add API documentation for the 'toc' and 'toc_item'
     classes
 
- cpp/poppler-toc.cpp |	 57
- +++++++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-toc.cpp | 57
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 57 insertions(+)
 
 commit 857e4ceb26d959c48c7af6bff53ca1bfe5307236
@@ -20908,8 +24089,8 @@ Date:	Tue Feb 23 15:39:58 2010 +0100
     [cpp] when the loading of the document fails, put back the data
     where it was before
 
- cpp/poppler-document-private.h |    2 +-
- cpp/poppler-document.cpp	|   10 +++++++---
+ cpp/poppler-document-private.h |  2 +-
+ cpp/poppler-document.cpp	| 10 +++++++---
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit 7838b182143086192ac8dcf571da0ce1743619e2
@@ -20919,7 +24100,7 @@ Date:	Tue Feb 23 00:04:09 2010 +0100
     [cpp] add the directory of the generated html apidox to the ignore
     list
 
- cpp/.gitignore |    1 +
+ cpp/.gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 71a38a23a9db5cac872c666283b7abcb1462210c
@@ -20928,8 +24109,8 @@ Date:	Mon Feb 22 23:43:34 2010 +0100
 
     [cpp] add page::text() to get the text inside a page region
 
- cpp/poppler-page.cpp |   16 ++++++++++++++++
- cpp/poppler-page.h   |    1 +
+ cpp/poppler-page.cpp | 16 ++++++++++++++++
+ cpp/poppler-page.h   |  1 +
  2 files changed, 17 insertions(+)
 
 commit 4c75360233bc67f097551980a46ecce976927220
@@ -20938,9 +24119,9 @@ Date:	Mon Feb 22 23:05:53 2010 +0100
 
     [cpp] add page::search()
 
- cpp/poppler-page.cpp |   51
- ++++++++++++++++++++++++++++++++++++++++++++++++++
- cpp/poppler-page.h   |    8 ++++++++
+ cpp/poppler-page.cpp | 51
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-page.h   |  8 ++++++++
  2 files changed, 59 insertions(+)
 
 commit 8932c53a084083eb42d109dd17bac3ad41ce65b5
@@ -20949,7 +24130,7 @@ Date:	Mon Feb 22 22:39:36 2010 +0100
 
     [cpp] add getters and setters for left/top/right/bottom
 
- cpp/poppler-rectangle.h |   18 ++++++++++++++++++
+ cpp/poppler-rectangle.h | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
 commit 8e1ea57f558fa3a1702a17d79b5aaffc486c6a56
@@ -20958,7 +24139,7 @@ Date:	Mon Feb 22 22:19:51 2010 +0100
 
     [cpp] add a global enum for case sensitivity
 
- cpp/poppler-global.h |    2 ++
+ cpp/poppler-global.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit ae41b087de8f0a7d525320dcf1d64ff22fe982b6
@@ -20977,7 +24158,7 @@ Date:	Mon Feb 22 19:05:49 2010 +0100
 
     [cpp apidox] very small start of intro page
 
- cpp/Mainpage.dox |    9 +++++++++
+ cpp/Mainpage.dox | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 85e052ab7a4c462143325ecf60eebba35411b790
@@ -20990,7 +24171,7 @@ Date:	Mon Feb 22 18:53:20 2010 +0100
     ... including the 'convert_date' function and faking the 'noncopyable'
     class
 
- cpp/poppler-global.cpp |   16 ++++++++++++++++
+ cpp/poppler-global.cpp | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
 commit b01608f91fb6cf6e9c4fb6e6ee3cb57517a766bf
@@ -21002,7 +24183,7 @@ Date:	Mon Feb 22 18:52:24 2010 +0100
     this includes also the 'noncopyable' typedef, but that will be
     handled differently
 
- cpp/poppler-global.h |    2 ++
+ cpp/poppler-global.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit f17a7a8cfdeabb3ced3ba8d42c869d892c528e13
@@ -21011,7 +24192,7 @@ Date:	Mon Feb 22 18:51:30 2010 +0100
 
     [cpp apidox] add API documentation for the version functions
 
- cpp/poppler-version.cpp |   12 ++++++++++++
+ cpp/poppler-version.cpp | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit f6c4bbddc7d04c0b1a6b25c41cbf6d81ae40cc0c
@@ -21020,8 +24201,8 @@ Date:	Mon Feb 22 18:50:54 2010 +0100
 
     [cpp apidox] start adding API documentation for 'document'
 
- cpp/poppler-document.cpp |  182
- ++++++++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-document.cpp | 182
+ +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 182 insertions(+)
 
 commit cbb7519904d9b6395d0128e16a79324e4b8bfcc0
@@ -21033,8 +24214,8 @@ Date:	Mon Feb 22 13:15:11 2010 +0100
     followup of 880890c14e99a954b365a3a6b59deeffa5304d30 for the cmake
     build system
 
- cmake/modules/FindCairo.cmake |   18 ------------------
- config.h.cmake		       |    3 ---
+ cmake/modules/FindCairo.cmake | 18 ------------------
+ config.h.cmake		       |  3 ---
  2 files changed, 21 deletions(-)
 
 commit 80f47bbf45faf751c661c1d0931e8e1da622b8ca
@@ -21047,9 +24228,8 @@ Date:	Mon Feb 22 12:43:06 2010 +0100
     cairo_surface_set_mime_data() to attach the jpeg stream to the
     surface reduces drastically the size of the output file.
 
- poppler/CairoOutputDev.cc |   42
- ++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |	1 +
+ poppler/CairoOutputDev.cc | 42 ++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  |  1 +
  2 files changed, 43 insertions(+)
 
 commit d63293af6dbff65f160be0118b1580c03a1aab56
@@ -21058,8 +24238,8 @@ Date:	Fri Nov 27 09:52:23 2009 +0100
 
     [cairo] Turn EXTEND_PAD off when printing
 
- poppler/CairoOutputDev.cc |   98
- +++++++++++++++++++++++++++++++--------------
+ poppler/CairoOutputDev.cc | 98
+ ++++++++++++++++++++++++++++++++---------------
  1 file changed, 67 insertions(+), 31 deletions(-)
 
 commit 880890c14e99a954b365a3a6b59deeffa5304d30
@@ -21069,8 +24249,8 @@ Date:	Mon Feb 22 11:01:05 2010 +0100
     [cairo] Use CAIRO_VERSION macros to check whether blend modes are
     available
 
- configure.ac		   |   24 ------------------------
- poppler/CairoOutputDev.cc |	4 ++--
+ configure.ac		   | 24 ------------------------
+ poppler/CairoOutputDev.cc |  4 ++--
  2 files changed, 2 insertions(+), 26 deletions(-)
 
 commit 5c300ce00b5c59da767ca1ffec12f96f0ebbe701
@@ -21079,7 +24259,7 @@ Date:	Sun Feb 21 21:20:10 2010 +0100
 
     [Qt4/apidox] fix typo
 
- qt4/src/poppler-qt4.h |    2 +-
+ qt4/src/poppler-qt4.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3f89ccf871e2f4a14129ad3e986b8cd19cdf129c
@@ -21088,7 +24268,7 @@ Date:	Sun Feb 21 21:06:31 2010 +0100
 
     [CMake] set the CXXFLAGS in a better way
 
- CMakeLists.txt |    4 ++--
+ CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a18dab9e53a20a76eb46fa3a868fffdd3c754ce2
@@ -21134,8 +24314,8 @@ Date:	Sun Feb 21 16:59:57 2010 +0000
 
     Fixes bug 26650
 
- ConfigureChecks.cmake |    5 +++++
- test/CMakeLists.txt   |   17 +++++++++++------
+ ConfigureChecks.cmake |  5 +++++
+ test/CMakeLists.txt   | 17 +++++++++++------
  2 files changed, 16 insertions(+), 6 deletions(-)
 
 commit d074485aa9d9fac6b715382002f53e3303bbc519
@@ -21146,7 +24326,7 @@ Date:	Sat Feb 20 10:08:33 2010 +0000
 
     Gives a 20% speed increase in some pdf
 
- splash/Splash.cc |   19 ++++++++++---------
+ splash/Splash.cc | 19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 commit d4cafe357bd86feb4b56e5dfbf5b7822e237a2ee
@@ -21157,7 +24337,7 @@ Date:	Sat Feb 20 10:07:20 2010 +0000
 
     Gives a 8% speed increase in some pdf
 
- splash/Splash.cc |    6 +++---
+ splash/Splash.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit c3122cfbe090f3a4045269222f941cd5ce77c171
@@ -21168,8 +24348,8 @@ Date:	Sat Feb 20 10:04:37 2010 +0000
 
     Gives a 10% speed increase in some documents
 
- splash/SplashClip.cc |   40 ++++++++++++++--------------------------
- splash/SplashClip.h  |   43 +++++++++++++++++++++++++++++++++++++++++--
+ splash/SplashClip.cc | 40 ++++++++++++++--------------------------
+ splash/SplashClip.h  | 43 +++++++++++++++++++++++++++++++++++++++++--
  2 files changed, 55 insertions(+), 28 deletions(-)
 
 commit d987fb9b77e6da454eb898cc6c8baaf747b7ac4f
@@ -21178,7 +24358,7 @@ Date:	Fri Feb 19 23:59:03 2010 +0000
 
     implement writeImgFile for splashModeXBGR8
 
- splash/SplashBitmap.cc |   25 +++++++++++++++++++++++--
+ splash/SplashBitmap.cc | 25 +++++++++++++++++++++++--
  1 file changed, 23 insertions(+), 2 deletions(-)
 
 commit f9425c0b5b112ac673d0499f79a743afce719593
@@ -21187,11 +24367,11 @@ Date:	Fri Feb 19 20:18:13 2010 +0000
 
     use pkgconfig to detect libpng on autotools too
 
- configure.ac	     |	 12 ++++---
- goo/Makefile.am     |	  7 +++-
- m4/libpng.m4	     |	 99
- ---------------------------------------------------
- poppler/Makefile.am |	  3 ++
+ configure.ac	     | 12 ++++---
+ goo/Makefile.am     |	7 +++-
+ m4/libpng.m4	     | 99
+ -----------------------------------------------------
+ poppler/Makefile.am |	3 ++
  4 files changed, 17 insertions(+), 104 deletions(-)
 
 commit 0cb07d645527f25997f5e1b104a6be92441d8ffa
@@ -21200,7 +24380,7 @@ Date:	Thu Feb 18 23:27:20 2010 +0000
 
     Only swap w with h if rotation is 90 or 270
 
- utils/pdftoppm.cc |	4 ++--
+ utils/pdftoppm.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 35015ed11090d67cab69443e607d4d80ca03c619
@@ -21209,7 +24389,7 @@ Date:	Thu Feb 18 23:14:51 2010 +0000
 
     Match the number of calls to beginMarkedContent and endMarkedContent
 
- poppler/Gfx.cc |    3 +++
+ poppler/Gfx.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit ee265760e6ecec93fe26fb8e02848872555daefd
@@ -21218,7 +24398,7 @@ Date:	Thu Feb 18 23:13:48 2010 +0000
 
     make sure properties exists before using it
 
- poppler/TextOutputDev.cc |    4 ++--
+ poppler/TextOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit eab7a55815c06525c7aeba254b66498ab147a958
@@ -21227,7 +24407,7 @@ Date:	Wed Feb 17 21:54:31 2010 +0000
 
     if malloc failed return false
 
- splash/SplashFTFont.cc |    5 ++++-
+ splash/SplashFTFont.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit e2def20a45c1d8307fd62fabb9769121af975abf
@@ -21238,7 +24418,7 @@ Date:	Tue Feb 16 23:31:05 2010 +0000
 
     Fixes bug 26532 and a small line that was not drawn in 15899
 
- poppler/OptionalContent.cc |	 4 ++--
+ poppler/OptionalContent.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5edd175bdd0f7c2fc3aecb72384de4cb0788fc4e
@@ -21247,7 +24427,7 @@ Date:	Tue Feb 16 20:57:22 2010 +0000
 
     Add and fix copyright years
 
- poppler/CairoOutputDev.cc |	2 +-
+ poppler/CairoOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0f0fba1b04589061449f98b9dcd8a0c4e7ad2d74
@@ -21256,8 +24436,8 @@ Date:	Tue Feb 16 22:00:51 2010 +0100
 
     make the descriptions specify they refer to the Splash backend
 
- config.h.cmake |    4 ++--
- configure.ac	|    4 ++--
+ config.h.cmake | 4 ++--
+ configure.ac	| 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 39b4699020b5cfa1a10e5ef00f0e355e27b21c9f
@@ -21266,7 +24446,7 @@ Date:	Tue Feb 16 21:56:30 2010 +0100
 
     [CMake] reflect that poppler-glib needs cairo now
 
- poppler-glib.pc.cmake |    2 +-
+ poppler-glib.pc.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5c66c775bcd686c61ea136bcd8f261fb631c5e71
@@ -21277,8 +24457,8 @@ Date:	Tue Feb 16 20:52:15 2010 +0000
 
     Makes it much easier to manage and also fixes bug 26544
 
- poppler/GlobalParams.cc |   11 +++--------
- poppler/GlobalParams.h  |    6 +-----
+ poppler/GlobalParams.cc | 11 +++--------
+ poppler/GlobalParams.h  |  6 +-----
  2 files changed, 4 insertions(+), 13 deletions(-)
 
 commit 582b5259b3c65ee1bef99dbdfccf00f37269b76f
@@ -21288,8 +24468,8 @@ Date:	Tue Feb 16 16:36:24 2010 +0100
     [CMake] find the system threads, and define in the config.h if we
     have pthreads
 
- CMakeLists.txt |    4 ++++
- config.h.cmake |    3 +++
+ CMakeLists.txt | 4 ++++
+ config.h.cmake | 3 +++
  2 files changed, 7 insertions(+)
 
 commit 1dff9d440556a155fb5ca7bed15fc6a1f77a1c97
@@ -21299,8 +24479,8 @@ Date:	Tue Feb 16 16:10:44 2010 +0100
     [CMake] add the HAVE_LIBOPENJPEG and HAVE_OPENJPEG_H defines, to
     match autotools' ones
 
- CMakeLists.txt |    1 +
- config.h.cmake |    6 ++++++
+ CMakeLists.txt | 1 +
+ config.h.cmake | 6 ++++++
  2 files changed, 7 insertions(+)
 
 commit 4a0bcaa83e6e6533cd48c63449a08467d51c13ea
@@ -21309,7 +24489,7 @@ Date:	Tue Feb 16 16:01:53 2010 +0100
 
     [CMake] config.h.cmake: change some comments to match autotools' ones
 
- config.h.cmake |   10 ++++++----
+ config.h.cmake | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 9e38082c3e571d035f0152d65661e5dd97fdd5d8
@@ -21319,8 +24499,8 @@ Date:	Tue Feb 16 15:58:30 2010 +0100
     [CMake] add the Win32-specific ENABLE_RELOCATABLE option, matching
     autotools' one
 
- CMakeLists.txt |    5 +++++
- config.h.cmake |    3 +++
+ CMakeLists.txt | 5 +++++
+ config.h.cmake | 3 +++
  2 files changed, 8 insertions(+)
 
 commit eb03020893ed591c18817d75d427a1296cb1f233
@@ -21330,7 +24510,7 @@ Date:	Tue Feb 16 15:49:50 2010 +0100
     [CMake] config.h.cmake: move POPPLER_WITH_GDK in the same place of
     autotools' generated one, and with the same comment
 
- config.h.cmake |    6 +++---
+ config.h.cmake | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit ba65b3af047b758094b999b2939065c5127508dd
@@ -21341,7 +24521,7 @@ Date:	Wed Feb 10 23:08:04 2010 +0000
 
     Fixes bug 26351
 
- goo/JpegWriter.h |    6 +++++-
+ goo/JpegWriter.h | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit d3d2a3ee0a3505f44d1196823716b768d434ba73
@@ -21350,7 +24530,7 @@ Date:	Wed Feb 10 23:16:27 2010 +0100
 
     [CMake] fix typo: "MULTITHREAD" -> "MULTITHREADED"
 
- CMakeLists.txt |    2 +-
+ CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0dae2294cf8a2f312d8e6504be4e1be516b34b1b
@@ -21359,7 +24539,7 @@ Date:	Tue Feb 9 21:44:07 2010 +0000
 
     Fix regression in painting. Fixes bug 26243
 
- poppler/Gfx.cc |    9 ++++++++-
+ poppler/Gfx.cc | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 commit aa9c3acbc73bafb33c8a797701ed0488a4a74263
@@ -21371,8 +24551,8 @@ Date:	Thu Jan 28 17:23:18 2010 +0100
     It's unimplemented, it just contains a log message to help when
     debugging.
 
- poppler/CairoOutputDev.cc |	4 ++++
- poppler/CairoOutputDev.h  |	1 +
+ poppler/CairoOutputDev.cc | 4 ++++
+ poppler/CairoOutputDev.h  | 1 +
  2 files changed, 5 insertions(+)
 
 commit 41a450c8db45fd064798d15c3d8fe5ab536a7b30
@@ -21389,7 +24569,7 @@ Date:	Fri Jan 22 00:26:59 2010 -0500
 
     Still, better to clean this up.
 
- poppler/CairoOutputDev.cc |	5 ++---
+ poppler/CairoOutputDev.cc | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 309228404710debee4337cc53c641dfef64ad86c
@@ -21413,8 +24593,8 @@ Date:	Wed Jan 27 22:41:16 2010 +0000
     Unlike all the other attempts, this patch actually fixes the PDF in
     bug #24575.
 
- poppler/Gfx.cc |   11 +++++++++++
- poppler/Gfx.h	|    1 +
+ poppler/Gfx.cc | 11 +++++++++++
+ poppler/Gfx.h	|  1 +
  2 files changed, 12 insertions(+)
 
 commit 8284008aa8230a92ba08d547864353d3290e9bf9
@@ -21431,8 +24611,8 @@ Date:	Wed Jan 27 22:40:33 2010 +0000
     of the stack, but we do not pop past the stack as it was when we began
     rendering.
 
- poppler/Gfx.cc |   30 +++++++++++++++++++++++++++++-
- poppler/Gfx.h	|   11 +++++++++++
+ poppler/Gfx.cc | 30 +++++++++++++++++++++++++++++-
+ poppler/Gfx.h	| 11 +++++++++++
  2 files changed, 40 insertions(+), 1 deletion(-)
 
 commit 4ae84c830f842d100cbb702b32970951a5a5769f
@@ -21444,8 +24624,8 @@ Date:	Wed Jan 27 22:39:20 2010 +0000
     Introduces a new variable Gfx::stackHeight that maintains up-to-date
     information about the current height of the stack.
 
- poppler/Gfx.cc |    4 ++++
- poppler/Gfx.h	|    1 +
+ poppler/Gfx.cc | 4 ++++
+ poppler/Gfx.h	| 1 +
  2 files changed, 5 insertions(+)
 
 commit 120fe6ef673c648ae7b19ad2a7e9aef22ee25810
@@ -21457,7 +24637,7 @@ Date:	Wed Jan 27 22:38:43 2010 +0000
     The error condition in GfxCIDFont::GfxCIDFont references cMapName and
     collection, so they should not be deleted yet.
 
- poppler/GfxFont.cc |	 8 +++++---
+ poppler/GfxFont.cc | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 3375fa96c7a7dbbb98f5a7b3df9e840a5f30bc80
@@ -21466,8 +24646,8 @@ Date:	Wed Jan 27 22:32:29 2010 +0000
 
     GooVector rewrite, old version had "unknown" origins/license
 
- goo/GooVector.h |  237
- +++++++++++++++++++++++++++++++++----------------------
+ goo/GooVector.h | 237
+ +++++++++++++++++++++++++++++++++-----------------------
  1 file changed, 141 insertions(+), 96 deletions(-)
 
 commit a945fe64e16ac9aa2577c5db05fc7f3fd4955b7b
@@ -21478,7 +24658,7 @@ Date:	Wed Jan 27 16:15:40 2010 +0100
 
     Fixes bug #26264.
 
- poppler/CairoOutputDev.cc |   37 +++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.cc | 37 +++++++++++++++++++++++++++++++++++--
  1 file changed, 35 insertions(+), 2 deletions(-)
 
 commit 428cc965c17f167ea00540beeaeaac5c3e426686
@@ -21489,8 +24669,8 @@ Date:	Tue Jan 26 21:01:32 2010 +0000
 
     Bug 26247
 
- glib/CMakeLists.txt	       |    1 +
- glib/poppler-features.h.cmake |    1 +
+ glib/CMakeLists.txt	       | 1 +
+ glib/poppler-features.h.cmake | 1 +
  2 files changed, 2 insertions(+)
 
 commit 0af1ae75fd4c8031343f668bed5d8ca6588ee652
@@ -21501,7 +24681,7 @@ Date:	Tue Jan 26 20:49:17 2010 +0100
 
     Fixes bug #16906.
 
- poppler/CairoOutputDev.cc |	7 +++++--
+ poppler/CairoOutputDev.cc | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit d8ceaff39f5b80624b6bdc703c2a180dfc3d73ee
@@ -21510,7 +24690,7 @@ Date:	Tue Jan 26 11:57:06 2010 +0100
 
     [cairo] Add some more LOG messages
 
- poppler/CairoOutputDev.cc |   18 +++++++++++++++---
+ poppler/CairoOutputDev.cc | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 commit 778e764b3cb77526260c3c8b46acf19ad06fc61d
@@ -21519,12 +24699,12 @@ Date:	Mon Jan 25 22:40:20 2010 +0000
 
     poppler 0.13.0
 
- CMakeLists.txt      |	  4 +--
- NEWS		     |	 99
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac	     |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	4 +--
+ NEWS		     | 99
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	     |	2 +-
+ poppler/Makefile.am |	2 +-
+ qt4/src/Doxyfile    |	2 +-
  5 files changed, 104 insertions(+), 5 deletions(-)
 
 commit 1b5333f2685b8ab85bb1f5b899332c5a0ac99a3d
@@ -21540,7 +24720,7 @@ Date:	Mon Jan 25 02:19:00 2010 +0100
     0011 for
     setting the former from an include()d script
 
- cmake/modules/PopplerDefaults.cmake |	  7 +++++++
+ cmake/modules/PopplerDefaults.cmake | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 92e1f46866c063c370ef1d6324f6a6c01aed6680
@@ -21549,7 +24729,7 @@ Date:	Mon Jan 25 02:15:27 2010 +0100
 
     [CMake] do not add the fake buildtests target for the MSVC IDE
 
- cmake/modules/PopplerMacros.cmake |	4 ++--
+ cmake/modules/PopplerMacros.cmake | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit dea5aa37de079196fa916b1db9af782cf25045f9
@@ -21558,7 +24738,7 @@ Date:	Mon Jan 25 00:51:20 2010 +0000
 
     Install some more goo files
 
- CMakeLists.txt |    9 +++++++++
+ CMakeLists.txt | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit 671a971c45a1e8ce8f6daade82117a9a137034d6
@@ -21567,7 +24747,7 @@ Date:	Mon Jan 25 00:48:31 2010 +0000
 
     do not install a private header
 
- qt4/src/Makefile.am |	  6 +++---
+ qt4/src/Makefile.am | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 54c86e53a143a8f9d196e4bef2a733c6f00f6026
@@ -21576,7 +24756,7 @@ Date:	Mon Jan 25 00:33:07 2010 +0000
 
     Only build tests if told to
 
- test/CMakeLists.txt |	  4 ++--
+ test/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit eb082274694aadb80dd16caea65d7f0a1adf8b46
@@ -21585,7 +24765,7 @@ Date:	Mon Jan 25 00:29:55 2010 +0000
 
     Only build demos and test if told so. Install poppler-layer.h
 
- glib/CMakeLists.txt |	  9 +++++----
+ glib/CMakeLists.txt | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 73fcc310cd7d6ef435b453485c1c99a33f77212a
@@ -21594,7 +24774,7 @@ Date:	Mon Jan 25 00:29:09 2010 +0000
 
     install man pages
 
- utils/CMakeLists.txt |    7 +++++++
+ utils/CMakeLists.txt | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 8672217af4cf88d5506572c2b40fbb0d1d0dbd87
@@ -21605,9 +24785,9 @@ Date:	Mon Jan 25 00:11:50 2010 +0000
 
     And make sure what we was is a ref, otherwise we abort
 
- poppler/Gfx.cc		 |   14 ++++++++------
- poppler/PopplerCache.cc |   12 ++++++------
- poppler/PopplerCache.h  |    6 +++---
+ poppler/Gfx.cc		 | 14 ++++++++------
+ poppler/PopplerCache.cc | 12 ++++++------
+ poppler/PopplerCache.h  |  6 +++---
  3 files changed, 17 insertions(+), 15 deletions(-)
 
 commit 9567fd8d3d905897d0abacd77885102ae86ba8a9
@@ -21616,7 +24796,7 @@ Date:	Sun Jan 24 20:15:49 2010 +0000
 
     ImgWriter is a header too
 
- goo/Makefile.am |    1 +
+ goo/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 735e8a690d0bd3ab4bec90bdad975d19ac3d4689
@@ -21625,9 +24805,9 @@ Date:	Sun Jan 24 19:51:19 2010 +0000
 
     noone maintains this either
 
- msvc/config.h		       |   62 ---------------------------------
- msvc/poppler/poppler-config.h |   77
- -----------------------------------------
+ msvc/config.h		       | 62 ----------------------------------
+ msvc/poppler/poppler-config.h | 77
+ -------------------------------------------
  2 files changed, 139 deletions(-)
 
 commit d485564f0dc86f62b996380bfbd570cf3f543e4f
@@ -21636,9 +24816,9 @@ Date:	Sun Jan 24 19:22:33 2010 +0000
 
     remove files noone maintains
 
- README.windows |   63 ------------------------
- makefile.vc	|  150
- --------------------------------------------------------
+ README.windows |  63 ------------------------
+ makefile.vc	| 150
+ ---------------------------------------------------------
  2 files changed, 213 deletions(-)
 
 commit 38467f2738c88f060ae1d30332e34da743a888a5
@@ -21647,8 +24827,8 @@ Date:	Sun Jan 24 19:18:44 2010 +0000
 
     only compile glib frontend if cairo is found
 
- CMakeLists.txt      |	  4 ++--
- glib/CMakeLists.txt |	 25 +++++++------------------
+ CMakeLists.txt      |	4 ++--
+ glib/CMakeLists.txt | 25 +++++++------------------
  2 files changed, 9 insertions(+), 20 deletions(-)
 
 commit cf045acf46307d51fb6d9959451b53681e6cac03
@@ -21657,7 +24837,7 @@ Date:	Sun Jan 24 19:01:52 2010 +0000
 
     compile
 
- glib/CMakeLists.txt |	  1 +
+ glib/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0397cf4f193015286464ae70ab202ed400110e30
@@ -21666,13 +24846,13 @@ Date:	Sun Jan 24 19:00:09 2010 +0000
 
     Add and fix copyright years
 
- poppler/CairoFontEngine.cc |	 1 +
- poppler/CairoOutputDev.cc  |	 2 +-
- poppler/CairoOutputDev.h   |	 2 +-
- poppler/Gfx.cc		    |	 2 +-
- poppler/Gfx.h		    |	 2 +-
- poppler/PopplerCache.cc    |	 1 +
- poppler/PopplerCache.h     |	 1 +
+ poppler/CairoFontEngine.cc | 1 +
+ poppler/CairoOutputDev.cc  | 2 +-
+ poppler/CairoOutputDev.h   | 2 +-
+ poppler/Gfx.cc		    | 2 +-
+ poppler/Gfx.h		    | 2 +-
+ poppler/PopplerCache.cc    | 1 +
+ poppler/PopplerCache.h     | 1 +
  7 files changed, 7 insertions(+), 4 deletions(-)
 
 commit 9c9f18b6ceea546dfb21ef0aab29ba99733dcb52
@@ -21681,10 +24861,10 @@ Date:	Sun Jan 24 19:27:29 2010 +0100
 
     [glib-demo] Remove #ifdef HAVE_CAIRO macros from several demos
 
- glib/demo/images.c |	 2 --
- glib/demo/layers.c |	71
- +++-------------------------------------------------
- glib/demo/render.c |	29 ++++-----------------
+ glib/demo/images.c |  2 --
+ glib/demo/layers.c | 71
+ +++---------------------------------------------------
+ glib/demo/render.c | 29 ++++------------------
  3 files changed, 9 insertions(+), 93 deletions(-)
 
 commit 4e938c1f81add2162ced0e97b24fe588f15f178d
@@ -21695,16 +24875,16 @@ Date:	Sun Jan 24 19:15:06 2010 +0100
 
     Splash support has been removed.
 
- configure.ac		   |   74 +++++++-------
- glib/Makefile.am	   |   20 +---
- glib/poppler-document.cc  |	9 --
- glib/poppler-page.cc	   |  237
- +--------------------------------------------
- glib/poppler-page.h	   |	7 --
- glib/poppler-private.h    |   14 ---
- glib/poppler.cc	   |	6 --
- glib/test-poppler-glib.cc |	6 +-
- poppler-glib.pc.in	   |	2 +-
+ configure.ac		   |  74 ++++++++-------
+ glib/Makefile.am	   |  20 +---
+ glib/poppler-document.cc  |   9 --
+ glib/poppler-page.cc	   | 237
+ +---------------------------------------------
+ glib/poppler-page.h	   |   7 --
+ glib/poppler-private.h    |  14 ---
+ glib/poppler.cc	   |   6 --
+ glib/test-poppler-glib.cc |   6 +-
+ poppler-glib.pc.in	   |   2 +-
  9 files changed, 51 insertions(+), 324 deletions(-)
 
 commit 59ff9d66fc3b0c9612b1c12fc1ae4dbb8dc85b39
@@ -21717,8 +24897,8 @@ Date:	Sun Jan 24 17:57:48 2010 +0100
     742 of
     PDF32000_2008.pdf
 
- poppler/Gfx.cc |   19 +++++++++++++++++--
- poppler/Gfx.h	|    2 ++
+ poppler/Gfx.cc | 19 +++++++++++++++++--
+ poppler/Gfx.h	|  2 ++
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 commit 880a4a9a60a10f7aa7d3dc7c2802b31b7ef01e06
@@ -21727,9 +24907,9 @@ Date:	Sun Jan 24 17:56:35 2010 +0100
 
     Add a generic cache to store objects by its reference
 
- poppler/PopplerCache.cc |   60
- +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/PopplerCache.h  |   16 +++++++++++++
+ poppler/PopplerCache.cc | 60
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PopplerCache.h  | 16 +++++++++++++
  2 files changed, 76 insertions(+)
 
 commit 5ad492df75c0c2394719e85db4c8b43f15b52110
@@ -21738,7 +24918,7 @@ Date:	Sun Jan 24 13:34:41 2010 +0100
 
     [cairo] Fix memory leak
 
- poppler/CairoFontEngine.cc |	 1 +
+ poppler/CairoFontEngine.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3160464b4b70c714c36234320878acab81b866cc
@@ -21753,12 +24933,12 @@ Date:	Thu Nov 26 13:17:19 2009 +0100
     sizes written by Jeff Muizelaar.
     Fixes bug #5589.
 
- poppler/CairoOutputDev.cc  |	89 +++++++++++
- poppler/CairoOutputDev.h   |	 1 +
- poppler/CairoRescaleBox.cc |  352
- ++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoRescaleBox.h  |	12 ++
- poppler/Makefile.am	    |	 4 +-
+ poppler/CairoOutputDev.cc  |  89 ++++++++++++
+ poppler/CairoOutputDev.h   |	1 +
+ poppler/CairoRescaleBox.cc | 352
+ +++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoRescaleBox.h  |  12 ++
+ poppler/Makefile.am	    |	4 +-
  5 files changed, 457 insertions(+), 1 deletion(-)
 
 commit 6825a219f0bc0ac6fd469fb8a6ebb86df774375f
@@ -21768,7 +24948,7 @@ Date:	Sat Jan 23 11:24:15 2010 +0100
     [glib] Use TextOutputDev to get TextPage when we haven't rendered
     the page
 
- glib/poppler-page.cc |   27 ++++++++++++++++++---------
+ glib/poppler-page.cc | 27 ++++++++++++++++++---------
  1 file changed, 18 insertions(+), 9 deletions(-)
 
 commit 6c61a457e9a8ec10945bc1e0700c8e4d121faa58
@@ -21779,7 +24959,7 @@ Date:	Wed Jan 20 21:59:05 2010 +0000
 
     Fixes crash in KDE bug 223359
 
- poppler/GfxState.cc |	  4 ++--
+ poppler/GfxState.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 442894d371879a6bf2adb5a39b9dd0a49e76e4ac
@@ -21790,7 +24970,7 @@ Date:	Fri Jan 15 21:28:42 2010 +0100
 
     followup of b64d4bd46b052feb0b143f1348773afbd93e5e33
 
- glib/demo/CMakeLists.txt |    1 +
+ glib/demo/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit b64d4bd46b052feb0b143f1348773afbd93e5e33
@@ -21799,11 +24979,11 @@ Date:	Fri Nov 27 11:47:22 2009 +0100
 
     [glib-demo] Add print demo
 
- glib/demo/Makefile.am |    2 +
- glib/demo/main.c      |    4 +-
- glib/demo/print.c     |  135
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/print.h     |   31 ++++++++++++
+ glib/demo/Makefile.am |   2 +
+ glib/demo/main.c      |   4 +-
+ glib/demo/print.c     | 135
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/print.h     |  31 ++++++++++++
  4 files changed, 171 insertions(+), 1 deletion(-)
 
 commit ba2c746f358a5785d8cbaaf03d8628ee3754c388
@@ -21812,7 +24992,7 @@ Date:	Fri Nov 27 09:52:50 2009 +0100
 
     [glib-demo] Add render for printing option to render demo
 
- glib/demo/render.c |	47 ++++++++++++++++++++++++++++++++++++++---------
+ glib/demo/render.c | 47 ++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 38 insertions(+), 9 deletions(-)
 
 commit 9a478008ccb61641f09bd77eaa55033cca266c43
@@ -21824,7 +25004,7 @@ Date:	Fri Jan 15 12:03:11 2010 +0100
     They are used in a header file (GlobalParams.h). It fixes a crash
     when opening any document.
 
- poppler/poppler-config.h.in |	 10 ++++++++++
+ poppler/poppler-config.h.in | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 1f80f874d8e132411816302465f04bc59d404d89
@@ -21835,7 +25015,7 @@ Date:	Thu Jan 14 08:43:11 2010 +0000
 
     Bug 26034
 
- poppler/PageTransition.cc |	5 +++--
+ poppler/PageTransition.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 350ff407e06a961f2a5b9d203cb8e78ce09313a0
@@ -21844,9 +25024,9 @@ Date:	Wed Jan 13 22:20:41 2010 +0000
 
     Make poppler (optionally) relocatable on Windows
 
- configure.ac		 |   26 +++++++++++++++++++++
- poppler/GlobalParams.cc |   57
- +++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac		 | 26 ++++++++++++++++++++++
+ poppler/GlobalParams.cc | 57
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 83 insertions(+)
 
 commit 36b67b002db802bfad553720e2114b76b07bb614
@@ -21855,13 +25035,13 @@ Date:	Wed Jan 13 22:17:03 2010 +0000
 
     Make fontconfig optional with mingw compiler
 
- CMakeLists.txt		    |	 8 +++++++-
- config.h.cmake		    |	 6 ++++++
- configure.ac		    |	39 ++++++++++++++++++++++++++++++++++++++-
- makefile.vc		    |	 2 +-
- poppler/GlobalParams.cc    |	10 +++++++---
- poppler/GlobalParams.h     |	 7 ++++---
- poppler/GlobalParamsWin.cc |	 5 +++++
+ CMakeLists.txt		    |  8 +++++++-
+ config.h.cmake		    |  6 ++++++
+ configure.ac		    | 39 ++++++++++++++++++++++++++++++++++++++-
+ makefile.vc		    |  2 +-
+ poppler/GlobalParams.cc    | 10 +++++++---
+ poppler/GlobalParams.h     |  7 ++++---
+ poppler/GlobalParamsWin.cc |  5 +++++
  7 files changed, 68 insertions(+), 9 deletions(-)
 
 commit 9c0b20ab8c104c2f5398a5a3b8409ca554f5fa39
@@ -21874,11 +25054,11 @@ Date:	Tue Jan 12 22:55:06 2010 +0000
     Based on a patch by Marius Vollmer marius.vollmer@nokia.com
     See bug 25578 for more info
 
- CMakeLists.txt       |    7 ++++++-
- config.h.cmake       |    5 ++++-
- configure.ac	      |   10 +++++++++-
- splash/SplashMath.h  |   14 ++++++++++++--
- splash/SplashTypes.h |    4 +++-
+ CMakeLists.txt       |  7 ++++++-
+ config.h.cmake       |  5 ++++-
+ configure.ac	      | 10 +++++++++-
+ splash/SplashMath.h  | 14 ++++++++++++--
+ splash/SplashTypes.h |  4 +++-
  5 files changed, 34 insertions(+), 6 deletions(-)
 
 commit 30e5f76e372114339fa1d37c335e6bbade8b6d8a
@@ -21890,7 +25070,7 @@ Date:	Thu Jan 7 11:18:36 2010 +0100
     - glib to 2.18, see ce9404b1999f81b3f9e5a89bcd6e715463f89024
     - gtk+ to 2.14, see e338643f2cebb1203f7ff0646f87b3dea8318757
 
- cmake/modules/FindGTK.cmake |	  6 +++---
+ cmake/modules/FindGTK.cmake | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit e338643f2cebb1203f7ff0646f87b3dea8318757
@@ -21901,7 +25081,7 @@ Date:	Thu Jan 7 11:08:31 2010 +0100
 
     Fixes bug #22090.
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ce9404b1999f81b3f9e5a89bcd6e715463f89024
@@ -21910,7 +25090,7 @@ Date:	Thu Jan 7 11:06:19 2010 +0100
 
     Bump glib requirements to 2.18
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 526c8871cbdfbc119e013ee96887a79f65403790
@@ -21921,7 +25101,7 @@ Date:	Thu Dec 31 17:52:33 2009 +0100
 
     Fixes bug #25032
 
- glib/poppler-document.cc |   22 +++++++++++++++++++---
+ glib/poppler-document.cc | 22 +++++++++++++++++++---
  1 file changed, 19 insertions(+), 3 deletions(-)
 
 commit e0c8188136958b853269179079efefdd3488dc22
@@ -21932,8 +25112,8 @@ Date:	Mon Jan 4 18:36:01 2010 +0000
 
     This updates the requirement to real requirement
 
- CMakeLists.txt |    2 +-
- configure.ac	|    8 ++++----
+ CMakeLists.txt | 2 +-
+ configure.ac	| 8 ++++----
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit f9accdb878b23ebd2152dd05d61cfcc71d46cd03
@@ -21942,10 +25122,10 @@ Date:	Mon Jan 4 14:13:13 2010 +0100
 
     [Qt4/tests] use getPdfVersion() instead of the deprecated pdfVersion()
 
- qt4/tests/stress-poppler-dir.cpp |    3 ++-
- qt4/tests/stress-poppler-qt4.cpp |    3 ++-
- qt4/tests/test-password-qt4.cpp  |    4 +++-
- qt4/tests/test-poppler-qt4.cpp   |    4 +++-
+ qt4/tests/stress-poppler-dir.cpp | 3 ++-
+ qt4/tests/stress-poppler-qt4.cpp | 3 ++-
+ qt4/tests/test-password-qt4.cpp  | 4 +++-
+ qt4/tests/test-poppler-qt4.cpp   | 4 +++-
  4 files changed, 10 insertions(+), 4 deletions(-)
 
 commit 898e939d8c0ac74cc7ee3f5d42d83083ed31036e
@@ -21954,15 +25134,15 @@ Date:	Sat Jan 2 02:33:58 2010 +0100
 
     Make pdftoppm embed correct resolution in PNG and JPEG files
 
- goo/ImgWriter.h	|    3 ++-
- goo/JpegWriter.cc	|    6 +++++-
- goo/JpegWriter.h	|    3 ++-
- goo/PNGWriter.cc	|    6 +++++-
- goo/PNGWriter.h	|    3 ++-
- splash/SplashBitmap.cc |    9 +++++----
- splash/SplashBitmap.h	|    5 +++--
- utils/HtmlOutputDev.cc |    4 +++-
- utils/pdftoppm.cc	|    9 +++++----
+ goo/ImgWriter.h	| 3 ++-
+ goo/JpegWriter.cc	| 6 +++++-
+ goo/JpegWriter.h	| 3 ++-
+ goo/PNGWriter.cc	| 6 +++++-
+ goo/PNGWriter.h	| 3 ++-
+ splash/SplashBitmap.cc | 9 +++++----
+ splash/SplashBitmap.h	| 5 +++--
+ utils/HtmlOutputDev.cc | 4 +++-
+ utils/pdftoppm.cc	| 9 +++++----
  9 files changed, 32 insertions(+), 16 deletions(-)
 
 commit df569dc2fb89d7e0780bbf7a687ce2464ff5cb43
@@ -21971,7 +25151,7 @@ Date:	Sat Jan 2 01:19:50 2010 +0100
 
     enable AM_SILENT_RULES by default
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f3862f7d987aae52a1fd2bb0af27d1cd803a5b84
@@ -21980,7 +25160,7 @@ Date:	Thu Dec 31 00:20:11 2009 +0100
 
     [cpp/tests] poppler-dump: show a string for the font type
 
- cpp/tests/poppler-dump.cpp |	23 ++++++++++++++++++++++-
+ cpp/tests/poppler-dump.cpp | 23 ++++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 commit 9c343c821593ebae51ac47b58ad007a82f198652
@@ -21989,7 +25169,7 @@ Date:	Thu Dec 31 00:13:09 2009 +0100
 
     [cpp/tests] poppler-dump: show the orientation of the pages
 
- cpp/tests/poppler-dump.cpp |	16 ++++++++++++++++
+ cpp/tests/poppler-dump.cpp | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
 commit bc91fe3824f37cd17a38aac85c817e8ada1b2f43
@@ -21998,7 +25178,7 @@ Date:	Wed Dec 30 23:53:31 2009 +0100
 
     [cpp/tests] poppler-dump: a bit less output in permissions lines
 
- cpp/tests/poppler-dump.cpp |	 2 +-
+ cpp/tests/poppler-dump.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1199de8f097a78edb831313841ac0ed3f9ec9905
@@ -22007,7 +25187,7 @@ Date:	Wed Dec 30 23:50:36 2009 +0100
 
     [cpp/tests] poppler-dump: add --show-all to show all the information
 
- cpp/tests/poppler-dump.cpp |	13 +++++++++++++
+ cpp/tests/poppler-dump.cpp | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit 9522f830b59942adfc91d5f03c274415a4737ccc
@@ -22016,8 +25196,8 @@ Date:	Wed Dec 30 23:38:40 2009 +0100
 
     [cpp] use iconv for the utf8 <-> utf16 conversions
 
- cpp/poppler-global.cpp |   92
- +++++++++++++++++++++++++++++++++---------------
+ cpp/poppler-global.cpp | 92
+ +++++++++++++++++++++++++++++++++++---------------
  1 file changed, 64 insertions(+), 28 deletions(-)
 
 commit b156b4031f5daf658f40db8efa2a3016d95b98b5
@@ -22026,15 +25206,15 @@ Date:	Wed Dec 30 23:24:23 2009 +0100
 
     [cpp] add the build system stuff for iconv, mandatory for cpp
 
- CMakeLists.txt		       |    6 ++
- Makefile.am		       |    1 +
- cmake/modules/FindIconv.cmake |   57 +++++++++++++
- config.h.cmake		       |    6 ++
- configure.ac		       |    6 ++
- cpp/CMakeLists.txt	       |    2 +-
- cpp/Makefile.am	       |    3 +-
- m4/iconv.m4		       |  180
- +++++++++++++++++++++++++++++++++++++++++
+ CMakeLists.txt		       |   6 ++
+ Makefile.am		       |   1 +
+ cmake/modules/FindIconv.cmake |  57 +++++++++++++
+ config.h.cmake		       |   6 ++
+ configure.ac		       |   6 ++
+ cpp/CMakeLists.txt	       |   2 +-
+ cpp/Makefile.am	       |   3 +-
+ m4/iconv.m4		       | 180
+ ++++++++++++++++++++++++++++++++++++++++++
  8 files changed, 259 insertions(+), 2 deletions(-)
 
 commit a0cffb8b69e0595a2afe15ecc4928e0df1eeb063
@@ -22045,8 +25225,7 @@ Date:	Wed Dec 30 18:57:09 2009 +0100
 
     better make them use the "hand-made" code, it is more correct for them
 
- cpp/poppler-private.cpp |   44
- +++++++++++++++++++++++++++++++++++++++++---
+ cpp/poppler-private.cpp | 44 +++++++++++++++++++++++++++++++++++++++++---
  1 file changed, 41 insertions(+), 3 deletions(-)
 
 commit 3b6e3605209d5db453725b9ce4e6e54679d9c5da
@@ -22057,8 +25236,8 @@ Date:	Sun Dec 27 15:30:22 2009 +0100
 
     Fixes bug 25763 and gave no regression on my test suite
 
- poppler/GfxState.cc	    |	21 ---------------------
- poppler/SplashOutputDev.cc |	15 +++++++++++++++
+ poppler/GfxState.cc	    | 21 ---------------------
+ poppler/SplashOutputDev.cc | 15 +++++++++++++++
  2 files changed, 15 insertions(+), 21 deletions(-)
 
 commit ea44c60645001ffea7d297f8549aaa4f5ce5e16c
@@ -22071,7 +25250,7 @@ Date:	Sun Dec 27 15:27:00 2009 +0100
     do its job
     instead of returning a NULL stream
 
- poppler/Parser.cc |	3 ++-
+ poppler/Parser.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 283dd326a00c804b6332ee3ca1aaa0d86377b3f3
@@ -22081,7 +25260,7 @@ Date:	Sat Dec 19 12:50:10 2009 +0100
     [cpp] fix installation of poppler-version.h with autotools and
     builddir != srcdir
 
- cpp/Makefile.am |    2 +-
+ cpp/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit df0ccddb7f784b4a8564beda51b3047cb9e3611a
@@ -22091,7 +25270,7 @@ Date:	Fri Dec 18 20:23:48 2009 +0000
     move the retrieval of the bitmap after rendering the page as it can
     change on render time
 
- utils/pdftoppm.cc |	6 ++++--
+ utils/pdftoppm.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit ab88a02f7efefc950a316d7a5edf88dad8f3e4d0
@@ -22103,7 +25282,7 @@ Date:	Thu Dec 17 18:24:20 2009 +0100
     Show an error message and mark annotation as invalid when it's
     missing.
 
- poppler/Annot.cc |    2 ++
+ poppler/Annot.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 39dc99431b3ea9e00f6f645dd7169c0319571dc9
@@ -22115,9 +25294,9 @@ Date:	Thu Dec 17 18:17:20 2009 +0100
 
     See bug #23108.
 
- poppler/Annot.cc |  112
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 +
+ poppler/Annot.cc | 112
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |   2 +
  2 files changed, 114 insertions(+)
 
 commit e4f5a78a853b88b1586ef59fc8893a321ea23736
@@ -22128,8 +25307,8 @@ Date:	Thu Dec 17 17:39:39 2009 +0100
 
     See bug #23108.
 
- poppler/Annot.cc |   70
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.cc | 70
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 70 insertions(+)
 
 commit 752b14857cfb0669fd6d7dfef2ea73c13a2369fc
@@ -22138,7 +25317,7 @@ Date:	Thu Dec 17 17:16:01 2009 +0100
 
     simplify
 
- cpp/poppler-toc.cpp |	  2 +-
+ cpp/poppler-toc.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a26e4b7903fabc667d7d16c23ca2c7a535dd05fa
@@ -22153,14 +25332,14 @@ Date:	Thu Dec 17 17:09:35 2009 +0100
 
     also add the necessary autotools+cmake machinery to compile it
 
- configure.ac		    |	 1 +
- cpp/CMakeLists.txt	    |	 2 +
- cpp/Makefile.am	    |	 1 +
- cpp/tests/.gitignore	    |	 1 +
- cpp/tests/CMakeLists.txt   |	24 ++++
- cpp/tests/Makefile.am	    |	17 +++
- cpp/tests/poppler-dump.cpp |  293
- ++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac		    |	1 +
+ cpp/CMakeLists.txt	    |	2 +
+ cpp/Makefile.am	    |	1 +
+ cpp/tests/.gitignore	    |	1 +
+ cpp/tests/CMakeLists.txt   |  24 ++++
+ cpp/tests/Makefile.am	    |  17 +++
+ cpp/tests/poppler-dump.cpp | 293
+ +++++++++++++++++++++++++++++++++++++++++++++
  7 files changed, 339 insertions(+)
 
 commit 86c871cc625d00b8ee7f93dc8c0f9ef8462bba5a
@@ -22177,9 +25356,9 @@ Date:	Thu Dec 17 17:05:45 2009 +0100
     Rosenthol recommended us to do the same.
     See bug #23108.
 
- poppler/Annot.cc |  199
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 +
+ poppler/Annot.cc | 199
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |   2 +
  2 files changed, 201 insertions(+)
 
 commit 904ecd929c6acbbad6d782b950c53c0a80e1f39c
@@ -22188,7 +25367,7 @@ Date:	Thu Dec 17 12:49:20 2009 +0100
 
     [annots] Fix memory leaks
 
- poppler/Annot.cc |    6 +++++-
+ poppler/Annot.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit ef7954b86f9b1a762c4f77a48d5f42f8db4bbed7
@@ -22197,7 +25376,7 @@ Date:	Tue Dec 15 02:20:18 2009 +0100
 
     [cpp] use the correct index (instead of an uninitialized variable)
 
- cpp/poppler-page.cpp |    2 +-
+ cpp/poppler-page.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2547b5e53e7799cf7299838ae9bd882c21a228ae
@@ -22206,7 +25385,7 @@ Date:	Tue Dec 15 02:14:57 2009 +0100
 
     [cpp] properly delete the children of a toc item
 
- cpp/poppler-toc.cpp |	  1 +
+ cpp/poppler-toc.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit 771bd3594740fe16bd030dbe73928a8b1d4d113f
@@ -22215,7 +25394,7 @@ Date:	Tue Dec 15 02:04:24 2009 +0100
 
     [cpp] actually implement toc::root()
 
- cpp/poppler-toc.cpp |	  5 +++++
+ cpp/poppler-toc.cpp | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit ca1d2ec4588b2437b58b4448ae2fc5ebd0f130d3
@@ -22224,8 +25403,8 @@ Date:	Tue Dec 15 00:54:29 2009 +0100
 
     [cpp] fix the reference to the vector data
 
- cpp/poppler-global.cpp  |    2 +-
- cpp/poppler-private.cpp |    2 +-
+ cpp/poppler-global.cpp  | 2 +-
+ cpp/poppler-private.cpp | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 16c946e7658b0e9cff701ce1d6bbf7d3828cbe08
@@ -22234,7 +25413,7 @@ Date:	Tue Dec 15 00:35:25 2009 +0100
 
     [cpp] fix the reference to the vector data
 
- cpp/poppler-document.cpp |    2 +-
+ cpp/poppler-document.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9bb90c99b65e0e9d9b65c7dbeb5b4d66377ceb21
@@ -22243,7 +25422,7 @@ Date:	Mon Dec 14 23:43:12 2009 +0100
 
     [cpp] add destructor for 'rectangle'
 
- cpp/poppler-rectangle.h |    3 ++-
+ cpp/poppler-rectangle.h | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 61ccdc9ab3b816174896fcae0899ff34f11eee80
@@ -22252,10 +25431,10 @@ Date:	Mon Dec 14 23:40:51 2009 +0100
 
     [cpp] add out stream operators for rect and rectf
 
- cpp/CMakeLists.txt	   |	1 +
- cpp/Makefile.am	   |	1 +
- cpp/poppler-rectangle.cpp |   35 +++++++++++++++++++++++++++++++++++
- cpp/poppler-rectangle.h   |	5 +++++
+ cpp/CMakeLists.txt	   |  1 +
+ cpp/Makefile.am	   |  1 +
+ cpp/poppler-rectangle.cpp | 35 +++++++++++++++++++++++++++++++++++
+ cpp/poppler-rectangle.h   |  5 +++++
  4 files changed, 42 insertions(+)
 
 commit 69dd51fed3de41f8b799b811ae5ee59c0d5f59c2
@@ -22264,8 +25443,8 @@ Date:	Mon Dec 14 22:24:07 2009 +0100
 
     [cpp] add namespace to namespace functiond to link properly
 
- cpp/poppler-global.cpp  |    4 ++--
- cpp/poppler-version.cpp |    8 ++++----
+ cpp/poppler-global.cpp  | 4 ++--
+ cpp/poppler-version.cpp | 8 ++++----
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 3923fa4890984d8616d86016f4f4a94e8ef3e992
@@ -22275,7 +25454,7 @@ Date:	Mon Dec 14 22:23:15 2009 +0100
     [cpp] add default empty parameters for the passwords of the document
     loading functions
 
- cpp/poppler-document.h |    8 ++++----
+ cpp/poppler-document.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 1d23cc677e9b0a9f61c53e0ea365537f33abe5bf
@@ -22284,8 +25463,8 @@ Date:	Mon Dec 14 21:44:56 2009 +0100
 
     [cpp] add "human friendly" output representation for byte_array
 
- cpp/poppler-global.cpp |   23 +++++++++++++++++++++++
- cpp/poppler-global.h	|    3 +++
+ cpp/poppler-global.cpp | 23 +++++++++++++++++++++++
+ cpp/poppler-global.h	|  3 +++
  2 files changed, 26 insertions(+)
 
 commit 82954ea5f8ba880276328765f104690a05adbd9e
@@ -22297,9 +25476,9 @@ Date:	Mon Dec 7 12:05:54 2009 +0100
 
     See bug #23108.
 
- poppler/Annot.cc |   94
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 ++
+ poppler/Annot.cc | 94
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  2 ++
  2 files changed, 96 insertions(+)
 
 commit c6195472326c183fcfd8a3e9da1ee7f6fa8b7c3d
@@ -22326,9 +25505,9 @@ Date:	Sun Dec 6 17:09:23 2009 +0100
     this entry
     is implementation-dependent as well."
 
- poppler/Annot.cc |   21 +++++++++++++++------
- poppler/Gfx.cc   |    9 ++++++++-
- poppler/Gfx.h	  |    2 +-
+ poppler/Annot.cc | 21 +++++++++++++++------
+ poppler/Gfx.cc   |  9 ++++++++-
+ poppler/Gfx.h	  |  2 +-
  3 files changed, 24 insertions(+), 8 deletions(-)
 
 commit a337c1d757d52c1c238229d2f0cd3a41694b0e08
@@ -22337,8 +25516,8 @@ Date:	Mon Dec 14 16:18:22 2009 +0100
 
     [cpp] add document metadata reading
 
- cpp/poppler-document.cpp |    9 +++++++++
- cpp/poppler-document.h   |    1 +
+ cpp/poppler-document.cpp | 9 +++++++++
+ cpp/poppler-document.h   | 1 +
  2 files changed, 10 insertions(+)
 
 commit 6c4fa513e60dbdd5ab693434f239d82d95756994
@@ -22350,9 +25529,9 @@ Date:	Sun Dec 6 16:56:22 2009 +0100
 
     See bug #23108.
 
- poppler/Annot.cc |  120
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 +
+ poppler/Annot.cc | 120
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |   2 +
  2 files changed, 122 insertions(+)
 
 commit eed94b8bd2855dce1fd39b835e3280cbd0ccd1cf
@@ -22363,9 +25542,9 @@ Date:	Sun Dec 6 16:51:37 2009 +0100
 
     See bug #23108.
 
- poppler/Annot.cc |   62
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 ++
+ poppler/Annot.cc | 62
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  2 ++
  2 files changed, 64 insertions(+)
 
 commit 1c7a5f5e89c4c51e31b6de345d4862ef8dcc2bc0
@@ -22377,9 +25556,9 @@ Date:	Sun Dec 6 16:40:14 2009 +0100
     Streams have been created by using the svg icons created by mac_v and
     ulisse. See bug #23108.
 
- poppler/Annot.cc |  305
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    2 +
+ poppler/Annot.cc | 305
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |   2 +
  2 files changed, 307 insertions(+)
 
 commit c9cb6353ad5279d09615eb2c944b2b053cdf5ccc
@@ -22388,9 +25567,9 @@ Date:	Mon Dec 14 15:52:25 2009 +0100
 
     [cpp] add function to query for document "permissions"
 
- cpp/poppler-document.cpp |   23 +++++++++++++++++++++++
- cpp/poppler-document.h   |    1 +
- cpp/poppler-global.h	  |    4 ++++
+ cpp/poppler-document.cpp | 23 +++++++++++++++++++++++
+ cpp/poppler-document.h   |  1 +
+ cpp/poppler-global.h	  |  4 ++++
  3 files changed, 28 insertions(+)
 
 commit 30e90c7c1b41c62ddc21905e7ccdea4c95547e80
@@ -22399,8 +25578,8 @@ Date:	Mon Dec 14 15:33:36 2009 +0100
 
     [cpp] add is_encrypted and is_linearized for document
 
- cpp/poppler-document.cpp |   10 ++++++++++
- cpp/poppler-document.h   |    2 ++
+ cpp/poppler-document.cpp | 10 ++++++++++
+ cpp/poppler-document.h   |  2 ++
  2 files changed, 12 insertions(+)
 
 commit 93fd588c519958a1f66231c111ea8a6b0a759be1
@@ -22409,9 +25588,9 @@ Date:	Mon Dec 14 13:19:24 2009 +0100
 
     [cpp] add the possibility to load a document from raw data
 
- cpp/poppler-document-private.h |    5 +++++
- cpp/poppler-document.cpp	|   35 ++++++++++++++++++++++++++++++++++-
- cpp/poppler-document.h		|    3 +++
+ cpp/poppler-document-private.h |  5 +++++
+ cpp/poppler-document.cpp	| 35 ++++++++++++++++++++++++++++++++++-
+ cpp/poppler-document.h		|  3 +++
  3 files changed, 42 insertions(+), 1 deletion(-)
 
 commit 53996365b159cf84adf2cac56c76b8bda8dfb12e
@@ -22420,8 +25599,8 @@ Date:	Mon Dec 14 12:57:41 2009 +0100
 
     [cpp] use the byte_array typedef
 
- cpp/poppler-embedded-file.cpp |    6 +++---
- cpp/poppler-embedded-file.h   |    2 +-
+ cpp/poppler-embedded-file.cpp | 6 +++---
+ cpp/poppler-embedded-file.h   | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit e4969c1aaed4a8eb770d8b54920f2476129bbcb7
@@ -22433,9 +25612,9 @@ Date:	Sun Dec 6 16:19:36 2009 +0100
     Removes duplicated code since color arrays are already parsed in
     AnnotColor
 
- poppler/Annot.cc |  136
- ++++++++++++++++++++++++++++--------------------------
- poppler/Annot.h  |    4 +-
+ poppler/Annot.cc | 136
+ +++++++++++++++++++++++++++++--------------------------
+ poppler/Annot.h  |   4 +-
  2 files changed, 73 insertions(+), 67 deletions(-)
 
 commit cfb4f5dfabf31de22d68aa0d5796cb7a33d8b462
@@ -22444,9 +25623,9 @@ Date:	Mon Dec 14 11:06:36 2009 +0100
 
     [cpp] add a byte_array typedef, and use it for utf8 string data
 
- cpp/poppler-global.cpp  |   12 +++---------
- cpp/poppler-global.h	 |    5 ++++-
- cpp/poppler-private.cpp |    5 ++---
+ cpp/poppler-global.cpp  | 12 +++---------
+ cpp/poppler-global.h	 |  5 ++++-
+ cpp/poppler-private.cpp |  5 ++---
  3 files changed, 9 insertions(+), 13 deletions(-)
 
 commit 2d13ac31671b2007e44a90f45a82cb3adfa9c80c
@@ -22455,8 +25634,8 @@ Date:	Mon Dec 14 02:30:06 2009 +0100
 
     update ignore files
 
- .gitignore	|    1 +
- cpp/.gitignore |    1 +
+ .gitignore	| 1 +
+ cpp/.gitignore | 1 +
  2 files changed, 2 insertions(+)
 
 commit 01e902e40ca15acf0319e37d39a271d6875bfce9
@@ -22471,11 +25650,11 @@ Date:	Mon Dec 14 02:02:47 2009 +0100
     poppler-config.h is generated by the build system (autotools or cmake)
     with the correct version information
 
- configure.ac		  |    2 ++
- cpp/CMakeLists.txt	  |    5 +++++
- cpp/Makefile.am	  |    6 ++++--
- cpp/poppler-version.cpp  |   41 +++++++++++++++++++++++++++++++++++++++++
- cpp/poppler-version.h.in |   39 +++++++++++++++++++++++++++++++++++++++
+ configure.ac		  |  2 ++
+ cpp/CMakeLists.txt	  |  5 +++++
+ cpp/Makefile.am	  |  6 ++++--
+ cpp/poppler-version.cpp  | 41 +++++++++++++++++++++++++++++++++++++++++
+ cpp/poppler-version.h.in | 39 +++++++++++++++++++++++++++++++++++++++
  5 files changed, 91 insertions(+), 2 deletions(-)
 
 commit b3f5e5d60bc9109da961940f6216722f9db4a87b
@@ -22485,8 +25664,8 @@ Date:	Mon Dec 14 00:56:15 2009 +0100
     [CMake] add the configure check for the Cairo blend modes support
     (as in autotools)
 
- cmake/modules/FindCairo.cmake |   18 ++++++++++++++++++
- config.h.cmake		       |    3 +++
+ cmake/modules/FindCairo.cmake | 18 ++++++++++++++++++
+ config.h.cmake		       |  3 +++
  2 files changed, 21 insertions(+)
 
 commit f6ba877e0c22538cfe34d32d69814f660de59d2c
@@ -22495,8 +25674,8 @@ Date:	Mon Dec 14 00:44:55 2009 +0100
 
     [CMake] add configure check for sys/mman.h (as in autotools)
 
- ConfigureChecks.cmake |    1 +
- config.h.cmake        |    3 +++
+ ConfigureChecks.cmake | 1 +
+ config.h.cmake        | 3 +++
  2 files changed, 4 insertions(+)
 
 commit e12801320ae030628fc62c073983c06b39ee13d7
@@ -22505,7 +25684,7 @@ Date:	Mon Dec 14 00:42:20 2009 +0100
 
     minor spello
 
- config.h.cmake |    2 +-
+ config.h.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6428907ebcf33d4391673aadcfa71c3061f6d352
@@ -22514,8 +25693,8 @@ Date:	Mon Dec 14 00:41:49 2009 +0100
 
     [CMake] add configure check for fcntl.h (as in autotools)
 
- ConfigureChecks.cmake |    1 +
- config.h.cmake        |    3 +++
+ ConfigureChecks.cmake | 1 +
+ config.h.cmake        | 3 +++
  2 files changed, 4 insertions(+)
 
 commit 916ab7163249e23bd5ba00922fdcad9caaf92c75
@@ -22524,7 +25703,7 @@ Date:	Mon Dec 14 00:34:59 2009 +0100
 
     [CMake] oops, those should have been '#cmakedefine' and not '#define'
 
- config.h.cmake |    4 ++--
+ config.h.cmake | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ea655d8c7e24e97ee710110a783ed9c209cf76e3
@@ -22533,7 +25712,7 @@ Date:	Mon Dec 14 00:33:51 2009 +0100
 
     [CMake] move and rename to match more the autotools output
 
- config.h.cmake |   21 ++++++++++++++-------
+ config.h.cmake | 21 ++++++++++++++-------
  1 file changed, 14 insertions(+), 7 deletions(-)
 
 commit 9f0146c5b2f9326e834104b89791f66b18f85adc
@@ -22542,8 +25721,8 @@ Date:	Mon Dec 14 00:28:04 2009 +0100
 
     [CMake] add checks for gmtime_r and localtime_r
 
- ConfigureChecks.cmake |    2 ++
- config.h.cmake        |    6 ++++++
+ ConfigureChecks.cmake | 2 ++
+ config.h.cmake        | 6 ++++++
  2 files changed, 8 insertions(+)
 
 commit 9d0cf201e96044dd679c26bea6255d986a6cd246
@@ -22552,7 +25731,7 @@ Date:	Sun Dec 13 23:45:39 2009 +0100
 
     [cpp] add ignore file
 
- cpp/.gitignore |    6 ++++++
+ cpp/.gitignore | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit d783e92b863d8b22de6ca326328115fec63193ed
@@ -22561,7 +25740,7 @@ Date:	Sun Dec 13 23:42:33 2009 +0100
 
     [cpp] don't forget the cmake stuff when packing with the autotools
 
- Makefile.am |	  2 ++
+ Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 0105caefe860e7a45fc7d3a1bd1162fe56bcfe6a
@@ -22570,11 +25749,11 @@ Date:	Sun Dec 13 23:40:55 2009 +0100
 
     [cpp] add the pkg-config stuff
 
- CMakeLists.txt       |    3 +++
- Makefile.am	      |    7 +++++--
- configure.ac	      |    3 ++-
- poppler-cpp.pc.cmake |    9 +++++++++
- poppler-cpp.pc.in    |    9 +++++++++
+ CMakeLists.txt       | 3 +++
+ Makefile.am	      | 7 +++++--
+ configure.ac	      | 3 ++-
+ poppler-cpp.pc.cmake | 9 +++++++++
+ poppler-cpp.pc.in    | 9 +++++++++
  5 files changed, 28 insertions(+), 3 deletions(-)
 
 commit d5a74f78df0dca24fd537b30424fd2ebb3efe3e2
@@ -22583,7 +25762,7 @@ Date:	Sun Dec 13 23:35:06 2009 +0100
 
     [cpp] add the (rest of the) CMake build system for it
 
- CMakeLists.txt |    5 +++++
+ CMakeLists.txt | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 0e41f937946e4e4c1b660406bd74e4afe8825b5f
@@ -22592,9 +25771,9 @@ Date:	Sun Dec 13 23:31:46 2009 +0100
 
     [cpp] add the autotools buildsystem for it
 
- Makefile.am	 |    6 +++++-
- configure.ac	 |   15 +++++++++++++++
- cpp/Makefile.am |   32 ++++++++++++++++++++++++++++++++
+ Makefile.am	 |  6 +++++-
+ configure.ac	 | 15 +++++++++++++++
+ cpp/Makefile.am | 32 ++++++++++++++++++++++++++++++++
  3 files changed, 52 insertions(+), 1 deletion(-)
 
 commit 9727fdc0c682742335e44ddc2f32d60e4c59983a
@@ -22617,29 +25796,29 @@ Date:	Sun Dec 13 22:55:28 2009 +0100
     Most probably it has bugs, but nevertheless worth testing and
     developing.
 
- cpp/CMakeLists.txt		     |	 34 ++++
- cpp/poppler-document-private.h      |	 55 ++++++
- cpp/poppler-document.cpp	     |	316
- +++++++++++++++++++++++++++++++++++
- cpp/poppler-document.h		     |	 92 ++++++++++
- cpp/poppler-embedded-file-private.h |	 40 +++++
- cpp/poppler-embedded-file.cpp	     |	116 +++++++++++++
- cpp/poppler-embedded-file.h	     |	 55 ++++++
- cpp/poppler-font.cpp		     |	166 ++++++++++++++++++
- cpp/poppler-font.h		     |	 91 ++++++++++
- cpp/poppler-global.cpp		     |	162 ++++++++++++++++++
- cpp/poppler-global.h		     |	 86 ++++++++++
- cpp/poppler-page-private.h	     |	 44 +++++
- cpp/poppler-page-transition.cpp     |	 95 +++++++++++
- cpp/poppler-page-transition.h	     |	 82 +++++++++
- cpp/poppler-page.cpp		     |	121 ++++++++++++++
- cpp/poppler-page.h		     |	 62 +++++++
- cpp/poppler-private.cpp	     |	 70 ++++++++
- cpp/poppler-private.h		     |	 66 ++++++++
- cpp/poppler-rectangle.h	     |	 60 +++++++
- cpp/poppler-toc-private.h	     |	 62 +++++++
- cpp/poppler-toc.cpp		     |	136 +++++++++++++++
- cpp/poppler-toc.h		     |	 74 ++++++++
+ cpp/CMakeLists.txt		     |	34 ++++
+ cpp/poppler-document-private.h      |	55 +++++++
+ cpp/poppler-document.cpp	     | 316
+ ++++++++++++++++++++++++++++++++++++
+ cpp/poppler-document.h		     |	92 +++++++++++
+ cpp/poppler-embedded-file-private.h |	40 +++++
+ cpp/poppler-embedded-file.cpp	     | 116 +++++++++++++
+ cpp/poppler-embedded-file.h	     |	55 +++++++
+ cpp/poppler-font.cpp		     | 166 +++++++++++++++++++
+ cpp/poppler-font.h		     |	91 +++++++++++
+ cpp/poppler-global.cpp		     | 162 ++++++++++++++++++
+ cpp/poppler-global.h		     |	86 ++++++++++
+ cpp/poppler-page-private.h	     |	44 +++++
+ cpp/poppler-page-transition.cpp     |	95 +++++++++++
+ cpp/poppler-page-transition.h	     |	82 ++++++++++
+ cpp/poppler-page.cpp		     | 121 ++++++++++++++
+ cpp/poppler-page.h		     |	62 +++++++
+ cpp/poppler-private.cpp	     |	70 ++++++++
+ cpp/poppler-private.h		     |	66 ++++++++
+ cpp/poppler-rectangle.h	     |	60 +++++++
+ cpp/poppler-toc-private.h	     |	62 +++++++
+ cpp/poppler-toc.cpp		     | 136 ++++++++++++++++
+ cpp/poppler-toc.h		     |	74 +++++++++
  22 files changed, 2085 insertions(+)
 
 commit 62854051f4e47028147cc93a5faac39e2fa2c9fd
@@ -22648,7 +25827,7 @@ Date:	Sat Dec 12 17:22:08 2009 +0100
 
     Initialize profileCommands in Gfx constructor
 
- poppler/Gfx.cc |    1 +
+ poppler/Gfx.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 4e6af25a028d16608111634c5467420e31fa399b
@@ -22660,7 +25839,7 @@ Date:	Wed Dec 9 19:45:40 2009 +0100
     Fixes a crash with some documents, see Evince bug
     https://bugzilla.gnome.org/show_bug.cgi?id=603934
 
- poppler/CairoOutputDev.cc |	2 ++
+ poppler/CairoOutputDev.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 6798d3e52e36e91bceff3a1a96372e9d9c6f3813
@@ -22669,11 +25848,11 @@ Date:	Sun Dec 6 15:34:36 2009 +0100
 
     Use fixed size array in AnnotColor
 
- glib/poppler-annot.cc	       |    2 +-
- poppler/Annot.cc	       |   24 +++++-------------------
- poppler/Annot.h	       |    5 ++---
- poppler/Gfx.cc		       |    2 +-
- qt4/src/poppler-annotation.cc |    2 +-
+ glib/poppler-annot.cc	       |  2 +-
+ poppler/Annot.cc	       | 24 +++++-------------------
+ poppler/Annot.h	       |  5 ++---
+ poppler/Gfx.cc		       |  2 +-
+ qt4/src/poppler-annotation.cc |  2 +-
  5 files changed, 10 insertions(+), 25 deletions(-)
 
 commit 92fab93bee3748a73c09429cc8a105c16f21fed0
@@ -22684,7 +25863,7 @@ Date:	Sat Dec 5 22:31:29 2009 +0000
 
     Fixes bug 25465
 
- poppler/PDFDoc.cc |	3 ++-
+ poppler/PDFDoc.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 32103f45d0193b31e95269ea9123b8011d93e994
@@ -22696,8 +25875,8 @@ Date:	Sat Dec 5 10:14:18 2009 +0100
 
     It takes into account annot flags and optional content.
 
- poppler/Annot.cc |   29 ++++++++++++++---------------
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 29 ++++++++++++++---------------
+ poppler/Annot.h  |  1 +
  2 files changed, 15 insertions(+), 15 deletions(-)
 
 commit c14dfc7102341f5e1ed67a05c0738d55befab1ec
@@ -22708,7 +25887,7 @@ Date:	Sat Dec 5 10:07:46 2009 +0100
 
     AnnotLink already implements draw()
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ddf85d4a51f605eed998c633857b8bb5c74ab590
@@ -22719,7 +25898,7 @@ Date:	Fri Dec 4 14:59:41 2009 +0100
 
     By checking the GooString we are going to use really exists
 
- poppler/PSOutputDev.cc |   24 ++++++++++++++++--------
+ poppler/PSOutputDev.cc | 24 ++++++++++++++++--------
  1 file changed, 16 insertions(+), 8 deletions(-)
 
 commit 78b4afa0a44048b8d40438d400652dbae4cb99b1
@@ -22730,7 +25909,7 @@ Date:	Fri Dec 4 14:57:10 2009 +0100
 
     Fixes KDE bug 217013
 
- poppler/GfxFont.cc |	 9 +++++++++
+ poppler/GfxFont.cc | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit fee5cb0eec2ddb8d596289e9a6285cf04d97632e
@@ -22739,7 +25918,7 @@ Date:	Fri Dec 4 13:26:42 2009 +0100
 
     [annots] Remove redundant flags definition
 
- poppler/Annot.cc |   22 +++++++++-------------
+ poppler/Annot.cc | 22 +++++++++-------------
  1 file changed, 9 insertions(+), 13 deletions(-)
 
 commit 3a94e8ce90c0a4d11c5c5aa8805c167c8a0434e5
@@ -22751,7 +25930,7 @@ Date:	Fri Nov 27 15:23:11 2009 +0100
     And fix bug #24575 jut by checking pointer is not null before
     using it.
 
- poppler/CairoOutputDev.cc |   12 +++++-------
+ poppler/CairoOutputDev.cc | 12 +++++-------
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 commit a093b768e64d477ebdd5f6b519d80a6c45706e7e
@@ -22760,9 +25939,9 @@ Date:	Sun Nov 22 20:23:49 2009 +0100
 
     Add copyrights
 
- poppler/CairoFontEngine.cc |	 2 +-
- poppler/CairoOutputDev.cc  |	 4 ++--
- poppler/CairoOutputDev.h   |	 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoOutputDev.cc  | 4 ++--
+ poppler/CairoOutputDev.h   | 2 +-
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 77c2e154c2cb57300116ecd4295f1e67b06b411f
@@ -22773,7 +25952,7 @@ Date:	Sun Nov 22 20:19:29 2009 +0100
 
     bug 24575
 
- poppler/CairoOutputDev.cc |	5 +++++
+ poppler/CairoOutputDev.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 1d0cb9b2cfd4d4d9aa9b0ad83ad6408544263a09
@@ -22782,7 +25961,7 @@ Date:	Sun Nov 22 19:59:34 2009 +0100
 
     [cairo] Initialize fill_color and stroke_color
 
- poppler/CairoOutputDev.cc |	2 ++
+ poppler/CairoOutputDev.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 32de2ac62fb87570e1a59152f37b86e571a01180
@@ -22793,8 +25972,8 @@ Date:	Sun Nov 22 19:51:54 2009 +0100
 
     Makes load a file Ilya can't share
 
- poppler/XRef.cc |  165
- ++++++++++++++++++++++++++++++++-----------------------
+ poppler/XRef.cc | 165
+ ++++++++++++++++++++++++++++++++------------------------
  1 file changed, 95 insertions(+), 70 deletions(-)
 
 commit 039c6dffbfbed46a11e207048a3247d6921d6b02
@@ -22803,7 +25982,7 @@ Date:	Sun Nov 22 15:14:20 2009 +0100
 
     Correctly initialize fileName
 
- poppler/Link.cc |    2 ++
+ poppler/Link.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit b905caf1785ee207cc0480953da69be302d3d4e9
@@ -22816,7 +25995,7 @@ Date:	Sat Nov 21 02:43:21 2009 +0100
     floating point
     values as well. This fixes bug #17439.
 
- poppler/Gfx.cc |    9 +++++++--
+ poppler/Gfx.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit d99e7a88845a5f4b35e2c538c597316b2ad541ca
@@ -22827,8 +26006,8 @@ Date:	Fri Nov 20 22:09:44 2009 +0100
 
     Bug 25103
 
- configure.ac |   61
- +++++++++++++++++++++++++++++-----------------------------
+ configure.ac | 61
+ ++++++++++++++++++++++++++++++------------------------------
  1 file changed, 30 insertions(+), 31 deletions(-)
 
 commit 55261a2dc86241c8d132e590e76e7398b3ca5090
@@ -22839,7 +26018,7 @@ Date:	Wed Nov 18 22:26:01 2009 +0100
 
     bug-poppler13487.pdf gets a 15% faster rendering
 
- splash/SplashMath.h |	 19 +++++++++++++++++--
+ splash/SplashMath.h | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 commit 28df9fb323f14dc632c9502655abf69984b7d67e
@@ -22848,7 +26027,7 @@ Date:	Wed Nov 18 21:57:02 2009 +0100
 
     Remove unused label
 
- poppler/Catalog.cc |	 1 -
+ poppler/Catalog.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 037979a01a6fcafc61360e758dbc4a5eb056825e
@@ -22860,7 +26039,7 @@ Date:	Tue Nov 17 19:12:30 2009 +0100
 
     Fixes bug #8474.
 
- poppler/CairoOutputDev.cc |	7 ++++++-
+ poppler/CairoOutputDev.cc | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 46380d36f004d71dd2c2e7bc82836af248684b51
@@ -22869,10 +26048,10 @@ Date:	Tue Nov 17 20:48:22 2009 +0100
 
     i didn't want to commit this
 
- configure.ac	     |	 60
- ++++++++++++++++++++++++++-------------------------
- splash/SplashMath.h |	  5 ++---
- utils/pdftoppm.cc   |	  8 -------
+ configure.ac	     | 60
+ +++++++++++++++++++++++++++--------------------------
+ splash/SplashMath.h |	5 ++---
+ utils/pdftoppm.cc   |	8 -------
  3 files changed, 33 insertions(+), 40 deletions(-)
 
 commit 1844e0927ae89824f59b2b3378bf5e00a51a251c
@@ -22884,11 +26063,11 @@ Date:	Tue Nov 17 20:34:24 2009 +0100
     it is evil and locale dependant, we do NOT want that so use
     QString::number
 
- configure.ac		       |   60 +++++++++++++++---------------
- qt4/src/poppler-annotation.cc |   82
- ++++++++++++++++++++---------------------
- splash/SplashMath.h	       |    5 ++-
- utils/pdftoppm.cc	       |    8 ++++
+ configure.ac		       | 60 +++++++++++++++----------------
+ qt4/src/poppler-annotation.cc | 82
+ +++++++++++++++++++++----------------------
+ splash/SplashMath.h	       |  5 +--
+ utils/pdftoppm.cc	       |  8 +++++
  4 files changed, 81 insertions(+), 74 deletions(-)
 
 commit 572d79f4b8a7bf1717b88dbd2609d8fa9b036dee
@@ -22900,8 +26079,8 @@ Date:	Sun Nov 15 20:40:56 2009 +0100
     That only happens when outputting to 1 bit images
     Speeds out rendering on some pdf up to 40%
 
- splash/SplashScreen.cc |   35 +++++++++++++++++++++++++++++++++--
- splash/SplashScreen.h	|   16 ++++++++++++++++
+ splash/SplashScreen.cc | 35 +++++++++++++++++++++++++++++++++--
+ splash/SplashScreen.h	| 16 ++++++++++++++++
  2 files changed, 49 insertions(+), 2 deletions(-)
 
 commit 1c3113361fa376093e6fedfbf48feee7dcbc46b7
@@ -22914,7 +26093,7 @@ Date:	Sun Nov 15 19:43:18 2009 +0100
     FontFile should be used instead of adding the generic 512 zeros and
     cleartomark.
 
- poppler/PSOutputDev.cc |   18 +++++++++++++-----
+ poppler/PSOutputDev.cc | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
 
 commit 2d30dc605cd984f6c32124af9aa7b877d416d141
@@ -22924,7 +26103,7 @@ Date:	Sun Nov 15 17:31:36 2009 +0100
     [glib-demo] Show attachment name in FileAttachment annot properties
     table
 
- glib/demo/annots.c |	 5 +++++
+ glib/demo/annots.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 6c8ae140256818401351a331787c83e043fdba09
@@ -22933,8 +26112,8 @@ Date:	Sun Nov 15 17:31:13 2009 +0100
 
     [glib] Add poppler_annot_file_attachment_get_name()
 
- glib/poppler-annot.cc |   36 +++++++++++++++++++++++++++++-------
- glib/poppler-annot.h  |    1 +
+ glib/poppler-annot.cc | 36 +++++++++++++++++++++++++++++-------
+ glib/poppler-annot.h  |  1 +
  2 files changed, 30 insertions(+), 7 deletions(-)
 
 commit ecf5173eb288187a1f076fd4b116f1212fa9e203
@@ -22943,8 +26122,8 @@ Date:	Sun Nov 15 17:14:29 2009 +0100
 
     [glib-demo] Add properties of FileAttachment annotations
 
- glib/demo/annots.c |	67
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/annots.c | 67
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 67 insertions(+)
 
 commit 8f4fdd864d79e4fa83951a3eb006ea8287c3a1ba
@@ -22955,8 +26134,8 @@ Date:	Sun Nov 15 17:12:43 2009 +0100
 
     To be able to add properties to a table that are not labels
 
- glib/demo/utils.c |   31 +++++++++++++++++++++----------
- glib/demo/utils.h |   30 +++++++++++++++++-------------
+ glib/demo/utils.c | 31 +++++++++++++++++++++----------
+ glib/demo/utils.h | 30 +++++++++++++++++-------------
  2 files changed, 38 insertions(+), 23 deletions(-)
 
 commit 061b85f7a442107cda67e385bd772ec8565a936e
@@ -22965,12 +26144,12 @@ Date:	Sun Nov 15 17:11:43 2009 +0100
 
     [glib] Add support for file attachment annotations
 
- glib/poppler-annot.cc	|   69
- +++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-annot.h	|    8 ++++++
- glib/poppler-page.cc	|    3 +++
- glib/poppler-private.h |    1 +
- glib/poppler.h		|   49 +++++++++++++++++-----------------
+ glib/poppler-annot.cc	| 69
+ +++++++++++++++++++++++++++++++++++++++++++++++---
+ glib/poppler-annot.h	|  8 ++++++
+ glib/poppler-page.cc	|  3 +++
+ glib/poppler-private.h |  1 +
+ glib/poppler.h		| 49 +++++++++++++++++------------------
  5 files changed, 102 insertions(+), 28 deletions(-)
 
 commit 189c45332991bce51e40bcaf65da67d2d644045a
@@ -22983,9 +26162,9 @@ Date:	Sun Nov 15 16:42:21 2009 +0100
     reference of
     PopplerDocument anymore.
 
- glib/poppler-attachment.cc |	13 +------------
- glib/poppler-document.cc   |	 2 +-
- glib/poppler-private.h     |	 3 +--
+ glib/poppler-attachment.cc | 13 +------------
+ glib/poppler-document.cc   |  2 +-
+ glib/poppler-private.h     |  3 +--
  3 files changed, 3 insertions(+), 15 deletions(-)
 
 commit e55bfeb1ddc60053c5ee5fef840c409891781ce6
@@ -22996,7 +26175,7 @@ Date:	Fri Nov 13 00:55:37 2009 +0100
 
     Fixes KDE bug #214317
 
- poppler/DCTStream.cc |    6 +++++-
+ poppler/DCTStream.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit c59d93061cf71d13916872a20aed37ecfbb3bfa4
@@ -23005,7 +26184,7 @@ Date:	Mon Nov 9 18:32:55 2009 +0100
 
     [cairo] Do nothing when image mask is 1x1 and the pixel is 0
 
- poppler/CairoOutputDev.cc |   14 ++++++++++++++
+ poppler/CairoOutputDev.cc | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 448f03cfc429d33bfa5527e3dc964ef5da10ee94
@@ -23021,7 +26200,7 @@ Date:	Mon Nov 9 22:52:39 2009 +1030
     the gray values 0 or 1, a workaround is to disable strokes and fills
     of the charproc when the gray level is > 0.5.
 
- poppler/CairoOutputDev.cc |   14 ++++++++++++++
+ poppler/CairoOutputDev.cc | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 3fead2a3b53681ef95116f18f17f1a9febec6e48
@@ -23030,7 +26209,7 @@ Date:	Mon Nov 9 11:25:24 2009 +0100
 
     Transitions dictionary can be a Ref too
 
- poppler/Page.cc |    2 +-
+ poppler/Page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ac4955d03a532cab1933698aeb667d44300e52d0
@@ -23039,8 +26218,8 @@ Date:	Mon Nov 9 11:12:48 2009 +0100
 
     [glib-demo] Explicitely add gio as dependency for GTK+ tests
 
- configure.ac	  |    4 ++--
- glib/demo/main.c |    1 +
+ configure.ac	  | 4 ++--
+ glib/demo/main.c | 1 +
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 32ea667ec8f18311539123c7b80c7ab4767070cb
@@ -23055,7 +26234,7 @@ Date:	Tue Aug 11 19:17:52 2009 +0100
     have taken
     of the surface will the new data.
 
- poppler/CairoOutputDev.cc |	8 ++++++++
+ poppler/CairoOutputDev.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit 10a41150c4067bb3ab85e25dae76e0968a6cd586
@@ -23064,7 +26243,7 @@ Date:	Tue Aug 11 19:17:06 2009 +0100
 
     [cairo] Use colToDbl() to avoid rounding error.
 
- poppler/CairoOutputDev.cc |   37 +++++++++++++++++++------------------
+ poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------
  1 file changed, 19 insertions(+), 18 deletions(-)
 
 commit c9491319689f04edd57adda7ee85f84f17fd1c47
@@ -23073,8 +26252,8 @@ Date:	Tue Aug 11 18:07:17 2009 +0100
 
     [cairo] Reduce the number of redundant pattern creations
 
- poppler/CairoOutputDev.cc |   84
- +++++++++++++++++++++++++++------------------
+ poppler/CairoOutputDev.cc | 84
+ ++++++++++++++++++++++++++++-------------------
  1 file changed, 51 insertions(+), 33 deletions(-)
 
 commit ead78d9f703c8b2d556c94be3c47dbae7469eda8
@@ -23083,7 +26262,7 @@ Date:	Thu Nov 5 22:25:14 2009 +0100
 
     fontpos is never set to -1, so remove the checks in HtmlOutputDev.
 
- utils/HtmlOutputDev.cc |   11 +++--------
+ utils/HtmlOutputDev.cc | 11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
 
 commit 55dd6024a4672a1787e8b1a8276bd78fff94e2cd
@@ -23096,7 +26275,7 @@ Date:	Wed Nov 4 22:07:18 2009 +0100
     FoxIt seems to allow it so try to behave like them. See bug 24720
     to see why one would want such file
 
- poppler/Catalog.cc |	10 +++++-----
+ poppler/Catalog.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 58a1d42aed7352c008d201b8f355f6e4146f71e5
@@ -23105,7 +26284,7 @@ Date:	Thu Oct 29 18:38:22 2009 +0100
 
     [cairo] Don't render patterns when using CairoImageOutputDev
 
- poppler/CairoOutputDev.h |   15 +++++++++++++--
+ poppler/CairoOutputDev.h | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 commit 7670cc48dcf3ffd77e3ffa29056a3e13b2926709
@@ -23116,7 +26295,7 @@ Date:	Wed Oct 28 19:20:41 2009 +0100
 
     Fixes bug 24733
 
- poppler/Annot.cc |    8 ++++++--
+ poppler/Annot.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 4fe89e520a04a6ab6d6ec6a8294896b2f427c7da
@@ -23127,7 +26306,7 @@ Date:	Sun Oct 25 21:55:55 2009 +0100
 
     See bug 24721
 
- poppler/PageLabelInfo.cc |    3 ++-
+ poppler/PageLabelInfo.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit b174ebd6b323c7a58a19d59c1a9e4ac4e6cba7d9
@@ -23143,12 +26322,12 @@ Date:	Fri Oct 23 21:57:42 2009 +0200
     of a page so it's a bit slower but at least it's correct. Fixes
     bug 24686
 
- poppler/Gfx.cc      |	 49 +++++++++++++++++----------
- poppler/Gfx.h	     |	 13 +++++--
- poppler/GfxState.cc |	 94
- +++++++++++++++++++++++++--------------------------
- poppler/GfxState.h  |	 33 +++++++++---------
- poppler/Page.cc     |	  4 +--
+ poppler/Gfx.cc      | 49 ++++++++++++++++++----------
+ poppler/Gfx.h	     | 13 ++++++--
+ poppler/GfxState.cc | 94
+ ++++++++++++++++++++++++++---------------------------
+ poppler/GfxState.h  | 33 +++++++++----------
+ poppler/Page.cc     |	4 +--
  5 files changed, 107 insertions(+), 86 deletions(-)
 
 commit 4a9bdd30dc353865685e03eb1c1ac6093797695a
@@ -23159,7 +26338,7 @@ Date:	Thu Oct 22 21:26:29 2009 +0200
 
     See bug 24525 for more info
 
- poppler/GfxFont.cc |	 1 +
+ poppler/GfxFont.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit c839b706092583f6b12ed3cc634bf5af34b7a2bb
@@ -23168,7 +26347,7 @@ Date:	Tue Oct 20 10:09:13 2009 +0200
 
     [glib] Fix CVE-2009-3607
 
- glib/poppler-page.cc |   20 ++++++++++----------
+ glib/poppler-page.cc | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 commit 44462e0ca39392e5629020226b901e4026089b46
@@ -23177,7 +26356,7 @@ Date:	Mon Oct 19 23:33:58 2009 +0200
 
     fix memory leak
 
- poppler/PSOutputDev.cc |    1 +
+ poppler/PSOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit d701aaa9eaa62567210070129f5feffe24bf1936
@@ -23186,7 +26365,7 @@ Date:	Sun Oct 18 01:22:16 2009 +0200
 
     This include is needed as this file uses Ref
 
- poppler/OutputDev.h |	  1 +
+ poppler/OutputDev.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit d4202536e1b62c326c301d5088fa0e176c523e85
@@ -23195,7 +26374,7 @@ Date:	Sat Oct 17 01:35:11 2009 +0200
 
     SplashGlyphBitmap is a struct and not a class
 
- poppler/ArthurOutputDev.h |	2 +-
+ poppler/ArthurOutputDev.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 654176dee7c9325aa5a24a2de3c070faa16e8a9c
@@ -23207,16 +26386,16 @@ Date:	Sat Oct 17 01:30:40 2009 +0200
     This allows to tune the installation libdir by adding a suffix for it
     (making it eg lib, lib32, or lib64)
 
- CMakeLists.txt		 |   16 +++++++++-------
- glib/CMakeLists.txt	 |    2 +-
- poppler-cairo.pc.cmake  |    2 +-
- poppler-glib.pc.cmake	 |    2 +-
- poppler-qt.pc.cmake	 |    2 +-
- poppler-qt4.pc.cmake	 |    2 +-
- poppler-splash.pc.cmake |    2 +-
- poppler.pc.cmake	 |    2 +-
- qt/CMakeLists.txt	 |    2 +-
- qt4/src/CMakeLists.txt  |    2 +-
+ CMakeLists.txt		 | 16 +++++++++-------
+ glib/CMakeLists.txt	 |  2 +-
+ poppler-cairo.pc.cmake  |  2 +-
+ poppler-glib.pc.cmake	 |  2 +-
+ poppler-qt.pc.cmake	 |  2 +-
+ poppler-qt4.pc.cmake	 |  2 +-
+ poppler-splash.pc.cmake |  2 +-
+ poppler.pc.cmake	 |  2 +-
+ qt/CMakeLists.txt	 |  2 +-
+ qt4/src/CMakeLists.txt  |  2 +-
  10 files changed, 18 insertions(+), 16 deletions(-)
 
 commit 43829ae4b25a88ace06f05fa6750e5732539f4be
@@ -23225,7 +26404,7 @@ Date:	Sat Oct 17 01:21:39 2009 +0200
 
     put a space so MSVC won't try to see it as comment
 
- poppler/GfxState.h |	 4 ++--
+ poppler/GfxState.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f64086ea22a4e8cb3d4e7116db2a9541ac2fb19f
@@ -23234,7 +26413,7 @@ Date:	Sat Oct 17 00:48:58 2009 +0200
 
     check the document is not locked when printing
 
- qt4/src/poppler-ps-converter.cc |    6 ++++++
+ qt4/src/poppler-ps-converter.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 85d1015480b7ab3f21cc5f78dc53d4c5efdc6e60
@@ -23243,7 +26422,7 @@ Date:	Sat Oct 17 00:48:27 2009 +0200
 
     fix file name comment
 
- qt4/src/poppler-ps-converter.cc |    2 +-
+ qt4/src/poppler-ps-converter.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 270764ad1bf2cfe95aed0b6850d2347361b4268d
@@ -23253,11 +26432,11 @@ Date:	Sat Oct 17 00:47:34 2009 +0200
     Add a way for converters to return more exact errors they had when
     converting
 
- qt4/src/poppler-base-converter.cc   |	  8 +++++++-
- qt4/src/poppler-converter-private.h |	  3 ++-
- qt4/src/poppler-pdf-converter.cc    |	 11 ++++++++++-
- qt4/src/poppler-ps-converter.cc     |	  6 +++++-
- qt4/src/poppler-qt4.h		     |	 14 ++++++++++++++
+ qt4/src/poppler-base-converter.cc   |	8 +++++++-
+ qt4/src/poppler-converter-private.h |	3 ++-
+ qt4/src/poppler-pdf-converter.cc    | 11 ++++++++++-
+ qt4/src/poppler-ps-converter.cc     |	6 +++++-
+ qt4/src/poppler-qt4.h		     | 14 ++++++++++++++
  5 files changed, 38 insertions(+), 4 deletions(-)
 
 commit 1082e1671afd8ab91583dabc876304008acb021c
@@ -23266,11 +26445,11 @@ Date:	Fri Oct 16 23:17:22 2009 +0200
 
     Some "security" fixes based on newly released Xpdf 3.02pl4
 
- poppler/Stream.cc	   |	4 ++++
- poppler/XRef.cc	   |   19 +++++++++++++++----
- splash/Splash.cc	   |	7 +++++++
- splash/SplashBitmap.cc    |   37 ++++++++++++++++++++++++++++++-------
- splash/SplashErrorCodes.h |	4 +++-
+ poppler/Stream.cc	   |  4 ++++
+ poppler/XRef.cc	   | 19 +++++++++++++++----
+ splash/Splash.cc	   |  7 +++++++
+ splash/SplashBitmap.cc    | 37 ++++++++++++++++++++++++++++++-------
+ splash/SplashErrorCodes.h |  4 +++-
  5 files changed, 59 insertions(+), 12 deletions(-)
 
 commit c2458275e02f56226779b82d73c13defcbbda563
@@ -23279,7 +26458,7 @@ Date:	Fri Oct 16 20:54:32 2009 +0200
 
     fix constructor of DCTStream
 
- poppler/Stream.cc |	3 ++-
+ poppler/Stream.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit fd91b79c053bb5cd01a766032b90981dbc5e5dd3
@@ -23288,7 +26467,7 @@ Date:	Sat Oct 10 14:53:42 2009 +0200
 
     fix compiling with automake
 
- goo/Makefile.am |    2 +-
+ goo/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c3031b4318af6f85256f2478c8678dedd0d6acd1
@@ -23297,7 +26476,7 @@ Date:	Fri Oct 9 16:17:16 2009 +0200
 
     cmake: simplify the linking to libpng
 
- CMakeLists.txt |    7 +++----
+ CMakeLists.txt | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 96688dd7a091f8fa141fad2b3d05bae04b0b86fb
@@ -23306,7 +26485,7 @@ Date:	Fri Oct 9 16:09:46 2009 +0200
 
     MSVC: add _CRT_SECURE_NO_WARNINGS to the define's
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit f346c1f6b55f87ebd6bb0b0932462d5514aa40ff
@@ -23315,10 +26494,10 @@ Date:	Fri Oct 9 00:29:06 2009 +0200
 
     add -ansi flag to default warnings
 
- cmake/modules/PopplerMacros.cmake |	2 +-
- configure.ac			   |	2 +-
- utils/parseargs.c		   |   30 +++++++++++++++---------------
- utils/parseargs.h		   |   26 +++++++++++++-------------
+ cmake/modules/PopplerMacros.cmake |  2 +-
+ configure.ac			   |  2 +-
+ utils/parseargs.c		   | 30 +++++++++++++++---------------
+ utils/parseargs.h		   | 26 +++++++++++++-------------
  4 files changed, 30 insertions(+), 30 deletions(-)
 
 commit 53e0016b772f1b78d998506e2f3106011d32cef3
@@ -23327,10 +26506,10 @@ Date:	Fri Oct 9 00:15:52 2009 +0200
 
     Add virtual destructor to ImgWriter
 
- CMakeLists.txt   |    1 +
- goo/ImgWriter.cc |   15 +++++++++++++++
- goo/ImgWriter.h  |    2 ++
- goo/Makefile.am  |    1 +
+ CMakeLists.txt   |  1 +
+ goo/ImgWriter.cc | 15 +++++++++++++++
+ goo/ImgWriter.h  |  2 ++
+ goo/Makefile.am  |  1 +
  4 files changed, 19 insertions(+)
 
 commit 699dcacced7be05b788c414c231dc2b5c07de06e
@@ -23339,8 +26518,8 @@ Date:	Fri Oct 9 00:13:11 2009 +0200
 
     Add -Wnon-virtual-dtor flag
 
- cmake/modules/PopplerMacros.cmake |	4 ++--
- configure.ac			   |	2 +-
+ cmake/modules/PopplerMacros.cmake | 4 ++--
+ configure.ac			   | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit d1e4fca4a8602994b010fae4f4fea5cd4df9276e
@@ -23349,7 +26528,7 @@ Date:	Fri Oct 9 00:10:03 2009 +0200
 
     build on cmake too
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit d67511c92022121066f43003f01b955962ddcd33
@@ -23358,18 +26537,18 @@ Date:	Fri Oct 9 00:09:23 2009 +0200
 
     Add -jpeg to pdftoppm
 
- goo/ImgWriter.h	|   28 +++++++++++++++
- goo/JpegWriter.cc	|   92
- ++++++++++++++++++++++++++++++++++++++++++++++++
- goo/JpegWriter.h	|   42 ++++++++++++++++++++++
- goo/Makefile.am	|    2 ++
- goo/PNGWriter.cc	|    5 +--
- goo/PNGWriter.h	|   10 +++---
- splash/SplashBitmap.cc |   46 ++++++++++++++++--------
- splash/SplashBitmap.h	|    5 +--
- splash/SplashTypes.h	|   11 ++++++
- utils/pdftoppm.1	|    3 ++
- utils/pdftoppm.cc	|   22 +++++++++---
+ goo/ImgWriter.h	| 28 +++++++++++++++
+ goo/JpegWriter.cc	| 92
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/JpegWriter.h	| 42 +++++++++++++++++++++++
+ goo/Makefile.am	|  2 ++
+ goo/PNGWriter.cc	|  5 +--
+ goo/PNGWriter.h	| 10 +++---
+ splash/SplashBitmap.cc | 46 +++++++++++++++++--------
+ splash/SplashBitmap.h	|  5 +--
+ splash/SplashTypes.h	| 11 ++++++
+ utils/pdftoppm.1	|  3 ++
+ utils/pdftoppm.cc	| 22 +++++++++---
  11 files changed, 239 insertions(+), 27 deletions(-)
 
 commit 388196df1fb05fb2d88ae82bd81e823a23588ec1
@@ -23378,7 +26557,7 @@ Date:	Wed Oct 7 17:11:58 2009 +0200
 
     [glib-demo] Show some of the annot flags in annots treeview
 
- glib/demo/annots.c |	35 +++++++++++++++++++++++++++++++++--
+ glib/demo/annots.c | 35 +++++++++++++++++++++++++++++++++--
  1 file changed, 33 insertions(+), 2 deletions(-)
 
 commit 034907c6582c1f50782ec9c58a29b140c6fc0688
@@ -23387,7 +26566,7 @@ Date:	Tue Oct 6 00:52:10 2009 +0200
 
     Forgot to update the year here
 
- qt4/src/poppler-private.h |	2 +-
+ qt4/src/poppler-private.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fef89acebf5312324c104fb52e629563fbc2de76
@@ -23396,9 +26575,9 @@ Date:	Tue Oct 6 00:42:52 2009 +0200
 
     Add the possibility of enabling hinting
 
- qt4/src/poppler-document.cc |	  2 +-
- qt4/src/poppler-private.h   |	  1 +
- qt4/src/poppler-qt4.h	     |	  3 ++-
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-private.h   | 1 +
+ qt4/src/poppler-qt4.h	     | 3 ++-
  3 files changed, 4 insertions(+), 2 deletions(-)
 
 commit 485252844b5e0964ee724b74e2a7ba2b820b259e
@@ -23410,18 +26589,18 @@ Date:	Tue Oct 6 00:41:57 2009 +0200
     Basically we default to no hinting now with the possibility to
     enable it
 
- poppler/ArthurOutputDev.cc   |    2 +-
- poppler/GlobalParams.cc      |   19 -------------
- poppler/GlobalParams.h       |    3 --
- poppler/SplashOutputDev.cc   |    8 +++++-
- poppler/SplashOutputDev.h    |    3 ++
- splash/SplashFTFont.cc       |   64
- +++++++++---------------------------------
- splash/SplashFTFont.h	      |    4 +--
- splash/SplashFTFontEngine.cc |    8 +++---
- splash/SplashFTFontEngine.h  |    7 +++--
- splash/SplashFontEngine.cc   |    5 ++--
- splash/SplashFontEngine.h    |    3 +-
+ poppler/ArthurOutputDev.cc   |  2 +-
+ poppler/GlobalParams.cc      | 19 -------------
+ poppler/GlobalParams.h       |  3 ---
+ poppler/SplashOutputDev.cc   |  8 +++++-
+ poppler/SplashOutputDev.h    |  3 +++
+ splash/SplashFTFont.cc       | 64
+ ++++++++++----------------------------------
+ splash/SplashFTFont.h	      |  4 +--
+ splash/SplashFTFontEngine.cc |  8 +++---
+ splash/SplashFTFontEngine.h  |  7 ++---
+ splash/SplashFontEngine.cc   |  5 ++--
+ splash/SplashFontEngine.h    |  3 ++-
  11 files changed, 40 insertions(+), 86 deletions(-)
 
 commit 8194c156cf2167834779e1690a89b5068baf8d58
@@ -23430,12 +26609,12 @@ Date:	Mon Oct 5 00:55:55 2009 +0200
 
     Fix includes for those using internal headers
 
- goo/FixedPoint.h	 |    2 +-
- goo/gmem.h		 |    2 +-
- poppler/OutputDev.h	 |    2 +-
- poppler/PSOutputDev.h	 |    2 +-
- poppler/PageLabelInfo.h |    2 +-
- utils/ImageOutputDev.h  |    2 +-
+ goo/FixedPoint.h	 | 2 +-
+ goo/gmem.h		 | 2 +-
+ poppler/OutputDev.h	 | 2 +-
+ poppler/PSOutputDev.h	 | 2 +-
+ poppler/PageLabelInfo.h | 2 +-
+ utils/ImageOutputDev.h  | 2 +-
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 091f68ccd59413d6890dfbfcf8911f112e690b50
@@ -23446,26 +26625,25 @@ Date:	Mon Oct 5 00:39:36 2009 +0200
 
     More info at http://bugs.freedesktop.org/show_bug.cgi?id=24259
 
- goo/GooMutex.h		       |   16 +++++++++++++++-
- goo/gfile.cc		       |   33 +++++++++++++++++----------------
- goo/gfile.h		       |    5 +++--
- msvc/poppler/poppler-config.h |    2 +-
- poppler-config.h.cmake        |    2 +-
- poppler/ABWOutputDev.h        |    3 ++-
- poppler/FileSpec.cc	       |    7 ++++---
- poppler/GlobalParams.cc       |   37
- +++++++++++++++++++------------------
- poppler/GlobalParams.h        |    4 ++--
- poppler/Link.cc	       |    3 ++-
- poppler/PDFDoc.cc	       |    4 ++--
- poppler/PDFDoc.h	       |    3 ++-
- poppler/PSOutputDev.cc        |    5 +++--
- poppler/TextOutputDev.cc      |    5 +++--
- poppler/XpdfPluginAPI.cc      |   13 ++++++++++++-
- poppler/poppler-config.h.in   |    2 +-
- splash/SplashFontEngine.cc    |    9 +++++----
- test/perf-test.cc	       |   24 ++++++++++++------------
- utils/HtmlOutputDev.h	       |    3 ++-
+ goo/GooMutex.h		       | 16 +++++++++++++++-
+ goo/gfile.cc		       | 33 +++++++++++++++++----------------
+ goo/gfile.h		       |  5 +++--
+ msvc/poppler/poppler-config.h |  2 +-
+ poppler-config.h.cmake        |  2 +-
+ poppler/ABWOutputDev.h        |  3 ++-
+ poppler/FileSpec.cc	       |  7 ++++---
+ poppler/GlobalParams.cc       | 37 +++++++++++++++++++------------------
+ poppler/GlobalParams.h        |  4 ++--
+ poppler/Link.cc	       |  3 ++-
+ poppler/PDFDoc.cc	       |  4 ++--
+ poppler/PDFDoc.h	       |  3 ++-
+ poppler/PSOutputDev.cc        |  5 +++--
+ poppler/TextOutputDev.cc      |  5 +++--
+ poppler/XpdfPluginAPI.cc      | 13 ++++++++++++-
+ poppler/poppler-config.h.in   |  2 +-
+ splash/SplashFontEngine.cc    |  9 +++++----
+ test/perf-test.cc	       | 24 ++++++++++++------------
+ utils/HtmlOutputDev.h	       |  3 ++-
  19 files changed, 108 insertions(+), 72 deletions(-)
 
 commit 7fd8bdfa450db4e323e4e5d12159359fbc47f9ed
@@ -23477,7 +26655,7 @@ Date:	Mon Oct 5 00:21:15 2009 +0200
     Found by -Wextra i think we should add more warnings to our default
     flags
 
- qt4/src/poppler-annotation.cc |    2 +-
+ qt4/src/poppler-annotation.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d46f7343e446331489d3fe6711a7cf778e0bd902
@@ -23488,7 +26666,7 @@ Date:	Fri Oct 2 22:04:46 2009 +0200
 
     Fixes saving some files
 
- poppler/PDFDoc.cc |	2 +-
+ poppler/PDFDoc.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2bc2040081919340415f576ce8266356deadbfcd
@@ -23499,7 +26677,7 @@ Date:	Fri Oct 2 22:04:03 2009 +0200
 
     Makes saving more faithful for some files
 
- poppler/PDFDoc.cc |	2 +-
+ poppler/PDFDoc.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 05eb7342d5234732f27c9c67b7fc1f9e40a4e075
@@ -23510,7 +26688,7 @@ Date:	Fri Oct 2 22:03:40 2009 +0200
 
     Fixes saving of some files
 
- poppler/PDFDoc.cc |   12 ++++++++++++
+ poppler/PDFDoc.cc | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 commit b98faa4c162392d9416a5a93c9042b41f82d8657
@@ -23519,7 +26697,7 @@ Date:	Fri Oct 2 22:02:13 2009 +0200
 
     Return the save status as program status
 
- test/pdf-fullrewrite.cc |    3 ++-
+ test/pdf-fullrewrite.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit f73f59f2c7bb7c7d57eb70cdc1bc30b80a92d0b7
@@ -23530,7 +26708,7 @@ Date:	Fri Oct 2 22:01:45 2009 +0200
 
     Fixes saving some files
 
- poppler/Parser.cc |	5 +++++
+ poppler/Parser.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 91135c7e788bc32e414e1a9c9ab43b326a07e970
@@ -23541,7 +26719,7 @@ Date:	Fri Oct 2 22:00:12 2009 +0200
 
     Fixes saving of some files
 
- goo/GooString.cc |    4 ++--
+ goo/GooString.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9dcb3e8be2cd52a795605548e43d6bfc149b2ea5
@@ -23552,7 +26730,7 @@ Date:	Sun Sep 27 17:17:32 2009 +0200
 
     Fixes check on cygwin
 
- m4/qt.m4 |    4 ++--
+ m4/qt.m4 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ed4a6f1cfc7ccd2717d939841c092347c3307547
@@ -23563,7 +26741,7 @@ Date:	Sat Sep 26 19:26:19 2009 +0200
 
     Bug 24090
 
- poppler/PDFDoc.cc |	6 +++++-
+ poppler/PDFDoc.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 04b232d48930af9bc614d7fef47f79ce247713a4
@@ -23574,7 +26752,7 @@ Date:	Sat Sep 26 18:30:41 2009 +0200
 
     Bug 24091
 
- poppler/PDFDoc.cc |	8 +++++++-
+ poppler/PDFDoc.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 343e4f9aceb935eb393ad94bbef4dbb1b1a450ee
@@ -23583,7 +26761,7 @@ Date:	Sat Sep 26 18:28:40 2009 +0200
 
     Plug leak
 
- test/pdf-fullrewrite.cc |    1 +
+ test/pdf-fullrewrite.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2ea0032283c4717f1bb285fab7956fc38f375e87
@@ -23594,9 +26772,9 @@ Date:	Sat Sep 26 15:01:35 2009 +0200
 
     Bug 4195
 
- configure.ac	     |	  3 +++
- qt/Makefile.am      |	  2 +-
- qt4/src/Makefile.am |	  2 +-
+ configure.ac	     | 3 +++
+ qt/Makefile.am      | 2 +-
+ qt4/src/Makefile.am | 2 +-
  3 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 074dc5e5e39cebc1fbe9bf6a15b2cae2391006c1
@@ -23607,7 +26785,7 @@ Date:	Sat Sep 26 14:56:38 2009 +0200
 
     Fixes bug 6841
 
- poppler/Parser.cc |   17 +++++++++++++----
+ poppler/Parser.cc | 17 +++++++++++++----
  1 file changed, 13 insertions(+), 4 deletions(-)
 
 commit b7702820245fb6cdbf77afba37c53c03d4362a25
@@ -23618,7 +26796,7 @@ Date:	Mon Sep 21 21:58:26 2009 +0200
 
     This is a regression after the removal of setting LC_NUMERIC
 
- poppler/PDFDoc.cc |	6 +++++-
+ poppler/PDFDoc.cc | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit d31080d8195694cef740d4e77484179bb38d1f26
@@ -23630,7 +26808,7 @@ Date:	Sun Sep 20 17:21:13 2009 +0200
 
     Fixes bug #24036
 
- poppler/Annot.cc |   33 ++++++++++++++++++++-------------
+ poppler/Annot.cc | 33 ++++++++++++++++++++-------------
  1 file changed, 20 insertions(+), 13 deletions(-)
 
 commit a729d005a7204791fa8415de5aa0834136073ce8
@@ -23645,9 +26823,9 @@ Date:	Thu Sep 17 20:12:20 2009 +0200
     thanks for Christian Ehrlicher for reporting the bug and testing
     its fix
 
- poppler/GlobalParams.cc    |	 1 +
- poppler/GlobalParams.h     |	 1 +
- poppler/GlobalParamsWin.cc |	 1 -
+ poppler/GlobalParams.cc    | 1 +
+ poppler/GlobalParams.h     | 1 +
+ poppler/GlobalParamsWin.cc | 1 -
  3 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 68711d8494e2765c4a24ea59ce8d904981f0f917
@@ -23658,7 +26836,7 @@ Date:	Wed Sep 9 23:24:22 2009 +0200
 
     some compilers don't know about uint
 
- poppler/Gfx.cc |    4 ++--
+ poppler/Gfx.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 943a13c9354dec18cb023642aebbe5d3bb920ed7
@@ -23667,11 +26845,11 @@ Date:	Wed Sep 9 20:04:06 2009 +0200
 
     poppler 0.12.0
 
- CMakeLists.txt   |    4 ++--
- NEWS		  |   18 ++++++++++++++++++
- configure.ac	  |    4 ++--
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  4 ++--
+ NEWS		  | 18 ++++++++++++++++++
+ configure.ac	  |  4 ++--
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 26 insertions(+), 8 deletions(-)
 
 commit e8ed7210346cb18f6e4588ad557f993c6d42f4a3
@@ -23680,8 +26858,8 @@ Date:	Wed Sep 9 19:21:21 2009 +0200
 
     increase library to 3.2.0
 
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Makefile.am	|    2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit e950107006a3b1889646d3705323c1b3d41eaa49
@@ -23693,7 +26871,7 @@ Date:	Wed Sep 9 01:19:38 2009 +0200
     Bug 23025
     Also fixes problems in bug-poppler6881-2.pdf and bug-poppler6500.pdf
 
- poppler/JBIG2Stream.cc |   13 ++++++++-----
+ poppler/JBIG2Stream.cc | 13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 commit 1cb25a4adaaf3e2da50724312a3db6928991f425
@@ -23704,7 +26882,7 @@ Date:	Sun Sep 6 10:45:56 2009 +0200
 
     Fixes bug #10386
 
- glib/poppler-document.cc |    4 ++++
+ glib/poppler-document.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 842e00f3114666609ef4dec6fa613d46f330a40c
@@ -23715,8 +26893,8 @@ Date:	Sat Sep 5 15:20:35 2009 +0200
 
     Also do not crash if data() is called on an invalid file
 
- qt4/src/poppler-embeddedfile.cc |   10 +++++++++-
- qt4/src/poppler-qt4.h		 |    9 ++++++++-
+ qt4/src/poppler-embeddedfile.cc | 10 +++++++++-
+ qt4/src/poppler-qt4.h		 |  9 ++++++++-
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 commit 9d40b268f5a9a9a0fb79da0e1627dd8eebc4db6a
@@ -23728,7 +26906,7 @@ Date:	Sat Sep 5 15:19:27 2009 +0200
     At the moment returns false if the object stream is not really
     a stream
 
- poppler/Catalog.h |	3 ++-
+ poppler/Catalog.h | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 642650b6f70425c8fff2df978ae71249a5ae07f3
@@ -23739,7 +26917,7 @@ Date:	Sat Sep 5 01:12:49 2009 +0200
 
     Bug #17252
 
- poppler/GfxFont.cc |	38 ++++++++++++++++++++++++++++++++------
+ poppler/GfxFont.cc | 38 ++++++++++++++++++++++++++++++++------
  1 file changed, 32 insertions(+), 6 deletions(-)
 
 commit bf5811f5331292ccf30f1b0f089fe43d351d96be
@@ -23751,7 +26929,7 @@ Date:	Wed Aug 26 00:43:46 2009 +0200
     Shading is not necessarily lineal so require another bisection to
     assume all the area in between have the same color. Fixes bug #20238
 
- poppler/Gfx.cc |   17 ++++++++++++++++-
+ poppler/Gfx.cc | 17 ++++++++++++++++-
  1 file changed, 16 insertions(+), 1 deletion(-)
 
 commit e94430b790fde6ce7b7cb163c2e0adf2d071c81d
@@ -23760,7 +26938,7 @@ Date:	Wed Aug 26 00:42:49 2009 +0200
 
     Make code a bit more readable
 
- poppler/Gfx.cc |   23 +++++++++++------------
+ poppler/Gfx.cc | 23 +++++++++++------------
  1 file changed, 11 insertions(+), 12 deletions(-)
 
 commit 465212780557705fd939dfe54f96913505bfc96e
@@ -23769,7 +26947,7 @@ Date:	Tue Aug 25 21:55:45 2009 +0200
 
     forgot to update my copyright
 
- poppler/JPEG2000Stream.cc |	2 +-
+ poppler/JPEG2000Stream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4f6016d01ced32002bef22b9b5d5426a74e55842
@@ -23780,7 +26958,7 @@ Date:	Tue Aug 25 21:10:07 2009 +0200
 
     Don't just directly print strings of unknown content; use "%s".
 
- poppler/JPEG2000Stream.cc |	4 ++--
+ poppler/JPEG2000Stream.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 4616b23382b5d155f8b2f1942733037cf5730844
@@ -23791,7 +26969,7 @@ Date:	Tue Aug 25 21:09:40 2009 +0200
 
     Don't just directly print strings of unknown content; use "%s".
 
- poppler/GfxState.cc |	  3 ++-
+ poppler/GfxState.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 6c5c8d008456d1e4f3d60bc182209747c2a175dc
@@ -23802,12 +26980,12 @@ Date:	Tue Aug 25 21:03:16 2009 +0200
 
     When using automake 1.11, should support silent build rules.
 
- Makefile.am	       |    2 +-
- configure.ac	       |    1 +
- glib/Makefile.am      |    4 ++--
- qt4/demos/Makefile.am |    2 +-
- qt4/src/Makefile.am   |    2 +-
- qt4/tests/Makefile.am |    2 +-
+ Makefile.am	       | 2 +-
+ configure.ac	       | 1 +
+ glib/Makefile.am      | 4 ++--
+ qt4/demos/Makefile.am | 2 +-
+ qt4/src/Makefile.am   | 2 +-
+ qt4/tests/Makefile.am | 2 +-
  6 files changed, 7 insertions(+), 6 deletions(-)
 
 commit e7dd1c47b01d8f31599ee686eafbe7c54d7c023a
@@ -23820,7 +26998,7 @@ Date:	Tue Aug 25 21:01:13 2009 +0200
     not the
     oldest one. Add support for automake 1.11. FDO#23473.
 
- autogen.sh |	13 +++++++------
+ autogen.sh | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 commit 493d2c5aa78a3241e70108c5d7eccba9ac72f834
@@ -23832,10 +27010,10 @@ Date:	Mon Aug 24 20:08:46 2009 +0200
     The following patch minimizes pkg-config deps similar to how the
     glib-related pkg-config deps are done.
 
- poppler-qt.pc.cmake  |    3 ++-
- poppler-qt.pc.in     |    3 ++-
- poppler-qt4.pc.cmake |    3 ++-
- poppler-qt4.pc.in    |    3 ++-
+ poppler-qt.pc.cmake  | 3 ++-
+ poppler-qt.pc.in     | 3 ++-
+ poppler-qt4.pc.cmake | 3 ++-
+ poppler-qt4.pc.in    | 3 ++-
  4 files changed, 8 insertions(+), 4 deletions(-)
 
 commit 341cd3ecd08a39cd146c1c57f356b50a2881c03f
@@ -23850,7 +27028,7 @@ Date:	Mon Aug 24 19:51:34 2009 +0200
     pdftosomething
     utilities.
 
- utils/pdftoabw.cc |   39 ++++++++++++++++++++++++++++++++-------
+ utils/pdftoabw.cc | 39 ++++++++++++++++++++++++++++++++-------
  1 file changed, 32 insertions(+), 7 deletions(-)
 
 commit 365683d5faea6e0a7570b139d1f3366c22271f8e
@@ -23859,11 +27037,11 @@ Date:	Tue Aug 18 21:18:13 2009 +0200
 
     0.11.3
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   22 ++++++++++++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 22 ++++++++++++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 28 insertions(+), 6 deletions(-)
 
 commit cb28bc8a637d300664b3c7569263445275333878
@@ -23874,7 +27052,7 @@ Date:	Mon Aug 17 14:14:03 2009 +0200
 
     See bug #23076.
 
- glib/poppler-document.cc |   26 ++++++++++++++++++++++++++
+ glib/poppler-document.cc | 26 ++++++++++++++++++++++++++
  1 file changed, 26 insertions(+)
 
 commit 1b5612841b0c663f6d391d4581f65f68a2975db0
@@ -23887,8 +27065,8 @@ Date:	Mon Aug 17 01:04:04 2009 +0200
     This new function reads the version of the PDF specification of the
     document, putting major and minor numbers in own variables.
 
- qt/poppler-document.cc |    8 ++++++++
- qt/poppler-qt.h	|   12 ++++++++++++
+ qt/poppler-document.cc |  8 ++++++++
+ qt/poppler-qt.h	| 12 ++++++++++++
  2 files changed, 20 insertions(+)
 
 commit aef8ecda1e80b921228f415a53c9c5a52df87d94
@@ -23899,7 +27077,7 @@ Date:	Mon Aug 17 00:57:08 2009 +0200
 
     ... in favour of getPdfVersion()
 
- qt4/src/poppler-qt4.h |    5 ++++-
+ qt4/src/poppler-qt4.h | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 830140f70e48e8033ad4411b6bd405d5ad7358a3
@@ -23913,9 +27091,9 @@ Date:	Mon Aug 17 00:51:13 2009 +0200
     document, putting major and minor numbers in own variables.
     Add them to the relative unit test.
 
- qt4/src/poppler-document.cc  |    8 ++++++++
- qt4/src/poppler-qt4.h	      |   13 +++++++++++++
- qt4/tests/check_metadata.cpp |    4 ++++
+ qt4/src/poppler-document.cc  |  8 ++++++++
+ qt4/src/poppler-qt4.h	      | 13 +++++++++++++
+ qt4/tests/check_metadata.cpp |  4 ++++
  3 files changed, 25 insertions(+)
 
 commit 5491d16dfbd73f0256c62e49d02622dc3185012e
@@ -23926,12 +27104,12 @@ Date:	Mon Aug 17 00:24:41 2009 +0200
 
     Frontends are yet to come
 
- glib/poppler-document.cc    |	  2 +-
- poppler/PDFDoc.cc	     |	  7 ++++---
- poppler/PDFDoc.h	     |	  8 +++++---
- qt/poppler-document.cc      |	  4 ++--
- qt4/src/poppler-document.cc |	  4 ++--
- utils/pdfinfo.cc	     |	  4 ++--
+ glib/poppler-document.cc    | 2 +-
+ poppler/PDFDoc.cc	     | 7 ++++---
+ poppler/PDFDoc.h	     | 8 +++++---
+ qt/poppler-document.cc      | 4 ++--
+ qt4/src/poppler-document.cc | 4 ++--
+ utils/pdfinfo.cc	     | 4 ++--
  6 files changed, 16 insertions(+), 13 deletions(-)
 
 commit efd5dd63a5b08249529d9a9f5906aefe806fb3aa
@@ -23940,9 +27118,9 @@ Date:	Mon Aug 17 00:21:22 2009 +0200
 
     Forgot to update copyright info
 
- fofi/FoFiType1C.cc |	14 ++++++++++++++
- poppler/PDFDoc.cc  |	 2 +-
- utils/parseargs.c  |	 2 +-
+ fofi/FoFiType1C.cc | 14 ++++++++++++++
+ poppler/PDFDoc.cc  |  2 +-
+ utils/parseargs.c  |  2 +-
  3 files changed, 16 insertions(+), 2 deletions(-)
 
 commit 25ff4be0b4521cc3d2de386cdeb589beb245d435
@@ -23952,7 +27130,7 @@ Date:	Mon Aug 17 00:15:10 2009 +0200
     No need to change the locale since we use gatof that does the
     right thing
 
- poppler/PDFDoc.cc |	6 +-----
+ poppler/PDFDoc.cc | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 commit a6f698b4edc42c0414dd4690e1e037088321db2c
@@ -23961,11 +27139,11 @@ Date:	Mon Aug 17 00:14:35 2009 +0200
 
     Use gatof instead of atof
 
- fofi/FoFiType1C.cc  |	  3 ++-
- poppler/Annot.cc    |	  5 +++--
- poppler/Function.cc |	  3 ++-
- poppler/PDFDoc.cc   |	  3 ++-
- utils/parseargs.c   |	  4 +++-
+ fofi/FoFiType1C.cc  | 3 ++-
+ poppler/Annot.cc    | 5 +++--
+ poppler/Function.cc | 3 ++-
+ poppler/PDFDoc.cc   | 3 ++-
+ utils/parseargs.c   | 4 +++-
  5 files changed, 12 insertions(+), 6 deletions(-)
 
 commit 807b121cae45832d2e5832bad19c31e77420bfec
@@ -23976,11 +27154,11 @@ Date:	Mon Aug 17 00:10:30 2009 +0200
 
     Works over C locale integers without changing locale settings
 
- CMakeLists.txt  |    2 +
- goo/Makefile.am |    6 ++-
- goo/gstrtod.cc  |  147
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- goo/gstrtod.h	 |   43 ++++++++++++++++
+ CMakeLists.txt  |   2 +
+ goo/Makefile.am |   6 ++-
+ goo/gstrtod.cc  | 147
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/gstrtod.h	 |  43 +++++++++++++++++
  4 files changed, 196 insertions(+), 2 deletions(-)
 
 commit 914bf7677a14494b69857b1d8070092a9999fe79
@@ -23993,9 +27171,9 @@ Date:	Sun Aug 16 20:50:02 2009 +0200
     Maybe we want to make this the default behaviour of 'g' instead of
     a new 'gs' case, but i prefer to be on the safe side for the moment
 
- goo/GooString.cc	|   27 +++++++++++++++++++++++++--
- goo/GooString.h	|    4 +++-
- poppler/PSOutputDev.cc |    4 ++--
+ goo/GooString.cc	| 27 +++++++++++++++++++++++++--
+ goo/GooString.h	|  4 +++-
+ poppler/PSOutputDev.cc |  4 ++--
  3 files changed, 30 insertions(+), 5 deletions(-)
 
 commit b7dfca1aa52b825eb3b8f1cc0470398c31615b30
@@ -24004,7 +27182,7 @@ Date:	Sun Aug 16 19:28:37 2009 +0200
 
     [cairo] CairoImageOutputDev doesn't implement patterns
 
- poppler/CairoOutputDev.h |   13 +++++++++++++
+ poppler/CairoOutputDev.h | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit d20d65111aee2ee4b8cdea2962ed1bb149122ba9
@@ -24015,9 +27193,9 @@ Date:	Sun Aug 16 17:36:14 2009 +0200
 
     Fixes bug #13518 for the cairo backend.
 
- poppler/CairoOutputDev.cc |   56
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |   10 ++++++++
+ poppler/CairoOutputDev.cc | 56
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  | 10 +++++++++
  2 files changed, 66 insertions(+)
 
 commit e965d0686d979c775b64a93f8e2f775f81885417
@@ -24030,10 +27208,10 @@ Date:	Thu Aug 13 14:48:10 2009 +0200
     depending
     on the parameters, like shaded patterns currently do.
 
- poppler/Gfx.cc		|   37 +++++++++++++++++++------------------
- poppler/OutputDev.h	|   11 ++++++-----
- poppler/PSOutputDev.cc |   12 +++++++-----
- poppler/PSOutputDev.h	|   10 +++++-----
+ poppler/Gfx.cc		| 37 +++++++++++++++++++------------------
+ poppler/OutputDev.h	| 11 ++++++-----
+ poppler/PSOutputDev.cc | 12 +++++++-----
+ poppler/PSOutputDev.h	| 10 +++++-----
  4 files changed, 37 insertions(+), 33 deletions(-)
 
 commit ce70ef7d6afc800e24031dae43da301e9e542f0e
@@ -24042,7 +27220,7 @@ Date:	Sat Aug 15 17:45:57 2009 +0200
 
     Fix backwards search
 
- qt4/src/poppler-page.cc |    4 ++--
+ qt4/src/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5b7b1cdc5c3b8652d3ae583b4d7b8b6de625adc2
@@ -24051,8 +27229,8 @@ Date:	Sat Aug 15 17:45:05 2009 +0200
 
     Add an autotest showing previousresult fails
 
- qt4/tests/check_search.cpp |	51
- ++++++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/check_search.cpp | 51
+ ++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 51 insertions(+)
 
 commit 2484b0dcb8eb62f8e2c147498c58871ec04630b5
@@ -24067,7 +27245,7 @@ Date:	Fri Aug 14 11:47:11 2009 +0200
     poppler bug 22152 and causes no regression in all the other files
     i have in my test dir so i'm commiting it
 
- poppler/SplashOutputDev.cc |	 4 ++--
+ poppler/SplashOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 03970d8b6d7624444664320470baa6d1b1299622
@@ -24076,7 +27254,7 @@ Date:	Tue Aug 11 12:01:07 2009 +0200
 
     [build] Fix build with autotools
 
- utils/Makefile.am |	1 +
+ utils/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 15752b7cd5c94620e3ad3b6afd9c70ccc754c9b3
@@ -24089,7 +27267,7 @@ Date:	Mon Aug 10 20:02:13 2009 +0200
     blend
     modes.
 
- poppler/CairoOutputDev.h |    1 +
+ poppler/CairoOutputDev.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 45dae4e66b2b833f95656850b5f1b0ffd1d96f1d
@@ -24100,7 +27278,7 @@ Date:	Mon Aug 10 20:00:04 2009 +0200
 
     Fixes launchpad bug #342282 (page 2 of the attached document)
 
- poppler/CairoOutputDev.cc |   16 +++++++++++++---
+ poppler/CairoOutputDev.cc | 16 +++++++++++++---
  1 file changed, 13 insertions(+), 3 deletions(-)
 
 commit b1cd54546844f2f7cd6bf7cc14b7584c84c3fc14
@@ -24111,7 +27289,7 @@ Date:	Mon Aug 10 19:55:44 2009 +0200
 
     Fixes bug #20491.
 
- poppler/CairoFontEngine.cc |	19 ++-----------------
+ poppler/CairoFontEngine.cc | 19 ++-----------------
  1 file changed, 2 insertions(+), 17 deletions(-)
 
 commit 4181a0ff11195eb7a56d76be23994b843e20b483
@@ -24120,7 +27298,7 @@ Date:	Mon Aug 10 19:58:09 2009 +0200
 
     this branch is unlikely to happen
 
- poppler/Lexer.cc |    2 +-
+ poppler/Lexer.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2a3025f32951ce7b7343aeef111902615d71595e
@@ -24129,7 +27307,7 @@ Date:	Mon Aug 10 19:55:40 2009 +0200
 
     fix overflow calculation not to depend on the variable overflowing
 
- poppler/Lexer.cc |   12 ++++++++----
+ poppler/Lexer.cc | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit a38001f724f78231c2fdadd28e647a35b41bab74
@@ -24140,7 +27318,7 @@ Date:	Sun Aug 9 23:26:02 2009 +0200
 
     Fixes bug 23078
 
- poppler/Lexer.cc |   28 ++++++++++++++++++++++------
+ poppler/Lexer.cc | 28 ++++++++++++++++++++++------
  1 file changed, 22 insertions(+), 6 deletions(-)
 
 commit 4c4c0e44452d07bea88d98b7df0c01fadd7693cc
@@ -24152,7 +27330,7 @@ Date:	Sat Aug 8 17:26:14 2009 +0200
 
     People should not be using internal headers but it's just two lines
 
- poppler/Object.h |    5 +++--
+ poppler/Object.h | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit e2c319ba18ab473fd969db9519a9231be67538c3
@@ -24163,7 +27341,7 @@ Date:	Sat Aug 8 00:48:18 2009 +0200
 
     Totally not optimized
 
- splash/SplashBitmap.cc |   23 ++++++++++++++++++++++-
+ splash/SplashBitmap.cc | 23 ++++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 commit c669e7f3ca421265e78161cc3fdecd2a0c7510c9
@@ -24174,8 +27352,8 @@ Date:	Sat Aug 8 00:38:50 2009 +0200
 
     Works though is non optimal
 
- splash/SplashBitmap.cc |   55
- ++++++++++++++++++++++++++++++++++--------------
+ splash/SplashBitmap.cc | 55
+ +++++++++++++++++++++++++++++++++++---------------
  1 file changed, 39 insertions(+), 16 deletions(-)
 
 commit 92744b72df9084fd2d69ba78406898378884aed8
@@ -24187,20 +27365,20 @@ Date:	Sat Aug 8 00:20:52 2009 +0200
     Based on a patch by Shen Liang <shenzhuxi@gmail.com>
     Also factored common PNG code from HtmlOutputDev to PNGWriter
 
- CMakeLists.txt		   |	5 +++
- goo/Makefile.am	   |	9 +++-
- goo/PNGWriter.cc	   |  110
- +++++++++++++++++++++++++++++++++++++++++++++
- goo/PNGWriter.h	   |   43 ++++++++++++++++++
- poppler/Makefile.am	   |	8 ++++
- splash/SplashBitmap.cc    |   70 +++++++++++++++++++++++++++++
- splash/SplashBitmap.h	   |	5 +++
- splash/SplashErrorCodes.h |	4 +-
- utils/CMakeLists.txt	   |	4 --
- utils/HtmlOutputDev.cc    |   66 +++++----------------------
- utils/Makefile.am	   |	4 --
- utils/pdftoppm.1	   |	3 ++
- utils/pdftoppm.cc	   |   21 +++++++--
+ CMakeLists.txt		   |   5 +++
+ goo/Makefile.am	   |   9 +++-
+ goo/PNGWriter.cc	   | 110
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ goo/PNGWriter.h	   |  43 ++++++++++++++++++
+ poppler/Makefile.am	   |   8 ++++
+ splash/SplashBitmap.cc    |  70 +++++++++++++++++++++++++++++
+ splash/SplashBitmap.h	   |   5 +++
+ splash/SplashErrorCodes.h |   4 +-
+ utils/CMakeLists.txt	   |   4 --
+ utils/HtmlOutputDev.cc    |  66 +++++-----------------------
+ utils/Makefile.am	   |   4 --
+ utils/pdftoppm.1	   |   3 ++
+ utils/pdftoppm.cc	   |  21 +++++++--
  13 files changed, 283 insertions(+), 69 deletions(-)
 
 commit e4439ff527bb202d0239f78e647452983b733411
@@ -24212,8 +27390,8 @@ Date:	Fri Aug 7 15:23:57 2009 +0200
     In that case the mask is used for clipping when drawing images. Fixes
     bug #22216.
 
- poppler/CairoOutputDev.cc |   59
- +++++++++++++++++++++++++++++----------------
+ poppler/CairoOutputDev.cc | 59
+ ++++++++++++++++++++++++++++++-----------------
  1 file changed, 38 insertions(+), 21 deletions(-)
 
 commit 7194f59a18e4f6997ae560af3db1bd101d6f726e
@@ -24227,7 +27405,7 @@ Date:	Thu Aug 6 11:24:22 2009 +0100
     read the
     file into a fresh block of memory.
 
- poppler/CairoFontEngine.cc |	 5 ++++-
+ poppler/CairoFontEngine.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 7e2bbcf6f85111d1006b0d5bc1503cadaba83c9f
@@ -24236,7 +27414,7 @@ Date:	Tue Aug 4 00:10:58 2009 +0200
 
     Set KDAB via gamaral copyright
 
- poppler/Form.cc |    3 ++-
+ poppler/Form.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ed5918e16dafebc9ecf6db8ce0186f407ecbf7d5
@@ -24245,7 +27423,7 @@ Date:	Sat Aug 1 20:00:22 2009 +0200
 
     [Qt4 apidox] make example for FontIterator... not leak ;)
 
- qt4/src/poppler-qt4.h |    2 ++
+ qt4/src/poppler-qt4.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit f3b36d9c992491e614e88dbf1a84b5433a7647f4
@@ -24261,10 +27439,10 @@ Date:	Sat Aug 1 19:54:52 2009 +0200
     Based on an initial patch by Hal V. Engel <hvengel@astound.net>,
     heavily reindented, polished and massaged in its API by me.
 
- qt4/src/poppler-document.cc |	 52
+ qt4/src/poppler-document.cc | 52
+ +++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	     | 50
  +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h	     |	 50
- +++++++++++++++++++++++++++++++++++++++++
  2 files changed, 102 insertions(+)
 
 commit 78a1969d040018c0c2bb74c94f5507f786e4666e
@@ -24273,7 +27451,7 @@ Date:	Sat Aug 1 18:00:06 2009 +0200
 
     [Qt] add unhandled cases and remove unused code
 
- qt/poppler-page.cc |	12 ++----------
+ qt/poppler-page.cc | 12 ++----------
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 commit bddebec0712e92e13b57d3d05d652673fe737866
@@ -24282,11 +27460,11 @@ Date:	Sat Aug 1 17:12:22 2009 +0200
 
     0.11.2
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   30 ++++++++++++++++++++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 30 ++++++++++++++++++++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 36 insertions(+), 6 deletions(-)
 
 commit 87e2af3454348f5568d155c15af5d85268e47f1b
@@ -24295,7 +27473,7 @@ Date:	Sat Aug 1 15:48:02 2009 +0200
 
     [glib-demo] Add cast to make sure the comparison is always valid
 
- glib/demo/attachments.c |    2 +-
+ glib/demo/attachments.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 464e95ef451103daddc9a30cd26b986291f02176
@@ -24304,7 +27482,7 @@ Date:	Sat Aug 1 15:47:25 2009 +0200
 
     [glib-demo] Add missing return
 
- glib/demo/attachments.c |    2 ++
+ glib/demo/attachments.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 7f48369e4d29b2a71abffa9e1966e3a2252de895
@@ -24314,7 +27492,7 @@ Date:	Sat Aug 1 15:41:34 2009 +0200
     Call fillChildrenSiblingsID in fillChildrenSiblingsID instaed of
     loadChildrenDefaults
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e21a3e40bf6f4365064cea751ae186580d8f81f5
@@ -24325,13 +27503,13 @@ Date:	Sat Aug 1 15:23:03 2009 +0200
 
     Bug #23030
 
- poppler/GlobalParams.cc |   17 ++++++++++++++
- poppler/GlobalParams.h  |    4 ++++
- poppler/PSOutputDev.cc  |   59
- ++++++++++++++++++++++++++---------------------
- poppler/PSOutputDev.h	 |    2 ++
- utils/pdftops.1	 |    8 ++++++-
- utils/pdftops.cc	 |    7 ++++++
+ poppler/GlobalParams.cc | 17 ++++++++++++++
+ poppler/GlobalParams.h  |  4 ++++
+ poppler/PSOutputDev.cc  | 59
+ +++++++++++++++++++++++++++----------------------
+ poppler/PSOutputDev.h	 |  2 ++
+ utils/pdftops.1	 |  8 ++++++-
+ utils/pdftops.cc	 |  7 ++++++
  6 files changed, 70 insertions(+), 27 deletions(-)
 
 commit bd68c90338cbf16f468e5db59722610300a629e1
@@ -24340,7 +27518,7 @@ Date:	Sat Aug 1 15:19:48 2009 +0200
 
     Forgot to add my copyright
 
- poppler/GfxState.h |	 1 +
+ poppler/GfxState.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 173451730948c320f16a0f5924a58302603eca0b
@@ -24352,8 +27530,8 @@ Date:	Sat Aug 1 15:13:35 2009 +0200
     Fixes rendering of PDF where forms/patterns have more q than Q. Fixes
     rendering in splash of pdf in bugs #22835, #21899 and #16402
 
- poppler/Gfx.cc     |	13 +++++++++++++
- poppler/GfxState.h |	 1 +
+ poppler/Gfx.cc     | 13 +++++++++++++
+ poppler/GfxState.h |  1 +
  2 files changed, 14 insertions(+)
 
 commit 35c408ca49be08144bcf14aa112505fd556725d2
@@ -24362,7 +27540,7 @@ Date:	Fri Jul 31 23:27:02 2009 +0200
 
     add the overloaded virtual warning also the autotools based build
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1c32bd2d101e5dfb37e28276ecad699f121b27b7
@@ -24371,9 +27549,9 @@ Date:	Fri Jul 31 23:22:25 2009 +0200
 
     Add my copyright to files i just edited
 
- poppler/OutputDev.cc  |    1 +
- poppler/OutputDev.h   |    1 +
- utils/HtmlOutputDev.h |    2 +-
+ poppler/OutputDev.cc  | 1 +
+ poppler/OutputDev.h   | 1 +
+ utils/HtmlOutputDev.h | 2 +-
  3 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 10717a48c85f1dbeff1c6bcd094006a9ecc92efc
@@ -24382,7 +27560,7 @@ Date:	Fri Jul 31 23:22:10 2009 +0200
 
     Add -Woverloaded-virtual as default CXX flag
 
- cmake/modules/PopplerMacros.cmake |	1 +
+ cmake/modules/PopplerMacros.cmake | 1 +
  1 file changed, 1 insertion(+)
 
 commit db5f736655f01575ac5d7c524cbf131924ae91fa
@@ -24394,8 +27572,8 @@ Date:	Fri Jul 31 23:12:00 2009 +0200
     That way the name is different from the OutputDev function and does
     not seem like a wrong overload
 
- utils/HtmlOutputDev.cc |    4 ++--
- utils/HtmlOutputDev.h	|    2 +-
+ utils/HtmlOutputDev.cc | 4 ++--
+ utils/HtmlOutputDev.h	| 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 4be87f87509b93c4fe4025f9bd788e9412416663
@@ -24404,9 +27582,9 @@ Date:	Fri Jul 31 23:11:32 2009 +0200
 
     Remove Outputdev::beginMarkedContent as noone uses it
 
- poppler/Gfx.cc       |    2 --
- poppler/OutputDev.cc |    3 ---
- poppler/OutputDev.h  |    1 -
+ poppler/Gfx.cc       | 2 --
+ poppler/OutputDev.cc | 3 ---
+ poppler/OutputDev.h  | 1 -
  3 files changed, 6 deletions(-)
 
 commit 6ab2ec8a89519d2bd1576c8d62f8aec51b04479a
@@ -24415,7 +27593,7 @@ Date:	Fri Jul 31 23:10:56 2009 +0200
 
     Warning--
 
- poppler/PSOutputDev.cc |    2 +-
+ poppler/PSOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 53c3d636ad645a350b576160e1498726238a7bd1
@@ -24427,13 +27605,13 @@ Date:	Fri Jul 31 18:23:57 2009 +0200
 
     Fixes bugs #10942, #14160
 
- poppler/CairoOutputDev.cc |   28 +++++++++
- poppler/CairoOutputDev.h  |	2 +
- poppler/Gfx.cc		   |  141
- +++++++++++++++++++++++++++------------------
- poppler/OutputDev.h	   |	2 +-
- poppler/PSOutputDev.cc    |	3 +-
- poppler/PSOutputDev.h	   |	2 +-
+ poppler/CairoOutputDev.cc |  28 +++++++++
+ poppler/CairoOutputDev.h  |   2 +
+ poppler/Gfx.cc		   | 141
+ +++++++++++++++++++++++++++-------------------
+ poppler/OutputDev.h	   |   2 +-
+ poppler/PSOutputDev.cc    |   3 +-
+ poppler/PSOutputDev.h	   |   2 +-
  6 files changed, 117 insertions(+), 61 deletions(-)
 
 commit 2ba937545d1a2b9fa798f04fee755ccdf0e74ec7
@@ -24442,10 +27620,10 @@ Date:	Fri Jul 31 17:49:18 2009 +0200
 
     [cairo] Use cairo_pattern_set_extend for linear gradients
 
- poppler/CairoOutputDev.cc |	9 +++++++++
- poppler/CairoOutputDev.h  |	1 +
- poppler/Gfx.cc		   |   34 ++++++++++++++++++++++++++++------
- poppler/OutputDev.h	   |	4 ++++
+ poppler/CairoOutputDev.cc |  9 +++++++++
+ poppler/CairoOutputDev.h  |  1 +
+ poppler/Gfx.cc		   | 34 ++++++++++++++++++++++++++++------
+ poppler/OutputDev.h	   |  4 ++++
  4 files changed, 42 insertions(+), 6 deletions(-)
 
 commit b054756113f0df6b59935823882f412486e96db5
@@ -24457,10 +27635,10 @@ Date:	Wed Jun 17 11:10:15 2009 +0200
     It requires cairo from git master to work at the moment. Fixes bugs
      #22384, #12979, #13603, #17919, #22255
 
- configure.ac		   |   27 +++++++++++++++++++++
- poppler/CairoOutputDev.cc |   59
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |	1 +
+ configure.ac		   | 27 ++++++++++++++++++++++
+ poppler/CairoOutputDev.cc | 59
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  |  1 +
  3 files changed, 87 insertions(+)
 
 commit bf8964726c9311e7e82b1faf49cc2272e5c1e339
@@ -24469,7 +27647,7 @@ Date:	Thu Jul 30 22:08:43 2009 +0200
 
     Fix some double to int warnings by explicit casting
 
- poppler/Gfx.cc |    7 ++++---
+ poppler/Gfx.cc | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit fdbd0c548e963461b2bc4bdf1beaa1577cafcea7
@@ -24478,9 +27656,9 @@ Date:	Thu Jul 30 21:05:18 2009 +0200
 
     Update gtk-doc build files
 
- gtk-doc.make  |  102
- ++++++++++++++++++++++++++++++++++++++-------------------
- m4/gtk-doc.m4 |   74 ++++++++++++++++++++++-------------------
+ gtk-doc.make  | 102
+ +++++++++++++++++++++++++++++++++++++++-------------------
+ m4/gtk-doc.m4 |  74 +++++++++++++++++++++++-------------------
  2 files changed, 110 insertions(+), 66 deletions(-)
 
 commit ae84dce5cea4d249526a6ed5b2feb2d3f241da1b
@@ -24493,11 +27671,11 @@ Date:	Thu Jul 30 20:45:39 2009 +0200
 
     See bug #22697.
 
- configure.ac		    |	 2 +-
- glib/reference/Makefile.am |	 4 +-
- gtk-doc.make		    |  155
- ++++++++++++++++++++++++++++++++++++++++++++
- m4/gtk-doc.m4		    |	53 +++++++++++++++
+ configure.ac		    |	2 +-
+ glib/reference/Makefile.am |	4 +-
+ gtk-doc.make		    | 155
+ +++++++++++++++++++++++++++++++++++++++++++++
+ m4/gtk-doc.m4		    |  53 ++++++++++++++++
  4 files changed, 211 insertions(+), 3 deletions(-)
 
 commit 7e14516a78b16453c747eb92b08665632e5f6844
@@ -24515,7 +27693,7 @@ Date:	Mon Jul 27 23:20:50 2009 +0200
     usemediabox = noCrop
     crop = !noCrop
 
- utils/pdftops.cc |    3 ++-
+ utils/pdftops.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 3d53a0eb14420d54c0ebf8590e34c018b8da105d
@@ -24524,7 +27702,7 @@ Date:	Sun Jul 19 16:02:33 2009 +0200
 
     Copy byte_lookup in copy constructor
 
- poppler/GfxState.cc |	  6 ++++++
+ poppler/GfxState.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 8f7271acf17c46e663cd48d90c382b04a834fba2
@@ -24549,9 +27727,9 @@ Date:	Sun Jul 19 15:53:49 2009 +0200
 
     Fixes bug #11027.
 
- poppler/GfxState.cc |	125
- ++++++++++++++++++++++++++++++---------------------
- poppler/GfxState.h  |	 21 +++++++--
+ poppler/GfxState.cc | 125
+ ++++++++++++++++++++++++++++++----------------------
+ poppler/GfxState.h  |	21 +++++++--
  2 files changed, 91 insertions(+), 55 deletions(-)
 
 commit 1bc737796bef1c65289a101b2d4c367267b9c974
@@ -24560,7 +27738,7 @@ Date:	Sun Jul 19 15:51:43 2009 +0200
 
     Remove unused variable
 
- poppler/GfxState.h |	 1 -
+ poppler/GfxState.h | 1 -
  1 file changed, 1 deletion(-)
 
 commit 512b2c654fd80c83b82e7adc828a478a18de17ab
@@ -24569,7 +27747,7 @@ Date:	Sun Jul 26 19:35:06 2009 +0200
 
     [cairo] Use CAIRO_EXTEND_PAD in drawImageMaskPrescaled too
 
- poppler/CairoOutputDev.cc |   32 +++++++++++++++-----------------
+ poppler/CairoOutputDev.cc | 32 +++++++++++++++-----------------
  1 file changed, 15 insertions(+), 17 deletions(-)
 
 commit ad26e34bede53cb6300bc463cbdcc2b5adf101c2
@@ -24580,7 +27758,7 @@ Date:	Sun Jul 26 18:36:06 2009 +0200
 
     This is just for consistency of drawImage methods
 
- poppler/CairoOutputDev.cc |   30 ++++++++++++++----------------
+ poppler/CairoOutputDev.cc | 30 ++++++++++++++----------------
  1 file changed, 14 insertions(+), 16 deletions(-)
 
 commit ee6b761a55baef4c3bbe4614b0c3b3d761a3111f
@@ -24597,7 +27775,7 @@ Date:	Sun Jul 26 16:19:15 2009 +0200
     need to compute the intersection of the mask with in the image
     in userspace.
 
- poppler/CairoOutputDev.cc |   21 ++++++++++++++-------
+ poppler/CairoOutputDev.cc | 21 ++++++++++++++-------
  1 file changed, 14 insertions(+), 7 deletions(-)
 
 commit 499c6c972bac14936b5370276da723a6e98861b3
@@ -24606,8 +27784,8 @@ Date:	Sun Jul 26 11:30:08 2009 +0200
 
     [cairo] Use CAIRO_EXTEND_PAD when drawing images
 
- poppler/CairoOutputDev.cc |  306
- +++++++++++++++++++++------------------------
+ poppler/CairoOutputDev.cc | 306
+ +++++++++++++++++++++-------------------------
  1 file changed, 140 insertions(+), 166 deletions(-)
 
 commit f91eb7d01cef0897727c63267db309bc92297d37
@@ -24618,8 +27796,8 @@ Date:	Sat Jul 25 16:34:12 2009 +0200
 
     For example fixes second pdf in bug 18908
 
- poppler/PSOutputDev.cc |   68
- ++++++++++++++++++++++++++++++++++++------------
+ poppler/PSOutputDev.cc | 68
+ +++++++++++++++++++++++++++++++++++++-------------
  1 file changed, 51 insertions(+), 17 deletions(-)
 
 commit f93f5e17d8f23f3e2862f3411f43a95b334e6c91
@@ -24634,7 +27812,7 @@ Date:	Mon Jul 20 17:10:37 2009 +0200
     so that we won't need to call colorMap->getRGBLine when filling the
     image buffer. Fixes bug #18017.
 
- poppler/CairoOutputDev.cc |   36 ++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.cc | 36 ++++++++++++++++++++++++++++++++++--
  1 file changed, 34 insertions(+), 2 deletions(-)
 
 commit e7475062b6ae5c495fa72faaf8fb3d97391f8544
@@ -24643,7 +27821,7 @@ Date:	Tue Jul 14 17:22:52 2009 +0200
 
     [cairo] Handle fontType1COT fonts in CairoFontEngine
 
- poppler/CairoFontEngine.cc |	 3 ++-
+ poppler/CairoFontEngine.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit d42b9425fb2f98fa79e7a60e4f71ef14f5bacfe9
@@ -24652,7 +27830,7 @@ Date:	Sun Jul 12 19:55:14 2009 +0200
 
     glade is not used anymore
 
- cmake/modules/FindGTK.cmake |	  9 ++++-----
+ cmake/modules/FindGTK.cmake | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
 
 commit 454f7468c6a6a442a5064b5daa24d65ebf4fc6b6
@@ -24675,7 +27853,7 @@ Date:	Thu Jul 9 10:43:00 2009 +0100
     painters to use PAD correctly, we need to review the callers to remove
     unnecessary pre-scaling.
 
- poppler/CairoOutputDev.cc |   16 ++++++++++++----
+ poppler/CairoOutputDev.cc | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 commit f8d93eae3c7b9388feabac71f2380d0b42a855e7
@@ -24684,7 +27862,7 @@ Date:	Wed Jul 8 20:14:35 2009 +0200
 
     Lookup UF and F entries before Unix, MAC and DOS in getFileSpec
 
- poppler/FileSpec.cc |	 24 ++++++++++++------------
+ poppler/FileSpec.cc | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit 767c534f5fdf6ccbccfd85a0086d72c215c278f1
@@ -24693,7 +27871,7 @@ Date:	Wed Jul 8 19:13:54 2009 +0200
 
     Use UF entry when present in dict in getFileSpecName() too
 
- poppler/FileSpec.cc |	  5 +++++
+ poppler/FileSpec.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 569627ac4d56ddd58e109ce2a37179a85e042030
@@ -24704,12 +27882,12 @@ Date:	Wed Jul 8 13:02:16 2009 +0200
 
     See bug #10942.
 
- poppler/CairoOutputDev.cc |   29 +++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |   10 ++++++++++
- poppler/Gfx.cc		   |   29 ++++++++++++++++++++---------
- poppler/OutputDev.h	   |	6 +++++-
- poppler/PSOutputDev.cc    |	2 +-
- poppler/PSOutputDev.h	   |	2 +-
+ poppler/CairoOutputDev.cc | 29 +++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  | 10 ++++++++++
+ poppler/Gfx.cc		   | 29 ++++++++++++++++++++---------
+ poppler/OutputDev.h	   |  6 +++++-
+ poppler/PSOutputDev.cc    |  2 +-
+ poppler/PSOutputDev.h	   |  2 +-
  6 files changed, 66 insertions(+), 12 deletions(-)
 
 commit 6ae0a6c0044713affa23eb1ee6a070785ed6c2f3
@@ -24724,7 +27902,7 @@ Date:	Wed Jul 8 16:48:26 2009 +0100
     this case
     it just requires zeroing out the masked pixels.
 
- poppler/CairoOutputDev.cc |	9 +++++++--
+ poppler/CairoOutputDev.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit 646e5884e748ecce7094c673400484aa1d902bdd
@@ -24739,7 +27917,7 @@ Date:	Wed Jul 8 17:00:34 2009 +0100
     array,
     [0:255].
 
- poppler/CairoOutputDev.cc |	4 ++--
+ poppler/CairoOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d75feb1ee84385a9f94308cf47a43f4583092ddf
@@ -24751,8 +27929,8 @@ Date:	Wed Jul 8 16:37:19 2009 +0100
     Just a small bit of code rearrangement to reduce repetition and
     invalid checks.
 
- poppler/CairoOutputDev.cc |  102
- ++++++++++++++++++---------------------------
+ poppler/CairoOutputDev.cc | 102
+ +++++++++++++++++++---------------------------
  1 file changed, 41 insertions(+), 61 deletions(-)
 
 commit 52f3704fed16cfc1e9dd85f72dde7922371e4099
@@ -24761,7 +27939,7 @@ Date:	Wed Jul 8 11:40:52 2009 +0200
 
     [TODO] Update TODO file
 
- TODO |    6 ++++++
+ TODO | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit ef261f5f72d37a0aa2709611ee2bad7d55340ed8
@@ -24771,8 +27949,8 @@ Date:	Tue Jul 7 10:57:31 2009 +0200
     Do not use F and UF entries if Unix or DOS are present in FileSpec
     dict
 
- poppler/FileSpec.cc |	114
- +++++++++++++++++++++++----------------------------
+ poppler/FileSpec.cc | 114
+ +++++++++++++++++++++++-----------------------------
  1 file changed, 51 insertions(+), 63 deletions(-)
 
 commit cafd4653dc6c7574214e80aa09489dcd24e347a6
@@ -24781,7 +27959,7 @@ Date:	Wed Jul 1 11:41:32 2009 +0200
 
     [glib-demo] Fix a typo
 
- glib/demo/utils.c |	2 +-
+ glib/demo/utils.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a3c9c6d0c0ee55dccd2d03f20d5683ae300cdc6b
@@ -24804,7 +27982,7 @@ Date:	Wed Jul 8 02:01:39 2009 +0200
     I was not sure about some items and Jeff Muizelaar's TODO, so I left
     them there.
 
- TODO |   47 +++++++++++++++--------------------------------
+ TODO | 47 +++++++++++++++--------------------------------
  1 file changed, 15 insertions(+), 32 deletions(-)
 
 commit 92ad0ef89fe7690d83854b4821178dfdb2e22897
@@ -24813,7 +27991,7 @@ Date:	Sat Jul 4 00:19:23 2009 +0200
 
     [Qt4 demo] hopefully fix the page size on zoom change
 
- qt4/demos/pageview.cpp |    5 +----
+ qt4/demos/pageview.cpp | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit 97094d13bc0f144b25e13c1de7a5328608ab13e3
@@ -24823,8 +28001,8 @@ Date:	Sat Jul 4 00:07:12 2009 +0200
     [Qt4 demo] show a list of checked/unchecked items for the document
     permissions
 
- qt4/demos/permissions.cpp |   25 ++++++++-----------------
- qt4/demos/permissions.h   |	6 +++---
+ qt4/demos/permissions.cpp | 25 ++++++++-----------------
+ qt4/demos/permissions.h   |  6 +++---
  2 files changed, 11 insertions(+), 20 deletions(-)
 
 commit 0d8f2ee0f03a14e7b8477c4b787c3441a758f26b
@@ -24833,7 +28011,7 @@ Date:	Fri Jul 3 23:55:42 2009 +0200
 
     [Qt4 demo] show page numbers in the toolbar as 1..n
 
- qt4/demos/navigationtoolbar.cpp |    2 +-
+ qt4/demos/navigationtoolbar.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b0d48df9121c55f8162ddf0ee63832f9adebf37b
@@ -24842,8 +28020,8 @@ Date:	Fri Jul 3 17:55:31 2009 +0200
 
     [Qt4 demo] correctly use DPI values for the page sizes
 
- qt4/demos/pageview.cpp |   12 +++++++++---
- qt4/demos/pageview.h	|    2 ++
+ qt4/demos/pageview.cpp | 12 +++++++++---
+ qt4/demos/pageview.h	|  2 ++
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 commit dcc3c384919f1562b8f312ad3ac847e23f3e83ab
@@ -24854,14 +28032,14 @@ Date:	Wed Jul 1 10:09:12 2009 +0200
 
     Fixes bug #21673
 
- cmake/modules/FindGTK.cmake |	  1 -
- configure.ac		     |	  4 +-
- test/Makefile.am	     |	  2 +-
- test/pdf-inspector.cc	     |	 34 ++--
- test/pdf-inspector.glade    |	434
- -------------------------------------------
- test/pdf-inspector.ui	     |	416
- +++++++++++++++++++++++++++++++++++++++++
+ cmake/modules/FindGTK.cmake |	 1 -
+ configure.ac		     |	 4 +-
+ test/Makefile.am	     |	 2 +-
+ test/pdf-inspector.cc	     |	34 ++--
+ test/pdf-inspector.glade    | 434
+ --------------------------------------------
+ test/pdf-inspector.ui	     | 416
+ ++++++++++++++++++++++++++++++++++++++++++
  6 files changed, 439 insertions(+), 452 deletions(-)
 
 commit 28208d1c9b8afbb769a5f4d9b0655b99fd4af16e
@@ -24872,7 +28050,7 @@ Date:	Wed Jul 1 09:52:12 2009 +0200
 
     Fixes bug #22530.
 
- glib/demo/main.c |   33 +++++++++++++++++++++++++++++++--
+ glib/demo/main.c | 33 +++++++++++++++++++++++++++++++--
  1 file changed, 31 insertions(+), 2 deletions(-)
 
 commit 6ef83414ab55294cf46b6b05813927bb04066986
@@ -24884,9 +28062,9 @@ Date:	Tue Jun 30 23:07:00 2009 +0200
 
     Fixes crash on bug 22551
 
- poppler/Annot.cc |    7 ++++---
- poppler/Link.cc  |   30 +++++++++++++++++-------------
- poppler/Sound.cc |    8 +++++---
+ poppler/Annot.cc |  7 ++++---
+ poppler/Link.cc  | 30 +++++++++++++++++-------------
+ poppler/Sound.cc |  8 +++++---
  3 files changed, 26 insertions(+), 19 deletions(-)
 
 commit 4b9db83841a8b97df1e0991c1b853897b7095777
@@ -24897,7 +28075,7 @@ Date:	Tue Jun 30 11:24:29 2009 +0200
 
     The surface is guaranteed to be cleared
 
- glib/demo/render.c |	11 ++---------
+ glib/demo/render.c | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 commit 5deb6db5d340c08f337d2ba67aa1fd690e4eedd8
@@ -24906,8 +28084,8 @@ Date:	Mon Jun 29 21:55:49 2009 +0200
 
     Fix interpolate parameter position
 
- poppler/SplashOutputDev.cc |	 3 ++-
- utils/ImageOutputDev.cc    |	 5 +++--
+ poppler/SplashOutputDev.cc | 3 ++-
+ utils/ImageOutputDev.cc    | 5 +++--
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 commit e1e9ae2826eff1665d798b4b50b5c63e8282246b
@@ -24916,7 +28094,7 @@ Date:	Sun Jun 28 20:11:42 2009 +0200
 
     [Qt4 demo] do not crash when changing the zoom with no document
 
- qt4/demos/pageview.cpp |    3 +++
+ qt4/demos/pageview.cpp | 3 +++
  1 file changed, 3 insertions(+)
 
 commit a98de97137cb343182bd03c443fc08ff4e0fd9a5
@@ -24925,11 +28103,11 @@ Date:	Sun Jun 28 19:08:02 2009 +0200
 
     [Qt4 demo] add a zoom combobox
 
- qt4/demos/navigationtoolbar.cpp |   33 ++++++++++++++++++++++++++++++++-
- qt4/demos/navigationtoolbar.h	 |    7 ++++++-
- qt4/demos/pageview.cpp		 |   14 ++++++++++++--
- qt4/demos/pageview.h		 |    6 +++++-
- qt4/demos/viewer.cpp		 |    2 ++
+ qt4/demos/navigationtoolbar.cpp | 33 ++++++++++++++++++++++++++++++++-
+ qt4/demos/navigationtoolbar.h	 |  7 ++++++-
+ qt4/demos/pageview.cpp		 | 14 ++++++++++++--
+ qt4/demos/pageview.h		 |  6 +++++-
+ qt4/demos/viewer.cpp		 |  2 ++
  5 files changed, 57 insertions(+), 5 deletions(-)
 
 commit 40002d2c765398869a3b7d8d92715f0608e39ab3
@@ -24938,7 +28116,7 @@ Date:	Sun Jun 28 16:45:19 2009 +0200
 
     Make sure the array is big enough to read from it
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0a1b41ff6de5a41e3450ecbcb1ba754dc06c29d9
@@ -24951,7 +28129,7 @@ Date:	Fri Jun 26 19:31:22 2009 +0200
     Not sure this is the best solution, but Adobe doesn't even open
     the file
 
- poppler/Form.cc |    1 +
+ poppler/Form.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6cb846664e57b02c99f1e6ad2b4e9128c9622e0a
@@ -24960,7 +28138,7 @@ Date:	Thu Jun 25 20:13:29 2009 +0200
 
     Initilize AnnotColot properly when the Array is not correct
 
- poppler/Annot.cc |    3 +++
+ poppler/Annot.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 5fdc3acb8dded2e7d08e6ef30f4c5ae1a4a11b5e
@@ -24970,8 +28148,8 @@ Date:	Mon Jun 22 21:38:23 2009 +0200
     Only change the page size when it really changes, otherwise duplex
     commands are lost
 
- poppler/PSOutputDev.cc |   10 +++++++++-
- poppler/PSOutputDev.h	|    4 ++++
+ poppler/PSOutputDev.cc | 10 +++++++++-
+ poppler/PSOutputDev.h	|  4 ++++
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit bf69beeb257cfd750c6ddc8b68aeb859b36380b2
@@ -24985,8 +28163,8 @@ Date:	Sat Jun 20 23:51:09 2009 +0200
     values for getPos(), i.e. increments by 1 when readChar() called, etc.
     Fixes bug #19706.
 
- poppler/Decrypt.cc |	 8 ++++++++
- poppler/Decrypt.h  |	 3 +++
+ poppler/Decrypt.cc | 8 ++++++++
+ poppler/Decrypt.h  | 3 +++
  2 files changed, 11 insertions(+)
 
 commit 5ee4ff2aaf98e2eaa1ec2dc9f7e659b3b01ba7bf
@@ -24995,7 +28173,7 @@ Date:	Sat Jun 20 15:00:16 2009 +0200
 
     [glib-demo] Allow using relative paths in demo application
 
- glib/demo/main.c |   17 +++++------------
+ glib/demo/main.c | 17 +++++------------
  1 file changed, 5 insertions(+), 12 deletions(-)
 
 commit a568248d3255407fcaa7368c4925c20e95619d20
@@ -25004,12 +28182,11 @@ Date:	Fri Jun 19 21:07:39 2009 +0200
 
     0.11.1
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   50
- ++++++++++++++++++++++++++++++++++++++++++++++++--
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 54 insertions(+), 8 deletions(-)
 
 commit ac99e239f2726db32617ff03174a6ce74361ea1b
@@ -25018,7 +28195,7 @@ Date:	Fri Jun 19 21:03:29 2009 +0200
 
     ship PopplerCache.h
 
- CMakeLists.txt |    1 +
+ CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 84984d2aa25917d68c9971cefe636e626eada13d
@@ -25027,7 +28204,7 @@ Date:	Fri Jun 19 20:54:15 2009 +0200
 
     Ship PopplerCache.h too
 
- poppler/Makefile.am |	  1 +
+ poppler/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3a52d46e5df8eb926b550d7f7a82f316dbf6808f
@@ -25036,7 +28213,7 @@ Date:	Fri Jun 19 17:45:44 2009 +0200
 
     [glib-demo] Destroy pattern after using it
 
- glib/demo/render.c |	 1 +
+ glib/demo/render.c | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2e97524e5d82a4c33a4e6410fead444681db6749
@@ -25046,7 +28223,7 @@ Date:	Fri Jun 19 14:20:16 2009 +0200
     [glib-demo] Use a transparent surface and fill it in white after
     rendering
 
- glib/demo/render.c |	12 +++++++++---
+ glib/demo/render.c | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 commit 009937842d5a8bfc12394e9e3ab71b7c33340a85
@@ -25055,7 +28232,7 @@ Date:	Fri Jun 19 14:10:05 2009 +0200
 
     [glib-demo] Use cairo_paint instead of rectangle + fill
 
- glib/demo/render.c |	 3 +--
+ glib/demo/render.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 7248da095f67d57c3999cee7d980e62fd8a7cf49
@@ -25067,24 +28244,24 @@ Date:	Fri Jun 19 09:37:02 2009 +0200
 
     Fixes bug #9860
 
- poppler/ArthurOutputDev.cc  |	  4 +-
- poppler/ArthurOutputDev.h   |	  5 ++-
- poppler/CairoOutputDev.cc   |	 92
- +++++++++++++++++++++++++------------------
- poppler/CairoOutputDev.h    |	 48 ++++++++++++----------
- poppler/Gfx.cc		     |	 49 +++++++++++++++++++----
- poppler/OutputDev.cc	     |	 17 +++++---
- poppler/OutputDev.h	     |	 13 +++---
- poppler/PSOutputDev.cc      |	  8 ++--
- poppler/PSOutputDev.h	     |	  8 ++--
- poppler/PreScanOutputDev.cc |	 25 ++++++++++--
- poppler/PreScanOutputDev.h  |	 25 ++++++++++--
- poppler/SplashOutputDev.cc  |	 16 +++++---
- poppler/SplashOutputDev.h   |	 12 ++++--
- utils/HtmlOutputDev.cc      |	 16 ++++----
- utils/HtmlOutputDev.h	     |	  7 ++--
- utils/ImageOutputDev.cc     |	 20 +++++-----
- utils/ImageOutputDev.h      |	 12 ++++--
+ poppler/ArthurOutputDev.cc  |	4 +-
+ poppler/ArthurOutputDev.h   |	5 ++-
+ poppler/CairoOutputDev.cc   | 92
+ ++++++++++++++++++++++++++-------------------
+ poppler/CairoOutputDev.h    | 48 ++++++++++++-----------
+ poppler/Gfx.cc		     | 49 ++++++++++++++++++++----
+ poppler/OutputDev.cc	     | 17 ++++++---
+ poppler/OutputDev.h	     | 13 ++++---
+ poppler/PSOutputDev.cc      |	8 ++--
+ poppler/PSOutputDev.h	     |	8 ++--
+ poppler/PreScanOutputDev.cc | 25 ++++++++++--
+ poppler/PreScanOutputDev.h  | 25 ++++++++++--
+ poppler/SplashOutputDev.cc  | 16 +++++---
+ poppler/SplashOutputDev.h   | 12 ++++--
+ utils/HtmlOutputDev.cc      | 16 ++++----
+ utils/HtmlOutputDev.h	     |	7 ++--
+ utils/ImageOutputDev.cc     | 20 +++++-----
+ utils/ImageOutputDev.h      | 12 ++++--
  17 files changed, 248 insertions(+), 129 deletions(-)
 
 commit 37e3f877ee725648734ff41e1e83870a210bcbd7
@@ -25095,12 +28272,12 @@ Date:	Fri Jun 19 00:37:21 2009 +0200
 
     Fixes bug 22334
 
- poppler/CMap.cc	 |   50
- +++++++++++++++++++++++++++++------------------
- poppler/CMap.h		 |   17 +++++++++++-----
- poppler/GfxFont.cc	 |   41 ++++++++++++++++++++++++++------------
- poppler/GlobalParams.cc |    6 +++---
- poppler/GlobalParams.h  |    5 +++--
+ poppler/CMap.cc	 | 50
+ ++++++++++++++++++++++++++++++-------------------
+ poppler/CMap.h		 | 17 ++++++++++++-----
+ poppler/GfxFont.cc	 | 41 +++++++++++++++++++++++++++-------------
+ poppler/GlobalParams.cc |  6 +++---
+ poppler/GlobalParams.h  |  5 +++--
  5 files changed, 77 insertions(+), 42 deletions(-)
 
 commit 47de8eef46300832556ce5ed869e391e477fd843
@@ -25112,9 +28289,9 @@ Date:	Fri Jun 19 00:30:35 2009 +0200
     For more info see bug 12014 and [poppler] Bug in JBIG2Stream from
     08-June-2009
 
- poppler/JBIG2Stream.cc |   88
- ++++++++++++++++++++++++++----------------------
- poppler/JBIG2Stream.h	|   15 +++++++++
+ poppler/JBIG2Stream.cc | 88
+ +++++++++++++++++++++++++++-----------------------
+ poppler/JBIG2Stream.h	| 15 +++++++++
  2 files changed, 63 insertions(+), 40 deletions(-)
 
 commit d30b1013ea3ce45b5ea942fe7357c0fd07ff47f4
@@ -25123,8 +28300,8 @@ Date:	Tue Jun 2 11:44:08 2009 +0200
 
     Add setOpen() and setIcon() in AnnotText
 
- poppler/Annot.cc |   25 +++++++++++++++++++++++++
- poppler/Annot.h  |    3 +++
+ poppler/Annot.cc | 25 +++++++++++++++++++++++++
+ poppler/Annot.h  |  3 +++
  2 files changed, 28 insertions(+)
 
 commit 287feffc1c1c0aa42a398fc071b489acef9ef22e
@@ -25133,8 +28310,8 @@ Date:	Tue Jun 2 11:26:40 2009 +0200
 
     Add setLabel() and setPopup() to AnnotMarkup
 
- poppler/Annot.cc |   36 ++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |    4 ++++
+ poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  4 ++++
  2 files changed, 40 insertions(+)
 
 commit 2a938af5624fbc79316dd6bee5e550f2b4270a76
@@ -25143,8 +28320,8 @@ Date:	Tue Jun 2 10:59:44 2009 +0200
 
     Add setParent() and setOpen() to AnnotPopup
 
- poppler/Annot.cc |   19 +++++++++++++++++++
- poppler/Annot.h  |    4 ++++
+ poppler/Annot.cc | 19 +++++++++++++++++++
+ poppler/Annot.h  |  4 ++++
  2 files changed, 23 insertions(+)
 
 commit 0af5464352dfa51f0458c57a3590c847a45964c7
@@ -25153,8 +28330,8 @@ Date:	Tue Jun 2 10:37:49 2009 +0200
 
     Save parent reference of popup annotations
 
- poppler/Annot.cc |   16 +++++-----------
- poppler/Annot.h  |    4 ++--
+ poppler/Annot.cc | 16 +++++-----------
+ poppler/Annot.h  |  4 ++--
  2 files changed, 7 insertions(+), 13 deletions(-)
 
 commit fc4bc43dcd6f6871a47b9198e8c2571a5d448c3e
@@ -25163,7 +28340,7 @@ Date:	Mon Jun 1 14:52:21 2009 +0200
 
     Fix a crash in pdf-inspector
 
- test/pdf-inspector.cc |   11 +++++++++++
+ test/pdf-inspector.cc | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 commit 3da7a2657892fde52b62e1f73476cb33d6c75e96
@@ -25172,8 +28349,8 @@ Date:	Fri May 29 13:35:39 2009 +0200
 
     Add Annot::setColor()
 
- poppler/Annot.cc |   19 ++++++++++++++++++-
- poppler/Annot.h  |    6 +++++-
+ poppler/Annot.cc | 19 ++++++++++++++++++-
+ poppler/Annot.h  |  6 +++++-
  2 files changed, 23 insertions(+), 2 deletions(-)
 
 commit 3eabdf57729852205855cf74ff2d2f9d7bc03f73
@@ -25183,8 +28360,8 @@ Date:	Fri May 29 13:23:26 2009 +0200
     Add construtors to create AnnotColor objects directly from color
     values
 
- poppler/Annot.cc |   26 ++++++++++++++++++++++++++
- poppler/Annot.h  |    3 +++
+ poppler/Annot.cc | 26 ++++++++++++++++++++++++++
+ poppler/Annot.h  |  3 +++
  2 files changed, 29 insertions(+)
 
 commit 8045e7a1a84a3d54a1c9415ac63b5b9df5ecc349
@@ -25193,8 +28370,8 @@ Date:	Fri May 29 13:06:40 2009 +0200
 
     Add Page::addAnnot() to add a new annotation to the page
 
- poppler/Page.cc |   28 ++++++++++++++++++++++++++++
- poppler/Page.h  |    2 ++
+ poppler/Page.cc | 28 ++++++++++++++++++++++++++++
+ poppler/Page.h  |  2 ++
  2 files changed, 30 insertions(+)
 
 commit fe80eb84ec711b7400cef95e791a74c8fd259af7
@@ -25203,7 +28380,7 @@ Date:	Fri May 29 13:00:19 2009 +0200
 
     Add getRef() to get the annotation reference
 
- poppler/Annot.h |    1 +
+ poppler/Annot.h | 1 +
  1 file changed, 1 insertion(+)
 
 commit 1c92657be72c44dba7185808ffb00dd85c5ab289
@@ -25214,9 +28391,9 @@ Date:	Fri May 29 12:14:02 2009 +0200
 
     This is needed to be able to modify the page object.
 
- poppler/Catalog.cc |	 2 +-
- poppler/Page.cc    |	 6 +++++-
- poppler/Page.h     |	 4 +++-
+ poppler/Catalog.cc | 2 +-
+ poppler/Page.cc    | 6 +++++-
+ poppler/Page.h     | 4 +++-
  3 files changed, 9 insertions(+), 3 deletions(-)
 
 commit 4ad2d663262008e4b97342c4ed67c686ff5abd13
@@ -25230,9 +28407,9 @@ Date:	Fri May 29 11:43:30 2009 +0200
     arguments,
     setters will be added for the other fields.
 
- poppler/Annot.cc |  300
- ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h  |   22 +++-
+ poppler/Annot.cc | 300
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h  |  22 +++-
  2 files changed, 315 insertions(+), 7 deletions(-)
 
 commit e5c4862b0c1b08a0fab47070cb9c862026e93567
@@ -25241,7 +28418,7 @@ Date:	Wed Jun 10 23:28:03 2009 +0200
 
     ignore++
 
- m4/.gitignore |    5 +++++
+ m4/.gitignore | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 572779f8037763c1e0ee64c47a3dad6df0d3b693
@@ -25250,7 +28427,7 @@ Date:	Wed Jun 10 22:55:26 2009 +0200
 
     Fix dashed line in page 1 of bug 20011
 
- poppler/Gfx.cc |    6 ++----
+ poppler/Gfx.cc | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit b97591672e0d9c31a3d044fe52e34cc80a491221
@@ -25264,7 +28441,7 @@ Date:	Wed Jun 10 22:54:57 2009 +0200
     This is wrong and the fillColor may be uninitialized.
     See bug 20011
 
- poppler/Gfx.cc |   13 +++++++++++--
+ poppler/Gfx.cc | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 commit a92b38836b1e4475d5a7a1b9cb8f3e9429cef275
@@ -25274,9 +28451,9 @@ Date:	Tue Jun 9 22:39:19 2009 +0200
     Correctly duplicate the cache on PostScriptFunction(PostScriptFunction
     *func)
 
- poppler/Function.cc	 |   28 ++++++++++++++++++++++++++++
- poppler/PopplerCache.cc |   20 ++++++++++++++++++++
- poppler/PopplerCache.h  |   14 ++++++++++++++
+ poppler/Function.cc	 | 28 ++++++++++++++++++++++++++++
+ poppler/PopplerCache.cc | 20 ++++++++++++++++++++
+ poppler/PopplerCache.h  | 14 ++++++++++++++
  3 files changed, 62 insertions(+)
 
 commit 2cecdf922f4c8178b0e55d3ddf86c31f8be3313a
@@ -25285,7 +28462,7 @@ Date:	Tue Jun 9 11:04:39 2009 +0200
 
     [glib] Fix a crash when a destination points to an invalid page
 
- glib/poppler-action.cc |   21 +++++++++++++--------
+ glib/poppler-action.cc | 21 +++++++++++++--------
  1 file changed, 13 insertions(+), 8 deletions(-)
 
 commit 831288c13c3a7502bbccd1313c6e376283be367c
@@ -25298,7 +28475,7 @@ Date:	Sun Jun 7 18:37:20 2009 +0200
     rotate in the reverse direction
     Makes it be 33% of exec() instead of 42%
 
- poppler/Function.cc |	 19 ++++++++++++++-----
+ poppler/Function.cc | 19 ++++++++++++++-----
  1 file changed, 14 insertions(+), 5 deletions(-)
 
 commit 3d40dcad850a2bc0e28845a15722db0c79920135
@@ -25307,9 +28484,9 @@ Date:	Sun Jun 7 13:38:50 2009 +0200
 
     Move the GfxState cache to the new poppler cache class
 
- poppler/GfxState.cc |	 97
- ++++++++++++++++++++++++---------------------------
- poppler/GfxState.h  |	 19 ++--------
+ poppler/GfxState.cc | 97
+ +++++++++++++++++++++++++----------------------------
+ poppler/GfxState.h  | 19 ++---------
  2 files changed, 49 insertions(+), 67 deletions(-)
 
 commit 2619e09833f421fb3d8cc68d41d15081ae6824e4
@@ -25320,9 +28497,9 @@ Date:	Sun Jun 7 13:37:40 2009 +0200
 
     Makes time of rendering of bug 21562 go down from 24 to 8 seconds
 
- poppler/Function.cc |	 76
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Function.h  |	  2 ++
+ poppler/Function.cc | 76
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Function.h  |	2 ++
  2 files changed, 78 insertions(+)
 
 commit 588bfe3c14f42be492066c2a98e30482475a6926
@@ -25331,11 +28508,11 @@ Date:	Sun Jun 7 13:36:39 2009 +0200
 
     Add a code to a generic cache based on Koji's code for GfxState cache
 
- CMakeLists.txt		 |    1 +
- poppler/Makefile.am	 |    1 +
- poppler/PopplerCache.cc |   82
- +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/PopplerCache.h  |   47 +++++++++++++++++++++++++++
+ CMakeLists.txt		 |  1 +
+ poppler/Makefile.am	 |  1 +
+ poppler/PopplerCache.cc | 82
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PopplerCache.h  | 47 ++++++++++++++++++++++++++++
  4 files changed, 131 insertions(+)
 
 commit d09478fcc44b5c594f1803fc24654af5e10fa129
@@ -25344,7 +28521,7 @@ Date:	Sun Jun 7 01:34:01 2009 +0200
 
     Move index and pop to class definition too
 
- poppler/Function.cc |	 32 +++++++++++++++-----------------
+ poppler/Function.cc | 32 +++++++++++++++-----------------
  1 file changed, 15 insertions(+), 17 deletions(-)
 
 commit 2083264e8ab0fd9976294de08a18de615d5a1168
@@ -25356,8 +28533,8 @@ Date:	Sun Jun 7 01:21:19 2009 +0200
     Make gcc inline the functions and time to render a heavy PSFunction
     doc goes from 28 to 20 secs
 
- poppler/Function.cc |	151
- ++++++++++++++++++++++++---------------------------
+ poppler/Function.cc | 151
+ ++++++++++++++++++++++++----------------------------
  1 file changed, 71 insertions(+), 80 deletions(-)
 
 commit 24580fcd2be74db5f3140bdb2ebff8431b7d3f1e
@@ -25366,7 +28543,7 @@ Date:	Sat Jun 6 16:17:26 2009 +0200
 
     Add a debug saying how much rendering took
 
- qt4/tests/test-poppler-qt4.cpp |    2 ++
+ qt4/tests/test-poppler-qt4.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 50cf7cffff760e41774957ad8f1f92803142438e
@@ -25377,7 +28554,7 @@ Date:	Sat Jun 6 16:04:54 2009 +0200
 
     Fixes bug #21361.
 
- test/gtk-cairo-test.cc |    4 +++-
+ test/gtk-cairo-test.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592
@@ -25388,11 +28565,11 @@ Date:	Sat Jun 6 12:13:48 2009 +0200
 
     See bug #22094
 
- configure.ac		    |	 2 +-
- glib/reference/Makefile.am |	 4 +-
- gtk-doc.make		    |  155
- --------------------------------------------
- m4/gtk-doc.m4		    |	53 ---------------
+ configure.ac		    |	2 +-
+ glib/reference/Makefile.am |	4 +-
+ gtk-doc.make		    | 155
+ ---------------------------------------------
+ m4/gtk-doc.m4		    |  53 ----------------
  4 files changed, 3 insertions(+), 211 deletions(-)
 
 commit c94e476dbff9e527c72e52377d830f35f29ba3d6
@@ -25402,7 +28579,7 @@ Date:	Fri Jun 5 11:09:44 2009 +0200
     when showing the tooltip for a text rect, show also its index in
     the page text boxes list
 
- qt4/tests/test-poppler-qt4.cpp |    6 +++++-
+ qt4/tests/test-poppler-qt4.cpp | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit 2298acac267257b1916c802bdb902428e69e683b
@@ -25411,7 +28588,7 @@ Date:	Fri Jun 5 11:08:51 2009 +0200
 
     [Qt4 apidox] FontInterator is new in 0.12
 
- qt4/src/poppler-qt4.h |    2 ++
+ qt4/src/poppler-qt4.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 37c48c2521c623c485841472c4a174a1841aea33
@@ -25423,8 +28600,8 @@ Date:	Fri Jun 5 10:54:30 2009 +0200
     Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and
     POPPLER_CHECK_VERSION macro. FDO bug #22091.
 
- CMakeLists.txt		       |    5 ++++-
- glib/poppler-features.h.cmake |    9 +++++++++
+ CMakeLists.txt		       | 5 ++++-
+ glib/poppler-features.h.cmake | 9 +++++++++
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit 26f6fb1d79c2589829cd896d57da63d16641f307
@@ -25434,8 +28611,8 @@ Date:	Fri Jun 5 10:51:26 2009 +0200
     [CMake] switch poppler-features.h.cmake to a more autotools-like
     syntax
 
- glib/CMakeLists.txt	       |    2 +-
- glib/poppler-features.h.cmake |    2 +-
+ glib/CMakeLists.txt	       | 2 +-
+ glib/poppler-features.h.cmake | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 89704635b727db42f6c72ba101091eb7eddb967a
@@ -25444,7 +28621,7 @@ Date:	Fri Jun 5 10:39:17 2009 +0200
 
     [Qt4 demo] compile the new thumbnail module with autotools as well
 
- qt4/demos/Makefile.am |    3 +++
+ qt4/demos/Makefile.am | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 291bafe64c8755fe5f85a51b184ac6e3d3170e1d
@@ -25455,7 +28632,7 @@ Date:	Fri Jun 5 10:07:16 2009 +0200
 
     Fixes bug #22095.
 
- glib/poppler-document.cc |    2 +-
+ glib/poppler-document.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0ca7e214fb5f9c9fb59792149bd23c1617d38cac
@@ -25467,12 +28644,12 @@ Date:	Thu Jun 4 22:35:40 2009 +0200
     Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and
     POPPLER_CHECK_VERSION macro. FDO bug #22091.
 
- configure.ac				   |   11 +++-
- glib/poppler-features.h.in		   |	9 ++++
- glib/reference/poppler-docs.sgml	   |	1 +
- glib/reference/poppler-sections.txt	   |   10 ++++
- glib/reference/tmpl/poppler-features.sgml |   80
- +++++++++++++++++++++++++++++
+ configure.ac				   | 11 ++++-
+ glib/poppler-features.h.in		   |  9 ++++
+ glib/reference/poppler-docs.sgml	   |  1 +
+ glib/reference/poppler-sections.txt	   | 10 ++++
+ glib/reference/tmpl/poppler-features.sgml | 80
+ +++++++++++++++++++++++++++++++
  5 files changed, 110 insertions(+), 1 deletion(-)
 
 commit 4ce04da0040e5a2626c110f94a128e2d272401b9
@@ -25485,7 +28662,7 @@ Date:	Thu Jun 4 23:05:22 2009 +0200
     For items represented in the Opt array by a two-element array,
     the name string is the second of the two array elements.
 
- poppler/Form.cc |    5 +++--
+ poppler/Form.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 7e01e37a834bfdd75d739ea2b48e9127ca7f259e
@@ -25495,7 +28672,7 @@ Date:	Thu Jun 4 20:25:55 2009 +0200
     Add part of fix for bug 20420, the other part was checked in with
     Thomas patches
 
- poppler/PSOutputDev.cc |    3 +++
+ poppler/PSOutputDev.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 50a7b4bcaa6e5f56cc25fe6936f9dc537a1b4b37
@@ -25510,8 +28687,8 @@ Date:	Thu Jun 4 20:19:03 2009 +0200
     "UTF-16BE" as encoding names rather than the less portable
     "UTF8" and "UTF16BE" -- this makes it work on NetBSD.
 
- glib/poppler-annot.cc	    |	 2 +-
- glib/poppler-form-field.cc |	 4 ++--
+ glib/poppler-annot.cc	    | 2 +-
+ glib/poppler-form-field.cc | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 2cf9e6a2318b770ae62572944c687576d1801d31
@@ -25522,10 +28699,10 @@ Date:	Thu Jun 4 19:48:42 2009 +0200
 
     Fixes byg #19777
 
- poppler/PSOutputDev.cc |   31 +++++++++++++++++++++++++++++--
- poppler/PSOutputDev.h	|    4 +++-
- utils/pdftops.1	|   26 +++++++++++++++++++++-----
- utils/pdftops.cc	|   17 ++++++++++++-----
+ poppler/PSOutputDev.cc | 31 +++++++++++++++++++++++++++++--
+ poppler/PSOutputDev.h	|  4 +++-
+ utils/pdftops.1	| 26 +++++++++++++++++++++-----
+ utils/pdftops.cc	| 17 ++++++++++++-----
  4 files changed, 65 insertions(+), 13 deletions(-)
 
 commit 30fb7cb7e47cf6a8008c5083c8d0978fdfdf8e62
@@ -25534,7 +28711,7 @@ Date:	Thu Jun 4 19:25:22 2009 +0200
 
     Add missing { }
 
- poppler/Gfx.cc |    4 ++--
+ poppler/Gfx.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 1beec21ed3a016998fee3849d460166895db9047
@@ -25545,7 +28722,7 @@ Date:	Wed Jun 3 22:37:43 2009 +0200
 
     Fixes bug #22026
 
- poppler/PSOutputDev.cc |    4 ++++
+ poppler/PSOutputDev.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit e80d645c34c7d44d1f35da0a25669d1c4cde6e7f
@@ -25556,7 +28733,7 @@ Date:	Wed Jun 3 22:00:49 2009 +0200
 
     Fixes bug 22025, based on a patch by William Bader
 
- poppler/CharCodeToUnicode.cc |    9 ++++++---
+ poppler/CharCodeToUnicode.cc | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit e521c1efaeba3f35d10e46bca3d9650dabd2d889
@@ -25565,9 +28742,9 @@ Date:	Wed Jun 3 22:08:57 2009 +0930
 
     Implement text in pattern colorspace for the cairo backend
 
- poppler/CairoOutputDev.cc |   47
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |   19 ++++++++++++++++++
+ poppler/CairoOutputDev.cc | 47
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  | 19 +++++++++++++++++++
  2 files changed, 66 insertions(+)
 
 commit a87978b09a026b2db6b0f80271d87b44b336a121
@@ -25576,7 +28753,7 @@ Date:	Wed Jun 3 13:49:56 2009 +0200
 
     [Qt4 demo] show the checksum for embedded files
 
- qt4/demos/embeddedfiles.cpp |	  4 +++-
+ qt4/demos/embeddedfiles.cpp | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit db5102842494a124d813db1696bb60820db3442b
@@ -25587,12 +28764,12 @@ Date:	Wed Jun 3 13:21:22 2009 +0200
 
     poppler-qt4 requires Qt 4.3, so checking for 4.2 is no more needed
 
- qt4/demos/embeddedfiles.cpp |	  2 --
- qt4/demos/fonts.cpp	     |	  2 --
- qt4/demos/info.cpp	     |	  2 --
- qt4/demos/optcontent.cpp    |	  2 --
- qt4/demos/permissions.cpp   |	  2 --
- qt4/demos/toc.cpp	     |	  2 --
+ qt4/demos/embeddedfiles.cpp | 2 --
+ qt4/demos/fonts.cpp	     | 2 --
+ qt4/demos/info.cpp	     | 2 --
+ qt4/demos/optcontent.cpp    | 2 --
+ qt4/demos/permissions.cpp   | 2 --
+ qt4/demos/toc.cpp	     | 2 --
  6 files changed, 12 deletions(-)
 
 commit e8d897581656ee4a20e9bb87dd999425663ace3b
@@ -25601,11 +28778,11 @@ Date:	Wed Jun 3 02:54:29 2009 +0200
 
     [Qt4 demo] simplier way to change page from the thumbnail view
 
- qt4/demos/pageview.cpp   |    5 -----
- qt4/demos/pageview.h	  |    3 ---
- qt4/demos/thumbnails.cpp |    2 +-
- qt4/demos/thumbnails.h   |    3 ---
- qt4/demos/viewer.cpp	  |    1 -
+ qt4/demos/pageview.cpp   | 5 -----
+ qt4/demos/pageview.h	  | 3 ---
+ qt4/demos/thumbnails.cpp | 2 +-
+ qt4/demos/thumbnails.h   | 3 ---
+ qt4/demos/viewer.cpp	  | 1 -
  5 files changed, 1 insertion(+), 13 deletions(-)
 
 commit f69a4fe47d3478cccbc03e4ac0929c7eada681c0
@@ -25619,11 +28796,11 @@ Date:	Wed Jun 3 01:24:21 2009 +0200
     reworked by me to be a QListWidget showing the page items at their
     full size.
 
- qt4/demos/CMakeLists.txt |    1 +
- qt4/demos/thumbnails.cpp |   84
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/thumbnails.h   |   51 ++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp	  |   11 +++++-
+ qt4/demos/CMakeLists.txt |  1 +
+ qt4/demos/thumbnails.cpp | 84
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/thumbnails.h   | 51 +++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	  | 11 ++++++-
  4 files changed, 146 insertions(+), 1 deletion(-)
 
 commit 2f24ac0f4bbd6de1c9f137110b3ac2bd3b23b0b9
@@ -25632,8 +28809,8 @@ Date:	Wed Jun 3 01:22:31 2009 +0200
 
     [Qt4 demo] add a public slot to set the current page
 
- qt4/demos/pageview.cpp |    5 +++++
- qt4/demos/pageview.h	|    3 +++
+ qt4/demos/pageview.cpp | 5 +++++
+ qt4/demos/pageview.h	| 3 +++
  2 files changed, 8 insertions(+)
 
 commit 1f1baf186f9e37606765e51ec5b9893ddfbfa893
@@ -25646,8 +28823,8 @@ Date:	Wed Jun 3 01:19:16 2009 +0200
     present in the document.
     Reindented by me, and avoid a memory leak because of non-freed data.
 
- qt4/src/poppler-page.cc |   21 ++++++++++++++++++++-
- qt4/src/poppler-qt4.h	 |   11 +++++++++++
+ qt4/src/poppler-page.cc | 21 ++++++++++++++++++++-
+ qt4/src/poppler-qt4.h	 | 11 +++++++++++
  2 files changed, 31 insertions(+), 1 deletion(-)
 
 commit 5cc24be1e9af0a27ab88ffa719bcabc2378868e4
@@ -25656,7 +28833,7 @@ Date:	Wed Jun 3 00:05:54 2009 +0200
 
     Remove unused variables
 
- poppler/SplashOutputDev.cc |	 3 ---
+ poppler/SplashOutputDev.cc | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 45823bf8f4abacbbf257f6708264de074eda3cf4
@@ -25665,7 +28842,7 @@ Date:	Wed Jun 3 00:02:54 2009 +0200
 
     Make it compile :-/
 
- poppler/SplashOutputDev.cc |	 8 ++++++--
+ poppler/SplashOutputDev.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit f5ae14907261a46c121f3ed7aea9d7ad9b9c55de
@@ -25674,7 +28851,7 @@ Date:	Tue Jun 2 23:52:59 2009 +0200
 
     Really fix the typo
 
- README |    2 +-
+ README | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5d4b1995cdd57db7cef3d88704850aaf66ed7fff
@@ -25683,7 +28860,7 @@ Date:	Tue Jun 2 23:10:53 2009 +0200
 
     Fix three typos in README
 
- README |    6 +++---
+ README | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 104f9286ceb5fcb5f4795bca7633029142d5f6a4
@@ -25699,18 +28876,18 @@ Date:	Tue Jun 2 22:59:42 2009 +0200
     pdf suite and did not fit anything that went worse, just improvements
     Missing the Cairo support
 
- CMakeLists.txt		    |	 1 +
- poppler/Gfx.cc		    |  135 ++++++++++++---
- poppler/Gfx.h		    |	 7 +
- poppler/GfxState.cc	    |	58 +------
- poppler/GfxState_helpers.h |	80 +++++++++
- poppler/Makefile.am	    |	 1 +
- poppler/OutputDev.h	    |	14 ++
- poppler/PSOutputDev.cc     |  285 ++++++++++++++++++-------------
- poppler/PSOutputDev.h	    |	18 ++
- poppler/SplashOutputDev.cc |  404
- +++++++++++++++++++++++++++++++++++++-------
- poppler/SplashOutputDev.h  |	19 +++
+ CMakeLists.txt		    |	1 +
+ poppler/Gfx.cc		    | 135 ++++++++++++---
+ poppler/Gfx.h		    |	7 +
+ poppler/GfxState.cc	    |  58 +------
+ poppler/GfxState_helpers.h |  80 +++++++++
+ poppler/Makefile.am	    |	1 +
+ poppler/OutputDev.h	    |  14 ++
+ poppler/PSOutputDev.cc     | 285 +++++++++++++++++++-------------
+ poppler/PSOutputDev.h	    |  18 ++
+ poppler/SplashOutputDev.cc | 404
+ ++++++++++++++++++++++++++++++++++++++-------
+ poppler/SplashOutputDev.h  |  19 +++
  11 files changed, 766 insertions(+), 256 deletions(-)
 
 commit d3e4563146cbff4cb507522783e60462461c7524
@@ -25720,7 +28897,7 @@ Date:	Sun May 31 23:23:07 2009 +0200
     Set memory to 0 after allocation, fixes problems on Sun machines,
     should not hurt for others
 
- poppler/GfxState.cc |	  5 +++++
+ poppler/GfxState.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 78a58931b4347ecb505bad5a51104382ef5f91c7
@@ -25729,7 +28906,7 @@ Date:	Sun May 31 22:52:23 2009 +0200
 
     Add splashClearColor that assigns white to the given colorptr
 
- splash/SplashTypes.h |   10 ++++++++++
+ splash/SplashTypes.h | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 47c26747b32c242ec8ac60e7b93150a67eb22e31
@@ -25739,7 +28916,7 @@ Date:	Sun May 31 22:51:22 2009 +0200
     Fix splashColorModeNComps to correctly include all values for each
     SplashColorMode
 
- splash/SplashState.cc |   17 +++++++++++++++++
+ splash/SplashState.cc | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit 41775d8c0b44bf591d8ff5ede7fad276e8fa9eef
@@ -25748,7 +28925,7 @@ Date:	Mon Jun 1 15:24:24 2009 +0200
 
     [glib-demo] Use poppler_annot_markup_has_popup()
 
- glib/demo/annots.c |	 7 ++++---
+ glib/demo/annots.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit f542c5294394e837298cb7e7d1d94bb336bfd09d
@@ -25757,8 +28934,8 @@ Date:	Mon Jun 1 15:24:04 2009 +0200
 
     [glib] Add poppler_annot_markup_has_popup()
 
- glib/poppler-annot.cc |   20 ++++++++++++++++++++
- glib/poppler-annot.h  |    1 +
+ glib/poppler-annot.cc | 20 ++++++++++++++++++++
+ glib/poppler-annot.h  |  1 +
  2 files changed, 21 insertions(+)
 
 commit af32d56af779edcc539b680e634755941d1bf45c
@@ -25767,17 +28944,17 @@ Date:	Thu May 21 00:37:18 2009 +0200
 
     Add the possibility of forcing no hinting of fonts
 
- poppler/ArthurOutputDev.cc   |    2 ++
- poppler/GlobalParams.cc      |   20 +++++++++++
- poppler/GlobalParams.h       |    4 +++
- poppler/SplashOutputDev.cc   |    2 ++
- splash/SplashFTFont.cc       |   76
- ++++++++++++++++++++++++++----------------
- splash/SplashFTFont.h	      |    2 ++
- splash/SplashFTFontEngine.cc |    8 +++--
- splash/SplashFTFontEngine.h  |    6 ++--
- splash/SplashFontEngine.cc   |    4 ++-
- splash/SplashFontEngine.h    |    2 ++
+ poppler/ArthurOutputDev.cc   |  2 ++
+ poppler/GlobalParams.cc      | 20 ++++++++++++
+ poppler/GlobalParams.h       |  4 +++
+ poppler/SplashOutputDev.cc   |  2 ++
+ splash/SplashFTFont.cc       | 76
+ +++++++++++++++++++++++++++-----------------
+ splash/SplashFTFont.h	      |  2 ++
+ splash/SplashFTFontEngine.cc |  8 +++--
+ splash/SplashFTFontEngine.h  |  6 ++--
+ splash/SplashFontEngine.cc   |  4 ++-
+ splash/SplashFontEngine.h    |  2 ++
  10 files changed, 91 insertions(+), 35 deletions(-)
 
 commit 1a69d9638214943b3c2278f570694d9722a5de15
@@ -25788,7 +28965,7 @@ Date:	Wed May 20 23:58:44 2009 +0200
 
     Fixes crash on pdf from bug 20108
 
- poppler/GfxState.cc |	  8 ++++++--
+ poppler/GfxState.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit 95246d39c1289111a4ba3eb2ffbec50d7702e5eb
@@ -25800,7 +28977,7 @@ Date:	Wed May 20 23:20:20 2009 +0200
 
     Fixes bug #21841
 
- poppler/Gfx.cc |   11 ++++++++++-
+ poppler/Gfx.cc | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 0c3517bfb4e1e1a28962f8d490ad69ec5766b6a1
@@ -25812,7 +28989,7 @@ Date:	Wed May 20 23:08:41 2009 +0200
     Still does not generate a correct ps file, but at least the program
     does not crash now
 
- fofi/FoFiTrueType.cc |    5 ++++-
+ fofi/FoFiTrueType.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 548c72600b8a5e076647041660ed5031feedc7cc
@@ -25823,7 +29000,7 @@ Date:	Wed May 20 22:43:11 2009 +0200
 
     PDF is 0f03b3539a436a9f18d7e4e29d410f89  6607907.pdf
 
- poppler/JBIG2Stream.cc |    8 +++++++-
+ poppler/JBIG2Stream.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit f78d3a7ff5ef4b500d76d84ebc45aac3be162dab
@@ -25832,9 +29009,9 @@ Date:	Mon May 18 20:44:40 2009 +0200
 
     Move lcms.h include to GfxState.cc, replace lcms typedefs by void *
 
- poppler/GfxState.cc |	 70
- ++++++++++++++++++++++++++++++++++++++++++++-------
- poppler/GfxState.h  |	 64 +++++++++++-----------------------------------
+ poppler/GfxState.cc | 70
+ ++++++++++++++++++++++++++++++++++++++++++++++-------
+ poppler/GfxState.h  | 64 +++++++++++-------------------------------------
  2 files changed, 75 insertions(+), 59 deletions(-)
 
 commit ec2467f9981b7e7c23d5dcd8eabf2e7c8cdf8930
@@ -25843,8 +29020,8 @@ Date:	Sun May 17 20:00:53 2009 +0200
 
     Use the lcms include dir
 
- CMakeLists.txt      |	  3 +++
- poppler/Makefile.am |	  2 ++
+ CMakeLists.txt      | 3 +++
+ poppler/Makefile.am | 2 ++
  2 files changed, 5 insertions(+)
 
 commit e0fcf7055af480498a81a000dcd9f977a783df66
@@ -25853,8 +29030,8 @@ Date:	Sun May 17 12:07:05 2009 +0200
 
     Use pkgconfig for autotools cms check
 
- configure.ac	     |	 12 +++++++-----
- poppler/Makefile.am |	  2 +-
+ configure.ac	     | 12 +++++++-----
+ poppler/Makefile.am |	2 +-
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 commit 657734c19274ab281328cba9297eca45e48777aa
@@ -25863,8 +29040,8 @@ Date:	Sun May 17 12:06:47 2009 +0200
 
     Better lcms check comming from kdelibs
 
- cmake/modules/FindLCMS.cmake |   95
- +++++++++++++++++++++++++++++++-----------
+ cmake/modules/FindLCMS.cmake | 95
+ +++++++++++++++++++++++++++++++++-----------
  1 file changed, 71 insertions(+), 24 deletions(-)
 
 commit 0974b7b4bfe3f8cf3a1408741ddf01c667c28044
@@ -25873,8 +29050,8 @@ Date:	Thu May 14 16:15:22 2009 +0200
 
     [Win32] Build fix for MSVC.
 
- poppler-config.h.cmake      |	  2 +-
- poppler/poppler-config.h.in |	  2 +-
+ poppler-config.h.cmake      | 2 +-
+ poppler/poppler-config.h.in | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit d1c0e8a6c63361304cd453bb4c51e84a1aab7efa
@@ -25885,13 +29062,13 @@ Date:	Thu May 14 00:29:18 2009 +0200
 
     We don't use it and it would not work anyway, see bug #21713
 
- goo/gfile.cc		      |   58
- ++++++++++--------------------------------
- goo/gfile.h		      |    3 ++-
- poppler/CairoFontEngine.cc   |    6 ++---
- splash/SplashFTFontEngine.cc |    3 ++-
- splash/SplashT1FontEngine.cc |    3 ++-
- splash/SplashT1FontFile.cc   |    3 ++-
+ goo/gfile.cc		      | 58
+ ++++++++++----------------------------------
+ goo/gfile.h		      |  3 ++-
+ poppler/CairoFontEngine.cc   |  6 ++---
+ splash/SplashFTFontEngine.cc |  3 ++-
+ splash/SplashT1FontEngine.cc |  3 ++-
+ splash/SplashT1FontFile.cc   |  3 ++-
  6 files changed, 24 insertions(+), 52 deletions(-)
 
 commit e237d8b5c2ae8805487a0790d9fb218263686712
@@ -25901,7 +29078,7 @@ Date:	Wed May 13 18:37:07 2009 +0200
     [Qt4] we don't need an output device anymore (since long, even)
     for resolving destinations
 
- qt4/src/poppler-document.cc |	  3 ---
+ qt4/src/poppler-document.cc | 3 ---
  1 file changed, 3 deletions(-)
 
 commit 9a2a851da93ef1a0c291fc9523a468e808ffd08e
@@ -25918,11 +29095,11 @@ Date:	Wed May 13 18:19:11 2009 +0200
     situations, and resolve the named when necessary, using
     Document::linkDestination(QString).
 
- qt4/src/poppler-document.cc |	  2 +-
- qt4/src/poppler-link.cc     |	  2 +-
- qt4/src/poppler-page.cc     |	  6 ++++--
- qt4/src/poppler-private.cc  |	  4 ++--
- qt4/src/poppler-private.h   |	  5 +++--
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-link.cc     | 2 +-
+ qt4/src/poppler-page.cc     | 6 ++++--
+ qt4/src/poppler-private.cc  | 4 ++--
+ qt4/src/poppler-private.h   | 5 +++--
  5 files changed, 11 insertions(+), 8 deletions(-)
 
 commit 51f6cc26fc5fdccce1ba4d4816dec374ce85d67a
@@ -25931,10 +29108,10 @@ Date:	Wed May 13 17:38:00 2009 +0200
 
     [Qt4] start a (basic) unit test for links & destinations
 
- qt4/tests/CMakeLists.txt  |	1 +
- qt4/tests/Makefile.am	   |	5 +++
- qt4/tests/check_links.cpp |   96
- +++++++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/CMakeLists.txt  |  1 +
+ qt4/tests/Makefile.am	   |  5 +++
+ qt4/tests/check_links.cpp | 96
+ +++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 102 insertions(+)
 
 commit 174f8087f5e09c5d1915de128b7a15acf47c1e13
@@ -25943,7 +29120,7 @@ Date:	Wed May 13 16:44:59 2009 +0200
 
     [Qt4] set the destination name only when it is not resolved
 
- qt4/src/poppler-link.cc |    9 +++++----
+ qt4/src/poppler-link.cc | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit fb0cb2add9443992f166acdf744fbec875faaabf
@@ -25953,8 +29130,8 @@ Date:	Tue May 12 01:53:43 2009 +0200
     [Qt4] Add LinkDestination::destinationName() that returns the name
     of the current destination.
 
- qt4/src/poppler-link.cc |   10 ++++++++++
- qt4/src/poppler-link.h  |    7 +++++++
+ qt4/src/poppler-link.cc | 10 ++++++++++
+ qt4/src/poppler-link.h  |  7 +++++++
  2 files changed, 17 insertions(+)
 
 commit b8bd44f1302f7b6a6923d41c98ec74c118a5abb8
@@ -25963,13 +29140,13 @@ Date:	Mon May 11 20:49:34 2009 +0200
 
     Poppler 0.11.0 aka 0.12 Alpha 1
 
- CMakeLists.txt      |	  4 +-
- NEWS		     |	142
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac	     |	  2 +-
- msvc/config.h	     |	  6 +--
- poppler/Makefile.am |	  2 +-
- qt4/src/Doxyfile    |	  2 +-
+ CMakeLists.txt      |	 4 +-
+ NEWS		     | 142
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	     |	 2 +-
+ msvc/config.h	     |	 6 +--
+ poppler/Makefile.am |	 2 +-
+ qt4/src/Doxyfile    |	 2 +-
  6 files changed, 150 insertions(+), 8 deletions(-)
 
 commit 79bcedd5602729b959f21aed222445de621e7ecb
@@ -25978,13 +29155,13 @@ Date:	Mon May 11 19:59:57 2009 +0200
 
     Update copyright headers for previous patches
 
- poppler/ArthurOutputDev.cc |	 1 +
- poppler/CairoOutputDev.cc  |	 2 +-
- poppler/Page.cc	    |	 2 +-
- poppler/Stream.cc	    |	 1 +
- poppler/Stream.h	    |	 1 +
- utils/HtmlOutputDev.cc     |	 1 +
- utils/ImageOutputDev.cc    |	 1 +
+ poppler/ArthurOutputDev.cc | 1 +
+ poppler/CairoOutputDev.cc  | 2 +-
+ poppler/Page.cc	    | 2 +-
+ poppler/Stream.cc	    | 1 +
+ poppler/Stream.h	    | 1 +
+ utils/HtmlOutputDev.cc     | 1 +
+ utils/ImageOutputDev.cc    | 1 +
  7 files changed, 7 insertions(+), 2 deletions(-)
 
 commit f16e36df3a74e1adf14513a6340be2e8665f8d65
@@ -25993,7 +29170,7 @@ Date:	Sun May 10 19:24:32 2009 +0200
 
     Don't include popups annots with a parent in annots list
 
- poppler/Annot.cc |   13 +++++++++++++
+ poppler/Annot.cc | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit 5051ebed1477ff3f7721606f79d66d56a80c1145
@@ -26002,13 +29179,13 @@ Date:	Sun May 10 19:10:51 2009 +0200
 
     Make sure ImageStream::close() is called after ImageStream::reset()
 
- poppler/ArthurOutputDev.cc |	 1 +
- poppler/CairoOutputDev.cc  |	20 +++++++++++++++++---
- poppler/Page.cc	    |	 1 +
- poppler/Stream.cc	    |	 4 ++++
- poppler/Stream.h	    |	 3 +++
- utils/HtmlOutputDev.cc     |	 1 +
- utils/ImageOutputDev.cc    |	 1 +
+ poppler/ArthurOutputDev.cc |  1 +
+ poppler/CairoOutputDev.cc  | 20 +++++++++++++++++---
+ poppler/Page.cc	    |  1 +
+ poppler/Stream.cc	    |  4 ++++
+ poppler/Stream.h	    |  3 +++
+ utils/HtmlOutputDev.cc     |  1 +
+ utils/ImageOutputDev.cc    |  1 +
  7 files changed, 28 insertions(+), 3 deletions(-)
 
 commit 829ed964374676ddfa4a9048c940dc20a309ca47
@@ -26021,7 +29198,7 @@ Date:	Sun May 10 23:39:11 2009 +0200
     When j and teoricalj are the same, just change the value of ta[]
     not the next[] ones
 
- poppler/Gfx.cc |   23 ++++++++++++++++-------
+ poppler/Gfx.cc | 23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 
 commit 68d9644499676ed1553b2bfcdbfc9a5677c75345
@@ -26032,7 +29209,7 @@ Date:	Sat May 9 22:25:12 2009 +0200
 
     Fixes bug #16093
 
- poppler/Gfx.cc |    8 +++++++-
+ poppler/Gfx.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 810a71ea66f0e07d9849a5e9bf28911472482d1b
@@ -26041,9 +29218,9 @@ Date:	Fri May 8 09:36:31 2009 +0200
 
     [glib] Add poppler_annot_markup_get_popup_rectangle
 
- glib/demo/annots.c    |    8 ++++++++
- glib/poppler-annot.cc |   35 +++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h  |    2 ++
+ glib/demo/annots.c    |  8 ++++++++
+ glib/poppler-annot.cc | 35 +++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h  |  2 ++
  3 files changed, 45 insertions(+)
 
 commit 5d328282da4713356fbe4283bd992ac2fc9010a2
@@ -26053,7 +29230,7 @@ Date:	Thu May 7 23:11:55 2009 +0200
     bitmap->h can be 0, move to _checkoverflow variant, code already
     knows how to deal with NULL
 
- splash/SplashFTFont.cc |    2 +-
+ splash/SplashFTFont.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5b0fb6f94d6d54b1b0c97762db61e2ab0dd07c85
@@ -26062,7 +29239,7 @@ Date:	Wed May 6 22:59:55 2009 +0200
 
     Fix format printing
 
- poppler/JBIG2Stream.cc |    4 ++--
+ poppler/JBIG2Stream.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c21b08a254f42f53d4b59ad4fb308c7c68c32d15
@@ -26080,8 +29257,8 @@ Date:	Wed May 6 15:56:21 2009 +0200
     represent
     transparent color returning NULL, so it's actually supported.
 
- glib/demo/annots.c    |   25 +++++++++++--------------
- glib/poppler-annot.cc |   36 +++++++++++++++++++++---------------
+ glib/demo/annots.c    | 25 +++++++++++--------------
+ glib/poppler-annot.cc | 36 +++++++++++++++++++++---------------
  2 files changed, 32 insertions(+), 29 deletions(-)
 
 commit 63cc40ec02498e1ec249d5f74e23f574c665872e
@@ -26092,7 +29269,7 @@ Date:	Sat May 2 14:08:23 2009 +0200
 
     Fixes bug #21520
 
- utils/Makefile.am |   22 ++++++++++++----------
+ utils/Makefile.am | 22 ++++++++++++----------
  1 file changed, 12 insertions(+), 10 deletions(-)
 
 commit 70e06e9ae28d08bb7495a7f2eb03b0b5714a1e54
@@ -26101,8 +29278,7 @@ Date:	Wed Apr 29 09:52:21 2009 +0900
 
     PopplerAttachment refers its document.
 
- glib/poppler-attachment.cc |	41
- +++++++++++++++++++++++++++++++++++------
+ glib/poppler-attachment.cc | 41 +++++++++++++++++++++++++++++++++++------
  1 file changed, 35 insertions(+), 6 deletions(-)
 
 commit 977a13f1091700bf7e7b31859e0e6632dc323462
@@ -26111,7 +29287,7 @@ Date:	Sat Apr 25 19:07:01 2009 +0200
 
     [glib] Only create checksum string for valid checksums
 
- glib/poppler-attachment.cc |	 5 +++--
+ glib/poppler-attachment.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit fb6e7141e3008ae230ae5819e2c7a0425296d8d2
@@ -26120,12 +29296,12 @@ Date:	Fri Apr 24 10:13:53 2009 +0200
 
     Update copyright headers
 
- glib/poppler-annot.cc |    1 +
- glib/poppler-annot.h  |    1 +
- poppler/Annot.cc      |    2 +-
- poppler/Annot.h       |    2 +-
- poppler/DateInfo.cc   |    1 +
- poppler/DateInfo.h    |    1 +
+ glib/poppler-annot.cc | 1 +
+ glib/poppler-annot.h  | 1 +
+ poppler/Annot.cc      | 2 +-
+ poppler/Annot.h       | 2 +-
+ poppler/DateInfo.cc   | 1 +
+ poppler/DateInfo.h    | 1 +
  6 files changed, 6 insertions(+), 2 deletions(-)
 
 commit fc7e52fef0317f9c85ead2c4f8a0e9b688decca3
@@ -26134,7 +29310,7 @@ Date:	Fri Apr 24 09:53:41 2009 +0200
 
     Fix typos in Annot::setContents() documentation
 
- poppler/Annot.h |    2 +-
+ poppler/Annot.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit df0032cf5f6e5dc44bad056c659180e4065d32e2
@@ -26143,7 +29319,7 @@ Date:	Thu Apr 23 13:19:25 2009 +0200
 
     Document Annot::setContents() method
 
- poppler/Annot.h |    2 ++
+ poppler/Annot.h | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 86a37a8f3f93e3378b446f8d81d80571267c7660
@@ -26152,8 +29328,8 @@ Date:	Thu Apr 23 13:16:04 2009 +0200
 
     Update the annotation last modified time when it's modified
 
- poppler/Annot.cc |   26 ++++++++++++++++----------
- poppler/Annot.h  |    7 ++++---
+ poppler/Annot.cc | 26 ++++++++++++++++----------
+ poppler/Annot.h  |  7 ++++---
  2 files changed, 20 insertions(+), 13 deletions(-)
 
 commit 9662bfa2b4b2282d0fc29d2a327b62d8bde56ff2
@@ -26164,10 +29340,9 @@ Date:	Thu Apr 23 13:13:07 2009 +0200
 
     This function converts a time_t into a string in PDF date format.
 
- configure.ac	     |	  1 +
- poppler/DateInfo.cc |	 47
- +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/DateInfo.h  |	  7 +++++++
+ configure.ac	     |	1 +
+ poppler/DateInfo.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/DateInfo.h  |	7 +++++++
  3 files changed, 55 insertions(+)
 
 commit dc4cf0c29b53cda5c1c2badc5026af3429502e3a
@@ -26176,7 +29351,7 @@ Date:	Tue Apr 21 21:51:52 2009 +0200
 
     add poppler-date.{cc,h}
 
- glib/CMakeLists.txt |	  2 ++
+ glib/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 0750c6502faeabff571f5730b567097e793dca64
@@ -26185,8 +29360,8 @@ Date:	Tue Apr 21 20:04:27 2009 +0200
 
     [glib-demo] Fix dates handling in annots demo
 
- glib/demo/annots.c |	69
- +++++++++++-----------------------------------------
+ glib/demo/annots.c | 69
+ +++++++++++-------------------------------------------
  1 file changed, 14 insertions(+), 55 deletions(-)
 
 commit fe73bf9771e8294af4c8a11ec4c2891ff8f8d859
@@ -26195,8 +29370,8 @@ Date:	Tue Apr 21 20:02:25 2009 +0200
 
     [glib-demo] GTime is deprecated, use time_t instead
 
- glib/demo/utils.c |	2 +-
- glib/demo/utils.h |	2 +-
+ glib/demo/utils.c | 2 +-
+ glib/demo/utils.h | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 6d468cfa0cb89760e5d6cca43521cde6d99aa52e
@@ -26205,7 +29380,7 @@ Date:	Tue Apr 21 20:00:20 2009 +0200
 
     [glib-demo] Use format_date from utils and remove duplicated code
 
- glib/demo/info.cc |   27 ++-------------------------
+ glib/demo/info.cc | 27 ++-------------------------
  1 file changed, 2 insertions(+), 25 deletions(-)
 
 commit e5f5ea01d0da4c4d877b93755523dc2a7f2ec049
@@ -26218,7 +29393,7 @@ Date:	Tue Apr 21 19:57:11 2009 +0200
     should be parsed and the resulting time_t used to create a correct
     GDate.
 
- glib/poppler-annot.cc |   22 +++++++++++-----------
+ glib/poppler-annot.cc | 22 +++++++++++-----------
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 commit 876ad1bcc8a7b2f37656bf15cee7eb888fd46ed4
@@ -26228,7 +29403,7 @@ Date:	Tue Apr 21 19:36:33 2009 +0200
     [glib] Add info about the return value in poppler_annot_get_modified()
     doc
 
- glib/poppler-annot.cc |    4 +++-
+ glib/poppler-annot.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 8c54a15e1715721ee7af7e82c90b8dda3689c65f
@@ -26237,7 +29412,7 @@ Date:	Tue Apr 21 19:35:14 2009 +0200
 
     [glib] Fix a typo in poppler_date_parse documentation
 
- glib/poppler-date.cc |    2 +-
+ glib/poppler-date.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 39d09fa237d06fa93b02eb916d2c0242c4e8fe85
@@ -26265,14 +29440,14 @@ Date:	Tue Apr 21 19:29:32 2009 +0200
     by the
     document.
 
- glib/Makefile.am	    |	 2 ++
- glib/poppler-attachment.cc |	 4 +--
- glib/poppler-date.cc	    |	66
- ++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-date.h	    |	30 ++++++++++++++++++++
- glib/poppler-document.cc   |	45 ++++++------------------------
- glib/poppler-private.h     |	 2 +-
- glib/poppler.h		    |	 1 +
+ glib/Makefile.am	    |  2 ++
+ glib/poppler-attachment.cc |  4 +--
+ glib/poppler-date.cc	    | 66
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-date.h	    | 30 +++++++++++++++++++++
+ glib/poppler-document.cc   | 45 ++++++-------------------------
+ glib/poppler-private.h     |  2 +-
+ glib/poppler.h		    |  1 +
  7 files changed, 110 insertions(+), 40 deletions(-)
 
 commit 9c2714a3e1c02f445661618e24bcd27f1392b2b7
@@ -26281,8 +29456,8 @@ Date:	Tue Apr 21 18:08:06 2009 +0200
 
     [glib] Implement poppler_annot_set_contents()
 
- glib/poppler-annot.cc |   25 +++++++++++++++++++++++++
- glib/poppler-annot.h  |    2 ++
+ glib/poppler-annot.cc | 25 +++++++++++++++++++++++++
+ glib/poppler-annot.h  |  2 ++
  2 files changed, 27 insertions(+)
 
 commit eec550e8b3cf96aefed9b03a78d365c2848fb8f2
@@ -26291,8 +29466,8 @@ Date:	Tue Apr 21 18:06:34 2009 +0200
 
     Add setContents() to modify the annot contents
 
- poppler/Annot.cc |   26 +++++++++++++++++++++++++-
- poppler/Annot.h  |    4 ++++
+ poppler/Annot.cc | 26 +++++++++++++++++++++++++-
+ poppler/Annot.h  |  4 ++++
  2 files changed, 29 insertions(+), 1 deletion(-)
 
 commit 047a8870a8cea9b680080e0d3bf68d0685431233
@@ -26301,7 +29476,7 @@ Date:	Mon Apr 20 23:38:53 2009 +0200
 
     In case of err3 or err2 in readPageTree we need to free kidRef too
 
- poppler/Catalog.cc |	 3 ++-
+ poppler/Catalog.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit cb61b555f2c4db8685dec5491ca86570c962aab6
@@ -26312,8 +29487,8 @@ Date:	Sat Apr 18 18:30:04 2009 +0200
 
     Based on path by Thomas Viehmann <tv@beamnet.de>
 
- glib/test-poppler-glib.cc |   68
- +++++++++++++++++++++++++++++++++++++++++++++
+ glib/test-poppler-glib.cc | 68
+ +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 68 insertions(+)
 
 commit 2221b8a9ae5e986c79ea3f6c9f3b0246d328c7ab
@@ -26324,7 +29499,7 @@ Date:	Sun Apr 19 23:29:18 2009 +0200
 
     See bug #21270
 
- poppler/Decrypt.cc |	 3 ++-
+ poppler/Decrypt.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit e20efbf6cc676758b8ef7d2ad607560fcdbbf89e
@@ -26333,7 +29508,7 @@ Date:	Fri Apr 17 22:14:26 2009 +0200
 
     Fix typo in GfxFont.cc
 
- poppler/GfxFont.cc |	11 ++++++-----
+ poppler/GfxFont.cc | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit b760debea03380280d72cd39d792cbc1a380a87c
@@ -26344,8 +29519,8 @@ Date:	Fri Apr 17 21:04:26 2009 +0200
 
     Fixes bug #19896
 
- poppler/Gfx.cc |  102
- ++++++++++++++++++++++++++++++++++----------------------
+ poppler/Gfx.cc | 102
+ +++++++++++++++++++++++++++++++++++----------------------
  1 file changed, 62 insertions(+), 40 deletions(-)
 
 commit 9f1312f3d7dfa7e536606a7c7296b7c876b11c00
@@ -26367,9 +29542,9 @@ Date:	Thu Apr 16 22:13:26 2009 +0200
     Some files still hit the exit(1) in goo.c but at least none is
     really crashing
 
- poppler/JBIG2Stream.cc |  447
- ++++++++++++++++++++++++++++++++++--------------
- poppler/JBIG2Stream.h	|    4 +
+ poppler/JBIG2Stream.cc | 447
+ +++++++++++++++++++++++++++++++++++--------------
+ poppler/JBIG2Stream.h	|   4 +
  2 files changed, 324 insertions(+), 127 deletions(-)
 
 commit 284a92899602daa4a7f429e61849e794569310b5
@@ -26378,7 +29553,7 @@ Date:	Mon Apr 13 21:51:12 2009 +0200
 
     Did a mistake in the gmalloc -> gmallocn commit, it's a 4 here not a 3
 
- poppler/SplashOutputDev.cc |	 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9cf2325fb22f812b31858e519411f57747d39bd8
@@ -26387,10 +29562,10 @@ Date:	Sat Apr 11 00:31:57 2009 +0200
 
     More gmalloc → gmallocn
 
- glib/poppler-page.cc	|    2 +-
- splash/Splash.cc	|    8 ++++----
- splash/SplashBitmap.cc |    6 +++---
- splash/SplashFTFont.cc |    2 +-
+ glib/poppler-page.cc	| 2 +-
+ splash/Splash.cc	| 8 ++++----
+ splash/SplashBitmap.cc | 6 +++---
+ splash/SplashFTFont.cc | 2 +-
  4 files changed, 9 insertions(+), 9 deletions(-)
 
 commit c399b2d512aa073b0d7cd8eb5413a4b43f0d6aef
@@ -26399,7 +29574,7 @@ Date:	Sat Apr 11 00:26:23 2009 +0200
 
     Revert part of last commit, i need more math classes :D
 
- poppler/JBIG2Stream.cc |    4 ++--
+ poppler/JBIG2Stream.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7b2d314a61fd0e12f47c62996cb49ec0d1ba747a
@@ -26408,12 +29583,12 @@ Date:	Sat Apr 11 00:23:04 2009 +0200
 
     Be paranoid, use gmallocn or gmallocn3 in all gmalloc with *
 
- poppler/ArthurOutputDev.cc |	 4 ++--
- poppler/CairoOutputDev.cc  |	14 +++++++-------
- poppler/GfxState.cc	    |	 8 ++++----
- poppler/JBIG2Stream.cc     |	 4 ++--
- poppler/PSOutputDev.cc     |	 6 +++---
- poppler/SplashOutputDev.cc |	20 ++++++++++----------
+ poppler/ArthurOutputDev.cc |  4 ++--
+ poppler/CairoOutputDev.cc  | 14 +++++++-------
+ poppler/GfxState.cc	    |  8 ++++----
+ poppler/JBIG2Stream.cc     |  4 ++--
+ poppler/PSOutputDev.cc     |  6 +++---
+ poppler/SplashOutputDev.cc | 20 ++++++++++----------
  6 files changed, 28 insertions(+), 28 deletions(-)
 
 commit 0131f0a01cba8691d10a18de1137a4744988b346
@@ -26422,8 +29597,8 @@ Date:	Sat Apr 11 00:20:55 2009 +0200
 
     Add gmallocn3 that does the same as gmallocn but with 3 arguments
 
- goo/gmem.cc |	 22 ++++++++++++++++++++++
- goo/gmem.h  |	  2 ++
+ goo/gmem.cc | 22 ++++++++++++++++++++++
+ goo/gmem.h  |	2 ++
  2 files changed, 24 insertions(+)
 
 commit 75c3466ba2e4980802e80b939495981240261cd5
@@ -26434,7 +29609,7 @@ Date:	Fri Apr 10 18:05:54 2009 +0200
 
     See bug #21080
 
- poppler/CairoFontEngine.cc |	14 ++++++++++++++
+ poppler/CairoFontEngine.cc | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 3210970dc1d6faf51bce59bb7ecb6b881f9c0fe6
@@ -26443,7 +29618,7 @@ Date:	Fri Apr 10 13:09:37 2009 +0200
 
     [glib] Print annotations with the print flag enabled
 
- glib/poppler-page.cc |    2 ++
+ glib/poppler-page.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit b0b9798c85c7c6d6f336f73135a98974897b9f60
@@ -26458,7 +29633,7 @@ Date:	Mon Mar 30 23:26:39 2009 +0200
     having a +1, but the idea of the +1 is correct because it's ints
     vs floats
 
- splash/SplashFTFont.cc |    4 ++--
+ splash/SplashFTFont.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5c08f57aa80092954746d722bb13655aee3f162c
@@ -26467,7 +29642,7 @@ Date:	Sun Mar 29 23:52:31 2009 +0200
 
     Forgot Ross copyright
 
- poppler/TextOutputDev.cc |    1 +
+ poppler/TextOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit c6d3e7884010ebdcc961d81ca8c692870fc9b139
@@ -26478,7 +29653,7 @@ Date:	Sun Mar 29 23:46:09 2009 +0200
 
     Fixes bug #20013
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e4b3f7cbcb6ccdfa8b18d8da5f7074f4140b776a
@@ -26489,7 +29664,7 @@ Date:	Wed Mar 25 22:16:07 2009 +0100
 
     Fixes bug #20769
 
- splash/SplashFTFont.cc |    3 ++-
+ splash/SplashFTFont.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 4acde05ac4d0b03466c949138321cc3445a14158
@@ -26498,7 +29673,7 @@ Date:	Wed Mar 25 21:11:03 2009 +0100
 
     Remove case-insensitive matching of filenames in PDFDoc constructor
 
- poppler/PDFDoc.cc |   39 ++++++++++-----------------------------
+ poppler/PDFDoc.cc | 39 ++++++++++-----------------------------
  1 file changed, 10 insertions(+), 29 deletions(-)
 
 commit 120c7f6697ed1edaff6e17ae1ed202c69f03a73c
@@ -26507,7 +29682,7 @@ Date:	Tue Mar 24 22:56:33 2009 +0100
 
     declare the matrix at the beginning
 
- poppler/ArthurOutputDev.cc |	 2 +-
+ poppler/ArthurOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 441a9cd56935bfe2d8fddc5d3bc2c0104aeffaca
@@ -26518,10 +29693,10 @@ Date:	Sun Mar 22 22:50:14 2009 +0100
 
     See bug #20660 for more information
 
- glib/poppler-document.cc |   14 +++++++++---
- poppler/PDFDoc.cc	  |   54
- +++++++++++++++++++++++++++-------------------
- poppler/PDFDoc.h	  |    8 +++++++
+ glib/poppler-document.cc | 14 ++++++++++---
+ poppler/PDFDoc.cc	  | 54
+ ++++++++++++++++++++++++++++--------------------
+ poppler/PDFDoc.h	  |  8 +++++++
  3 files changed, 51 insertions(+), 25 deletions(-)
 
 commit 16af0ced4a0762f2f538135bd8dd72b469f6fdca
@@ -26532,8 +29707,8 @@ Date:	Sat Mar 21 16:14:06 2009 +0100
 
     Bug #20702
 
- utils/pdftoppm.1  |   16 ++++++++++++++--
- utils/pdftoppm.cc |   37 ++++++++++++++++++++++++++++++++-----
+ utils/pdftoppm.1  | 16 ++++++++++++++--
+ utils/pdftoppm.cc | 37 ++++++++++++++++++++++++++++++++-----
  2 files changed, 46 insertions(+), 7 deletions(-)
 
 commit a103c60abd5fe4c721b099c005daf22d6350c355
@@ -26542,8 +29717,8 @@ Date:	Sat Mar 21 15:47:12 2009 +0100
 
     Update version we need of Qt4
 
- CMakeLists.txt |    2 +-
- configure.ac	|    8 ++++----
+ CMakeLists.txt | 2 +-
+ configure.ac	| 8 ++++----
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit c4b1754fdd3a4649551556de2655c8291daafddf
@@ -26555,7 +29730,7 @@ Date:	Sat Mar 21 13:29:38 2009 +0100
     Cairo 1.8.4 fixes and important bug that affects the Type 3 font
     rendering
 
- CMakeLists.txt |    2 +-
+ CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 50c4ee413929e5a70133839e3cde039da738fab2
@@ -26564,9 +29739,9 @@ Date:	Wed Mar 18 22:00:05 2009 +0100
 
     Add more _checkoverflow variants, rework internals
 
- goo/gmem.cc |	 92
- +++++++++++++++++++++++++++++------------------------------
- goo/gmem.h  |	  4 ++-
+ goo/gmem.cc | 92
+ ++++++++++++++++++++++++++++++-------------------------------
+ goo/gmem.h  |	4 ++-
  2 files changed, 48 insertions(+), 48 deletions(-)
 
 commit 121c44db0884f0d70ba1470a66aa78441257c421
@@ -26575,7 +29750,7 @@ Date:	Fri Mar 20 23:25:19 2009 +1030
 
     Fix cairo luminosity smask when cairo ctm != identity
 
- poppler/CairoOutputDev.cc |   16 +++++++++++++++-
+ poppler/CairoOutputDev.cc | 16 +++++++++++++++-
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 commit 3f55aff56a1d2002ba79f3efba5eb77e94575439
@@ -26586,8 +29761,8 @@ Date:	Thu Mar 19 22:34:23 2009 +1030
 
     The previous smask was not restored after a q/Q pair or form xobject.
 
- poppler/CairoOutputDev.cc |   18 +++++++++++++++++-
- poppler/CairoOutputDev.h  |	5 +++++
+ poppler/CairoOutputDev.cc | 18 +++++++++++++++++-
+ poppler/CairoOutputDev.h  |  5 +++++
  2 files changed, 22 insertions(+), 1 deletion(-)
 
 commit 4cc3cb8992ac554352d68e97563823b9bbd556ce
@@ -26599,7 +29774,7 @@ Date:	Fri Mar 20 12:38:28 2009 +0100
     Cairo 1.8.4 fixes and important bug that affects the Type 3 font
     rendering
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit da94fe717a1ab60fb074fae61d582d1ee7151fc2
@@ -26610,7 +29785,7 @@ Date:	Mon Mar 16 22:54:27 2009 +0100
 
     Fixes 19761
 
- poppler/Annot.cc |   54
+ poppler/Annot.cc | 54
  ++++++++++++++++++++++++++++++++++++------------------
  1 file changed, 36 insertions(+), 18 deletions(-)
 
@@ -26620,7 +29795,7 @@ Date:	Thu Mar 12 00:09:03 2009 +0100
 
     Really fix jpeg lib init order?
 
- poppler/DCTStream.cc |    2 +-
+ poppler/DCTStream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 12aac6774fc6f92def3d5567051117951cc32223
@@ -26631,7 +29806,7 @@ Date:	Wed Mar 11 23:00:37 2009 +0100
 
     Fixes bug #20605
 
- poppler/GfxFont.cc |	 4 ++--
+ poppler/GfxFont.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 0ca9ae2848808d15e7a2b00f5eb33bb8f990c887
@@ -26640,7 +29815,7 @@ Date:	Wed Mar 11 00:39:59 2009 +0100
 
     remove the fortran check during the initialisation of libtool
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit 710e329a3a6a9ee2eed997c9eeaea21c44237423
@@ -26652,7 +29827,7 @@ Date:	Wed Mar 11 00:37:11 2009 +0100
     It is used by autoreconf to trace changes in m4 macros that are in
     the m4/ subdirectory.
 
- configure.ac |    1 +
+ configure.ac | 1 +
  1 file changed, 1 insertion(+)
 
 commit d15e47158ae31909212d3875159046afb208de97
@@ -26661,7 +29836,7 @@ Date:	Wed Mar 11 00:36:27 2009 +0100
 
     Better check for pkg-config
 
- configure.ac |    5 +----
+ configure.ac | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 commit b3f569f9a6c117c097acac52ae6552209fcd2101
@@ -26672,7 +29847,7 @@ Date:	Wed Mar 11 00:25:07 2009 +0100
 
     Fixes bug #20587
 
- poppler/Gfx.cc |    4 ++--
+ poppler/Gfx.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 7a5d1e57b2757c986da17f7238415b927e73127f
@@ -26685,7 +29860,7 @@ Date:	Mon Mar 9 22:54:58 2009 +0100
     error appears when testing for freetype. Identify the problem
     earlier on
 
- configure.ac |    6 ++++++
+ configure.ac | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 8dc9e4d57a4759de2b56a87d9bace80d5d563fef
@@ -26703,7 +29878,7 @@ Date:	Sun Mar 8 15:29:02 2009 +0100
     the cross compiling scenaria.
     Bug #20538
 
- m4/libjpeg.m4 |    3 +--
+ m4/libjpeg.m4 | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit bf2e2f056cadbc488cd3e9576b44beb34689ec81
@@ -26712,7 +29887,7 @@ Date:	Sun Mar 8 13:44:44 2009 +0100
 
     Add the new croptting options explanations
 
- utils/pdftotext.1 |   15 +++++++++++++++
+ utils/pdftotext.1 | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 663d9e5a448641421d290dd228be692a0f236b9c
@@ -26723,7 +29898,7 @@ Date:	Sun Mar 8 13:44:20 2009 +0100
 
     Bug #20331
 
- utils/pdftotext.cc |	29 ++++++++++++++++++++++++++++-
+ utils/pdftotext.cc | 29 ++++++++++++++++++++++++++++-
  1 file changed, 28 insertions(+), 1 deletion(-)
 
 commit cc4b61f19b69c31d9a73ae7361c4b6a94345d1c2
@@ -26736,7 +29911,7 @@ Date:	Sun Mar 8 12:55:45 2009 +0100
     say is
     correct
 
- poppler/DCTStream.cc |    4 ++--
+ poppler/DCTStream.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a4a73cd9f9ee9767d74fbb44ffe083d2057a9d61
@@ -26745,7 +29920,7 @@ Date:	Sun Mar 8 12:44:06 2009 +0100
 
     I should compile before commiting :-/
 
- poppler/DCTStream.cc |    1 -
+ poppler/DCTStream.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 6a6b3cc91053e771a67dffa979076d130f87ff11
@@ -26756,7 +29931,7 @@ Date:	Sun Mar 8 12:38:42 2009 +0100
 
     Bug #20484
 
- poppler/DCTStream.cc |   11 +++++++----
+ poppler/DCTStream.cc | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit 4dfa7460ddc4b5684d5ef8db17efa50b95b7b735
@@ -26767,7 +29942,7 @@ Date:	Tue Mar 3 00:55:53 2009 +0100
 
     More details in bug 18364
 
- poppler/Outline.cc |	15 ++++++++++++++-
+ poppler/Outline.cc | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 commit de3131ae38fc9442b198d4d7b0c57c6939ad66ce
@@ -26778,7 +29953,7 @@ Date:	Mon Mar 2 15:20:07 2009 +0100
 
     store the error code instead of the bool
 
- qt4/src/poppler-pdf-converter.cc |   12 +++++++-----
+ qt4/src/poppler-pdf-converter.cc | 12 +++++++-----
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 commit dac0542eb793603090416f1b7712ca08253f1e7f
@@ -26789,7 +29964,7 @@ Date:	Mon Mar 2 09:54:22 2009 +0100
 
     Fixes bug #19915.
 
- glib/poppler-document.cc |   37 +++++++++++++++++++++++++++++++++----
+ glib/poppler-document.cc | 37 +++++++++++++++++++++++++++++++++----
  1 file changed, 33 insertions(+), 4 deletions(-)
 
 commit bfc6572614727565d883b9545d4b6665f3c2fdfe
@@ -26798,8 +29973,8 @@ Date:	Sat Feb 28 13:16:49 2009 +0100
 
     Return an error code instead of a GBool when saving
 
- poppler/PDFDoc.cc |   22 +++++++++++-----------
- poppler/PDFDoc.h  |	8 ++++----
+ poppler/PDFDoc.cc | 22 +++++++++++-----------
+ poppler/PDFDoc.h  |  8 ++++----
  2 files changed, 15 insertions(+), 15 deletions(-)
 
 commit f7c88148fdb671736d81dd5f01a3fb68f944510c
@@ -26808,7 +29983,7 @@ Date:	Wed Feb 25 23:38:35 2009 +0100
 
     Fix cache shifting
 
- poppler/GfxState.cc |	  2 +-
+ poppler/GfxState.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 305af8cdb6822858e152e1f930bba2ce3904bf1b
@@ -26817,8 +29992,8 @@ Date:	Wed Feb 25 22:40:24 2009 +0100
 
     Make JBIG2Stream not crash in 2009-41414141.pdf
 
- poppler/JBIG2Stream.cc |  151
- +++++++++++++++++++++++++++---------------------
+ poppler/JBIG2Stream.cc | 151
+ ++++++++++++++++++++++++++++---------------------
  1 file changed, 85 insertions(+), 66 deletions(-)
 
 commit 26a8217160c1eaeeadb92023b27e68f402e38dd0
@@ -26830,7 +30005,7 @@ Date:	Sun Feb 22 18:14:15 2009 +0100
     We were checking shape instead. It fixes a crash with some documents.
     See bug #17337.
 
- poppler/CairoOutputDev.cc |	2 +-
+ poppler/CairoOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5e68e52da65b4d8c3817e5fbb6f1a937da321d48
@@ -26839,7 +30014,7 @@ Date:	Sat Feb 21 18:03:15 2009 +0100
 
     [Qt4] do not assume the destination file name for links is ASCII
 
- qt4/src/poppler-page.cc |    4 ++--
+ qt4/src/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 439cb397fed33df627a09c70788d72bef20dc872
@@ -26848,7 +30023,7 @@ Date:	Sat Feb 21 18:02:36 2009 +0100
 
     [Qt] do not assume the destination file name for links is ASCII
 
- qt/poppler-page.cc |	 4 ++--
+ qt/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3ea5f45ad3e5a55e577a2e45f61b55932ed17013
@@ -26857,7 +30032,7 @@ Date:	Sat Feb 21 17:46:30 2009 +0100
 
     [glib] Make sure filename is valid utf-8 for remote dests
 
- glib/poppler-action.cc |    3 +--
+ glib/poppler-action.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit b5989e4ffece6c1831610ee163d05fd80386a001
@@ -26866,7 +30041,7 @@ Date:	Sat Feb 21 17:45:18 2009 +0100
 
     Use the UF entry when present in Filespec dictionary
 
- poppler/FileSpec.cc |	 14 +++++++-------
+ poppler/FileSpec.cc | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 commit 943fca42b5fa815fad650e42da4ad6e806adc3b1
@@ -26875,12 +30050,12 @@ Date:	Sat Feb 21 12:08:00 2009 +0100
 
     [glib] Add a macro to define boxed types
 
- glib/poppler-action.cc   |   26 +-----------
- glib/poppler-annot.cc	  |   15 ++-----
- glib/poppler-document.cc |   44 +++++----------------
- glib/poppler-page.cc	  |   99
- +++++++++-------------------------------------
- glib/poppler-private.h   |   20 ++++++++++
+ glib/poppler-action.cc   | 26 +------------
+ glib/poppler-annot.cc	  | 15 ++------
+ glib/poppler-document.cc | 44 +++++----------------
+ glib/poppler-page.cc	  | 99
+ ++++++++++--------------------------------------
+ glib/poppler-private.h   | 20 ++++++++++
  5 files changed, 53 insertions(+), 151 deletions(-)
 
 commit 7406337ed2d38a86308f20f8273a152538e524de
@@ -26889,11 +30064,11 @@ Date:	Sat Feb 21 11:11:20 2009 +0100
 
     [glib] Use template files to create poppler-enums
 
- glib/Makefile.am	       |   43
- ++++++++++++----------------------------
- glib/poppler-enums.c.template |   44
- +++++++++++++++++++++++++++++++++++++++++
- glib/poppler-enums.h.template |   25 +++++++++++++++++++++++
+ glib/Makefile.am	       | 43
+ +++++++++++++-----------------------------
+ glib/poppler-enums.c.template | 44
+ +++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-enums.h.template | 25 ++++++++++++++++++++++++
  3 files changed, 82 insertions(+), 30 deletions(-)
 
 commit 29bc9d1dd115b5d400975533c3924993c3adae30
@@ -26902,9 +30077,9 @@ Date:	Sat Jan 17 13:16:38 2009 +0100
 
     glib small doc comment corrections
 
- glib/poppler-attachment.cc |	 2 +-
- glib/poppler-layer.cc	    |	 2 ++
- glib/poppler.cc	    |	 2 --
+ glib/poppler-attachment.cc | 2 +-
+ glib/poppler-layer.cc	    | 2 ++
+ glib/poppler.cc	    | 2 --
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit a06e715d89a99b909b8e7b73b733066c67b1ade3
@@ -26913,12 +30088,12 @@ Date:	Sat Jan 17 12:58:20 2009 +0100
 
     Make glib API reference more complete
 
- glib/reference/poppler-docs.sgml	 |    2 +
- glib/reference/poppler-sections.txt	 |   55 +++++
- glib/reference/tmpl/poppler-action.sgml |    9 +-
- glib/reference/tmpl/poppler-annot.sgml  |  368
- +++++++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-layer.sgml  |   79 +++++++
+ glib/reference/poppler-docs.sgml	 |   2 +
+ glib/reference/poppler-sections.txt	 |  55 +++++
+ glib/reference/tmpl/poppler-action.sgml |   9 +-
+ glib/reference/tmpl/poppler-annot.sgml  | 368
+ ++++++++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-layer.sgml  |  79 +++++++
  5 files changed, 511 insertions(+), 2 deletions(-)
 
 commit 3a21dafa46d42d86daec440a85b9d63b292a3c88
@@ -26933,7 +30108,7 @@ Date:	Tue Feb 3 21:33:00 2009 +0100
     what we do at the end is copy position 0 to all others so
     we need to do it in the reverse order
 
- poppler/GfxState.cc |	 10 +++++-----
+ poppler/GfxState.cc | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit 0ed3fd52bb2d3375ed302285b18f076721b8028e
@@ -26942,7 +30117,7 @@ Date:	Sun Feb 1 10:37:25 2009 +0100
 
     [glib-demo] Fix a typo in format string
 
- glib/demo/page.c |    2 +-
+ glib/demo/page.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2df6d530cd9acd8648a6196031218ef10e7b3891
@@ -26953,7 +30128,7 @@ Date:	Thu Jan 29 00:51:13 2009 +0100
 
     Fixes bug 19789
 
- utils/ImageOutputDev.cc |    3 ++-
+ utils/ImageOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 1fc342eadcbbb41302f190b215c5daf23c9ec9b1
@@ -26964,7 +30139,7 @@ Date:	Wed Jan 28 22:53:43 2009 +0100
 
     Fixes crash on bug 19790
 
- poppler/Form.cc |    4 +++-
+ poppler/Form.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit b1d4efb082ac3dadd7752a557e5aeb6651e17471
@@ -26977,8 +30152,8 @@ Date:	Tue Jan 27 00:26:08 2009 +0100
     PostScriptFunction::transform is called gives a 7% speedup on heavy
     PostScriptFunction::transform pdf like nytimes firefox ad
 
- poppler/Function.cc |	 12 ++++++++----
- poppler/Function.h  |	 15 +++++++++++++++
+ poppler/Function.cc | 12 ++++++++----
+ poppler/Function.h  | 15 +++++++++++++++
  2 files changed, 23 insertions(+), 4 deletions(-)
 
 commit 90f95127d8d89cfcadeb7d701437ab07ce4a8a61
@@ -26987,9 +30162,9 @@ Date:	Sun Jan 25 23:17:39 2009 +0100
 
     Cache last 5 GfxICCBasedColorSpace
 
- poppler/GfxState.cc |	 60
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/GfxState.h  |	 15 +++++++++++++
+ poppler/GfxState.cc | 60
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/GfxState.h  | 15 ++++++++++++++
  2 files changed, 75 insertions(+)
 
 commit d3f04f537fb3e963c149a7e2d8d83c7cb19da8c0
@@ -27000,7 +30175,7 @@ Date:	Fri Jan 23 23:08:46 2009 +0100
 
     Fixes bug 19702
 
- poppler/JBIG2Stream.cc |    7 ++++++-
+ poppler/JBIG2Stream.cc | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 3990c9e52da7b17215506857c792c90a37ebac79
@@ -27009,7 +30184,7 @@ Date:	Mon Jan 19 09:53:00 2009 +0100
 
     Fix a problem in cairo backend when using a CMYK Profile
 
- poppler/GfxState.cc |	  2 +-
+ poppler/GfxState.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6e51ae7fe8b9dc8ad52b735f2fe056f8ea8f1dcb
@@ -27019,7 +30194,7 @@ Date:	Thu Jan 15 22:33:04 2009 +0100
     calculate the limit in a way that one does not access an invalid
     index of the matrix
 
- poppler/DCTStream.cc |    2 +-
+ poppler/DCTStream.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ea2aa7bd1ceb0e3282398f52683e4f52ef401f74
@@ -27028,9 +30203,9 @@ Date:	Thu Jan 15 22:18:48 2009 +0100
 
     Forgot my copyrights
 
- poppler/DCTStream.cc |    2 +-
- poppler/DCTStream.h  |    2 +-
- poppler/Stream.cc    |    2 +-
+ poppler/DCTStream.cc | 2 +-
+ poppler/DCTStream.h  | 2 +-
+ poppler/Stream.cc    | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit d65dd23752ec14635d0d224afa7dd605f98a10a4
@@ -27039,9 +30214,9 @@ Date:	Thu Jan 15 22:17:14 2009 +0100
 
     Minor optimizations
 
- poppler/DCTStream.cc |   17 ++++++++---------
- poppler/DCTStream.h  |    3 ++-
- poppler/Stream.cc    |    3 ++-
+ poppler/DCTStream.cc | 17 ++++++++---------
+ poppler/DCTStream.h  |  3 ++-
+ poppler/Stream.cc    |  3 ++-
  3 files changed, 12 insertions(+), 11 deletions(-)
 
 commit d3d2910f757dfc3e141aed62aa970136f9d7186f
@@ -27051,7 +30226,7 @@ Date:	Sun Jan 11 00:40:46 2009 +0100
     fix a (relatively small) memory leak when asking for a document-level
     JS
 
- poppler/Catalog.cc |	 1 +
+ poppler/Catalog.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 869584a84eed507775ff1c3183fe484c14b6f77b
@@ -27060,8 +30235,8 @@ Date:	Sat Jan 10 18:28:47 2009 +0100
 
     Add the possibility of setting the datadir on runtime
 
- poppler/GlobalParams.cc |   27 ++++++++++++++++++++-------
- poppler/GlobalParams.h  |    5 ++++-
+ poppler/GlobalParams.cc | 27 ++++++++++++++++++++-------
+ poppler/GlobalParams.h  |  5 ++++-
  2 files changed, 24 insertions(+), 8 deletions(-)
 
 commit cf112dceb1d6653beae73ce2fac6fb5eee48ff33
@@ -27072,8 +30247,8 @@ Date:	Sat Jan 10 18:11:20 2009 +0100
 
     Fixes bug 19483
 
- poppler/GfxState.cc |	106
- +++++++++++++++++++++++++--------------------------
+ poppler/GfxState.cc | 106
+ ++++++++++++++++++++++++++--------------------------
  1 file changed, 53 insertions(+), 53 deletions(-)
 
 commit 6dd77338d16f80760ae32ff9f3e2be9768fc0c49
@@ -27084,7 +30259,7 @@ Date:	Thu Jan 8 11:49:45 2009 +0100
 
     Fixes bug #18558.
 
- qt4/src/poppler-page.cc |    2 +-
+ qt4/src/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 69c07c031159d36dde52609bffa6d48c3c56cef5
@@ -27093,9 +30268,9 @@ Date:	Thu Jan 8 00:59:19 2009 +0100
 
     update Poppler copyright to 2009
 
- msvc/poppler/poppler-config.h |    2 +-
- poppler-config.h.cmake        |    2 +-
- poppler/poppler-config.h.in   |    2 +-
+ msvc/poppler/poppler-config.h | 2 +-
+ poppler-config.h.cmake        | 2 +-
+ poppler/poppler-config.h.in   | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 79e0eea85cf063c6323caafbec97f3d71fc04ca2
@@ -27104,7 +30279,7 @@ Date:	Thu Jan 8 00:57:03 2009 +0100
 
     remove old cmake modules, add a new one
 
- Makefile.am |	  3 +--
+ Makefile.am | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 0e6420ece2d6fcc046d5814b48a2754fb86771e2
@@ -27113,11 +30288,11 @@ Date:	Wed Jan 7 23:33:02 2009 +0100
 
     Require cmake 2.6.0, remove two cmake files provided upstream
 
- CMakeLists.txt					   |	4 +-
- cmake/modules/FindFreetype.cmake		   |   74
- ---------------------
- cmake/modules/FindPackageHandleStandardArgs.cmake |   58 ----------------
- glib/CMakeLists.txt				   |	2 +-
+ CMakeLists.txt					   |  4 +-
+ cmake/modules/FindFreetype.cmake		   | 74
+ -----------------------
+ cmake/modules/FindPackageHandleStandardArgs.cmake | 58 ------------------
+ glib/CMakeLists.txt				   |  2 +-
  4 files changed, 3 insertions(+), 135 deletions(-)
 
 commit a69add73bf7bef17c677c735db77934ba67188a5
@@ -27126,14 +30301,14 @@ Date:	Wed Jan 7 19:06:13 2009 +0100
 
     Update copyright notices
 
- poppler/FontInfo.cc	     |	  1 +
- poppler/FontInfo.h	     |	  1 +
- qt4/src/poppler-document.cc |	  2 +-
- qt4/src/poppler-fontinfo.cc |	  2 +-
- qt4/src/poppler-form.cc     |	  1 +
- qt4/src/poppler-form.h      |	  1 +
- qt4/src/poppler-private.h   |	  2 +-
- qt4/src/poppler-qt4.h	     |	  2 +-
+ poppler/FontInfo.cc	     | 1 +
+ poppler/FontInfo.h	     | 1 +
+ qt4/src/poppler-document.cc | 2 +-
+ qt4/src/poppler-fontinfo.cc | 2 +-
+ qt4/src/poppler-form.cc     | 1 +
+ qt4/src/poppler-form.h      | 1 +
+ qt4/src/poppler-private.h   | 2 +-
+ qt4/src/poppler-qt4.h	     | 2 +-
  8 files changed, 8 insertions(+), 4 deletions(-)
 
 commit 18d584158a781fecb4f696b01fb4d17803ce7d7a
@@ -27142,9 +30317,9 @@ Date:	Wed Jan 7 17:55:48 2009 +0100
 
     Add lcms option to cmake buildsystem
 
- CMakeLists.txt		      |    9 +++++++++
- cmake/modules/FindLCMS.cmake |   37 +++++++++++++++++++++++++++++++++++++
- config.h.cmake		      |    3 +++
+ CMakeLists.txt		      |  9 +++++++++
+ cmake/modules/FindLCMS.cmake | 37 +++++++++++++++++++++++++++++++++++++
+ config.h.cmake		      |  3 +++
  3 files changed, 49 insertions(+)
 
 commit 140b8ed97416f9c2ec02eb749ca45ca50bd651a8
@@ -27153,11 +30328,11 @@ Date:	Wed Jan 7 17:43:44 2009 +0100
 
     Add initial support for color management
 
- configure.ac	     |	 19 ++
- poppler/GfxState.cc |	697
- +++++++++++++++++++++++++++++++++++++++++++++++----
- poppler/GfxState.h  |	 74 +++++-
- poppler/Makefile.am |	  5 +
+ configure.ac	     |	19 ++
+ poppler/GfxState.cc | 697
+ ++++++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/GfxState.h  |	74 +++++-
+ poppler/Makefile.am |	 5 +
  4 files changed, 738 insertions(+), 57 deletions(-)
 
 commit bdc76dc811a6e4d5fd929bbdc8cd3300aeaea31f
@@ -27167,7 +30342,7 @@ Date:	Tue Jan 6 15:45:37 2009 +0100
     [Qt4] apidox improvements for the font functions of Document; mark
     scanForFonts() as deprecated
 
- qt4/src/poppler-qt4.h |   22 ++++++++++++++++++----
+ qt4/src/poppler-qt4.h | 22 ++++++++++++++++++----
  1 file changed, 18 insertions(+), 4 deletions(-)
 
 commit 6630e715714161cd803fc064f5d3cf880f42b0a5
@@ -27176,7 +30351,7 @@ Date:	Tue Jan 6 15:36:19 2009 +0100
 
     tell Doxygen to consider Q_DECL_DEPRECATED as empty
 
- qt4/src/Doxyfile |    1 +
+ qt4/src/Doxyfile | 1 +
  1 file changed, 1 insertion(+)
 
 commit d748d430b106580b8be29ca3ec75caf05b55812e
@@ -27194,12 +30369,12 @@ Date:	Tue Jan 6 15:24:25 2009 +0100
     behaviour ("i can scan the document only once")
     * added unit tests for fonts(), scanForFonts() and FontIterator
 
- qt4/src/poppler-document.cc |	 27 +++++---
- qt4/src/poppler-fontinfo.cc |	 36 +++++++++++
- qt4/src/poppler-private.h   |	 27 ++++++--
- qt4/src/poppler-qt4.h	     |	 65 +++++++++++++++++++
- qt4/tests/check_fonts.cpp   |	149
- +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-document.cc |	27 +++++---
+ qt4/src/poppler-fontinfo.cc |	36 +++++++++++
+ qt4/src/poppler-private.h   |	27 ++++++--
+ qt4/src/poppler-qt4.h	     |	65 +++++++++++++++++++
+ qt4/tests/check_fonts.cpp   | 149
+ ++++++++++++++++++++++++++++++++++++++++++++
  5 files changed, 291 insertions(+), 13 deletions(-)
 
 commit b9804542bb50216786dc11ca16efd84304f4b832
@@ -27211,8 +30386,8 @@ Date:	Tue Jan 6 15:16:53 2009 +0100
     The default value is 0 (= first page), so it should be compatible
     with any usage so far.
 
- poppler/FontInfo.cc |	  4 ++--
- poppler/FontInfo.h  |	  2 +-
+ poppler/FontInfo.cc | 4 ++--
+ poppler/FontInfo.h  | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit af74fef03bfbd79334da5612c63c7793952542f9
@@ -27221,8 +30396,8 @@ Date:	Tue Jan 6 01:36:31 2009 +0100
 
     Add forgotten file to let the autotools based system build
 
- m4/libpng.m4 |   99
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ m4/libpng.m4 | 99
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 99 insertions(+)
 
 commit ae588500f62bab5666174ff3b1564c414c5a76c5
@@ -27231,9 +30406,9 @@ Date:	Tue Jan 6 01:35:38 2009 +0100
 
     Fix the cmake buildsystem
 
- CMakeLists.txt       |    6 ++++++
- config.h.cmake       |    3 +++
- utils/CMakeLists.txt |    4 ++++
+ CMakeLists.txt       | 6 ++++++
+ config.h.cmake       | 3 +++
+ utils/CMakeLists.txt | 4 ++++
  3 files changed, 13 insertions(+)
 
 commit 940d060a14712c09da427e2fac4ec579f7291b0f
@@ -27242,7 +30417,7 @@ Date:	Tue Jan 6 01:27:06 2009 +0100
 
     do not leak fName if fopen fails
 
- utils/HtmlOutputDev.cc |    3 +++
+ utils/HtmlOutputDev.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 7be9198adb940ad7c5fffc6db0158cf7042e1b8f
@@ -27251,7 +30426,7 @@ Date:	Tue Jan 6 01:24:15 2009 +0100
 
     Do not leak pgNum and imgnum if fopen fails
 
- utils/HtmlOutputDev.cc |   16 +++++++++-------
+ utils/HtmlOutputDev.cc | 16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 commit dfba6c022b150553cb2b18b027e661b3b4625ce7
@@ -27260,11 +30435,11 @@ Date:	Tue Jan 6 01:16:31 2009 +0100
 
     Make pdftohtml output png images when the image stream is not a jpeg
 
- configure.ac		|   14 ++++++
- utils/HtmlOutputDev.cc |  126
- +++++++++++++++++++++++++++++++++++++++++++++---
- utils/HtmlOutputDev.h	|    3 +-
- utils/Makefile.am	|    4 ++
+ configure.ac		|  14 ++++++
+ utils/HtmlOutputDev.cc | 126
+ ++++++++++++++++++++++++++++++++++++++++++++++---
+ utils/HtmlOutputDev.h	|   3 +-
+ utils/Makefile.am	|   4 ++
  4 files changed, 140 insertions(+), 7 deletions(-)
 
 commit 0963c276ba972a36c2895e4fe1c7475acd489738
@@ -27278,9 +30453,9 @@ Date:	Sun Jan 4 16:54:32 2009 +0100
     need to create a fake one so the system really renders it
     Fixes bug 19359
 
- poppler/Annot.cc |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h  |    2 ++
- poppler/Gfx.h	  |    7 ++++---
+ poppler/Annot.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h  |  2 ++
+ poppler/Gfx.h	  |  7 ++++---
  3 files changed, 53 insertions(+), 5 deletions(-)
 
 commit 46128cf83b322c112eb0c409c20052bdb2ea4a37
@@ -27289,8 +30464,8 @@ Date:	Sun Jan 4 14:21:15 2009 +0100
 
     Remove wrong and unused FormWidget(FormWidget *dest) contructor
 
- poppler/Form.cc |   11 -----------
- poppler/Form.h  |    3 +--
+ poppler/Form.cc | 11 -----------
+ poppler/Form.h  |  3 +--
  2 files changed, 1 insertion(+), 13 deletions(-)
 
 commit 5203aefc41fa47c461812cc46f28281edd226515
@@ -27299,8 +30474,8 @@ Date:	Sun Jan 4 14:03:16 2009 +0100
 
     Plug some memory leaks
 
- poppler/Annot.cc |    5 ++++-
- poppler/Form.cc  |    4 +++-
+ poppler/Annot.cc | 5 ++++-
+ poppler/Form.cc  | 4 +++-
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 5fb7ec7e6af4cfb2b256a5b9b9752e68330b4aec
@@ -27312,7 +30487,7 @@ Date:	Tue Dec 30 23:46:59 2008 +0100
     Fixes exporting to PS of the two pdf i have that have fonts with
     Length2 set to 0
 
- poppler/PSOutputDev.cc |   26 +++++++++++++++++++++-----
+ poppler/PSOutputDev.cc | 26 +++++++++++++++++++++-----
  1 file changed, 21 insertions(+), 5 deletions(-)
 
 commit ca35fdbc7c31dae432d775b6c087a83fa9b897fc
@@ -27321,7 +30496,7 @@ Date:	Tue Dec 30 23:03:57 2008 +0100
 
     We need spaces here too to satify other consumer parsers
 
- poppler/PDFDoc.cc |	4 ++--
+ poppler/PDFDoc.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3c07c73e07a9cb59ee4c23ca60d2adce92de45f7
@@ -27330,7 +30505,7 @@ Date:	Tue Dec 30 22:21:27 2008 +0100
 
     [Qt4-demo] load a document when passed via command line
 
- qt4/demos/main_viewer.cpp |	4 ++++
+ qt4/demos/main_viewer.cpp | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit aba0aaa896d634a51fbb3a3e6eae411be462f930
@@ -27342,7 +30517,7 @@ Date:	Mon Dec 29 00:31:18 2008 +0100
     Dictionary keys are names so need to be sanitized
     Add a space after num gen obj
 
- poppler/PDFDoc.cc |	7 +++++--
+ poppler/PDFDoc.cc | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit e5b93a847ae4e20a77fecef0938da4f14dfbe3eb
@@ -27366,8 +30541,8 @@ Date:	Sun Dec 28 22:59:14 2008 +0100
     CDECL can
     be an empty definition.
 
- poppler-config.h.cmake      |	  8 ++------
- poppler/poppler-config.h.in |	  8 ++------
+ poppler-config.h.cmake      | 8 ++------
+ poppler/poppler-config.h.in | 8 ++------
  2 files changed, 4 insertions(+), 12 deletions(-)
 
 commit de70c0aeb37d788f595b0574796844f51ddedec1
@@ -27376,8 +30551,8 @@ Date:	Sun Dec 28 21:21:12 2008 +0100
 
     [qt4] improve doc a bit
 
- qt4/src/poppler-form.h |    2 +-
- qt4/src/poppler-qt4.h	|    4 ++--
+ qt4/src/poppler-form.h | 2 +-
+ qt4/src/poppler-qt4.h	| 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit effb32658019e09dc86c017e39154fd554fc94f8
@@ -27388,7 +30563,7 @@ Date:	Sun Dec 28 02:56:30 2008 +0100
 
     Fixes second pdf at kde bug 161327
 
- qt4/src/poppler-form.cc |    2 +-
+ qt4/src/poppler-form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0f10561f3b1c90acc030d973399316bfca5f495e
@@ -27397,8 +30572,8 @@ Date:	Sun Dec 28 01:44:25 2008 +0100
 
     Fix my last commit, copy&paste is really evil
 
- goo/GooString.cc |    9 +++++----
- goo/GooString.h  |    2 +-
+ goo/GooString.cc | 9 +++++----
+ goo/GooString.h  | 2 +-
  2 files changed, 6 insertions(+), 5 deletions(-)
 
 commit 217b46484ff56bfd5906b293ebee70b82cc0263d
@@ -27408,12 +30583,12 @@ Date:	Sun Dec 28 01:29:41 2008 +0100
     Move PSOutputDev::filterPSName to GooString::sanitizedName so i can
     use it from PDFDoc::writeObject
 
- goo/GooString.cc	|   36 +++++++++++++++++++++++++++++++++++
- goo/GooString.h	|    7 +++++++
- poppler/PDFDoc.cc	|    7 ++++++-
- poppler/PSOutputDev.cc |   49
- +++++++++---------------------------------------
- poppler/PSOutputDev.h	|    3 +--
+ goo/GooString.cc	| 36 ++++++++++++++++++++++++++++++++++++
+ goo/GooString.h	|  7 +++++++
+ poppler/PDFDoc.cc	|  7 ++++++-
+ poppler/PSOutputDev.cc | 49
+ +++++++++----------------------------------------
+ poppler/PSOutputDev.h	|  3 +--
  5 files changed, 59 insertions(+), 43 deletions(-)
 
 commit f41fa9ee71aef5539cf9976c79b32bf1713c8167
@@ -27423,7 +30598,7 @@ Date:	Fri Dec 26 22:56:12 2008 +0100
     Change the overflow check to the same used in gmem.cc, much more
     easy to understand
 
- poppler/XRef.cc |   12 ++++++------
+ poppler/XRef.cc | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit b8ae7d91dedc9a75200b6050628ec2740af84b98
@@ -27432,11 +30607,11 @@ Date:	Fri Dec 26 22:28:09 2008 +0100
 
     Fix compile warnings on auto imports for mingw32
 
- configure.ac	       |    3 +++
- glib/Makefile.am      |    2 +-
- glib/demo/Makefile.am |    2 ++
- test/Makefile.am      |    2 ++
- utils/Makefile.am     |    2 ++
+ configure.ac	       | 3 +++
+ glib/Makefile.am      | 2 +-
+ glib/demo/Makefile.am | 2 ++
+ test/Makefile.am      | 2 ++
+ utils/Makefile.am     | 2 ++
  5 files changed, 10 insertions(+), 1 deletion(-)
 
 commit ba47bd2ba05f883306606eda30bff17bd4a8eec6
@@ -27448,10 +30623,10 @@ Date:	Fri Dec 26 19:47:42 2008 +0100
 
     Fixes bug 19298
 
- CMakeLists.txt      |	  1 -
- poppler/BaseFile.h  |	 82
- ---------------------------------------------------
- poppler/Makefile.am |	  1 -
+ CMakeLists.txt      |	1 -
+ poppler/BaseFile.h  | 82
+ -----------------------------------------------------
+ poppler/Makefile.am |	1 -
  3 files changed, 84 deletions(-)
 
 commit 84366d9e63b0d6a5ee1aae2463648cfc2ff5e1b8
@@ -27460,7 +30635,7 @@ Date:	Wed Dec 24 19:27:19 2008 +0100
 
     Let libtool build DLLs on windows too
 
- configure.ac |    5 ++++-
+ configure.ac | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit 08cef528f2e51cc62cff4125f179021ad9555317
@@ -27469,7 +30644,7 @@ Date:	Wed Dec 24 17:48:46 2008 +0100
 
     Fix compile warning on string literal format
 
- test/pdf-inspector.cc |    2 +-
+ test/pdf-inspector.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0606b4bba8e889204c7b7c9d376f63b659f83a4f
@@ -27478,7 +30653,7 @@ Date:	Wed Dec 24 17:48:10 2008 +0100
 
     Fix compile warnings on parentheses and/or
 
- poppler/CairoOutputDev.cc |   13 +++++++------
+ poppler/CairoOutputDev.cc | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 commit eba2232cabd5fb1e177db2a6053f0d1a0aee882b
@@ -27487,8 +30662,8 @@ Date:	Wed Dec 24 17:46:32 2008 +0100
 
     Fix some more warnings
 
- test/gtk-cairo-test.cc |   11 -----------
- test/pdf-inspector.cc	|    9 +++++----
+ test/gtk-cairo-test.cc | 11 -----------
+ test/pdf-inspector.cc	|  9 +++++----
  2 files changed, 5 insertions(+), 15 deletions(-)
 
 commit c80431eb1626d89e7b615e5a5149d3436b554b66
@@ -27497,7 +30672,7 @@ Date:	Mon Dec 22 09:28:47 2008 +0100
 
     Fix compile warning on format type
 
- glib/test-poppler-glib.cc |	2 +-
+ glib/test-poppler-glib.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fda181c35b7c7500b6d3c6ca9d454addd54929c5
@@ -27506,7 +30681,7 @@ Date:	Mon Dec 22 00:53:44 2008 +0100
 
     group condition within brackets
 
- poppler/ArthurOutputDev.cc |	 4 ++--
+ poppler/ArthurOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c1beeecbd6cbf82811d70c75cb24059b4b492abe
@@ -27515,7 +30690,7 @@ Date:	Mon Dec 22 00:46:49 2008 +0100
 
     [demo] use the proper format field for gsize types
 
- glib/demo/attachments.c |    2 +-
+ glib/demo/attachments.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bfb975466f0ff78e9e292b6af7cac66e4c331456
@@ -27532,7 +30707,7 @@ Date:	Mon Dec 22 00:24:23 2008 +0100
 
     [Qt] deserialize also the value of 'right'
 
- qt/poppler-link.cc |	11 ++++++-----
+ qt/poppler-link.cc | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 7c053ab7623cea1ac650d3e960d2d91a1ef21557
@@ -27542,13 +30717,13 @@ Date:	Mon Dec 22 00:19:02 2008 +0100
     [Qt] move in a .cc file the implementation of the QString<->GooString
     functions and DocumentData::addTocChildren()
 
- qt/CMakeLists.txt	|    1 +
- qt/Makefile.am		|    1 +
- qt/poppler-document.cc |   10 ----
- qt/poppler-page.cc	|    1 +
- qt/poppler-private.cc	|  147
- ++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-private.h	|  106 +++-------------------------------
+ qt/CMakeLists.txt	|   1 +
+ qt/Makefile.am		|   1 +
+ qt/poppler-document.cc |  10 ----
+ qt/poppler-page.cc	|   1 +
+ qt/poppler-private.cc	| 147
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-private.h	| 106 +++--------------------------------
  6 files changed, 157 insertions(+), 109 deletions(-)
 
 commit ea3546f84c5335c58cdb2906b1a1a4656be9c8ea
@@ -27557,7 +30732,7 @@ Date:	Sun Dec 21 23:33:49 2008 +0100
 
     Fix compile warnings on signed/unsigned comparison
 
- goo/gfile.cc |    3 ++-
+ goo/gfile.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ca672ae51d2c1fa59a891717b418ba86b5e7345c
@@ -27566,7 +30741,7 @@ Date:	Sun Dec 21 23:33:00 2008 +0100
 
     Fix compile warnings on ignored pragma with mingw compiler
 
- poppler/Gfx.cc |    5 +++--
+ poppler/Gfx.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 86cfe8ab2b4e0b600f3f6682701c2fcfbe5d0ca9
@@ -27575,7 +30750,7 @@ Date:	Sun Dec 21 23:08:56 2008 +0100
 
     Fix compile warnings on signed/unsigned comparison
 
- poppler/GfxFont.cc |	 6 ++++--
+ poppler/GfxFont.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit e34af7ffe0a4024e2eb39314bdb09eb9a662e53e
@@ -27584,9 +30759,9 @@ Date:	Sun Dec 21 22:16:39 2008 +0100
 
     Update copyright of last commits
 
- poppler/TextOutputDev.cc |    1 +
- poppler/TextOutputDev.h  |    2 +-
- qt4/src/poppler-page.cc  |    1 +
+ poppler/TextOutputDev.cc | 1 +
+ poppler/TextOutputDev.h  | 2 +-
+ qt4/src/poppler-page.cc  | 1 +
  3 files changed, 3 insertions(+), 1 deletion(-)
 
 commit f6d84dcfc9cc587c7408af79b1ee7658d456f8d8
@@ -27595,7 +30770,7 @@ Date:	Sun Dec 21 22:09:00 2008 +0100
 
     Fix compile warning to suggest parentheses and/or
 
- poppler/TextOutputDev.cc |   14 ++++++++------
+ poppler/TextOutputDev.cc | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 commit 15205403eaa95d6fba0e36983de993877dd3a983
@@ -27604,7 +30779,7 @@ Date:	Sun Dec 21 21:59:45 2008 +0100
 
     Fix warning to suggest parentheses inside shift
 
- poppler/PSOutputDev.cc |    3 ++-
+ poppler/PSOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit cc24f37e582bfc0069faf286da97a48fe4794db1
@@ -27613,7 +30788,7 @@ Date:	Sun Dec 21 21:35:29 2008 +0100
 
     Fix compile warning on ambiguous else
 
- test/perf-test.cc |	3 ++-
+ test/perf-test.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit a8cc4ad8c2da804f25db8cca1c85433d5a63307c
@@ -27622,7 +30797,7 @@ Date:	Sun Dec 21 21:34:28 2008 +0100
 
     Fix compile warning on format not a string literal
 
- test/perf-test.cc |	3 ++-
+ test/perf-test.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 3cbbf8226730aa7ee6273e154e4a9d58670a3cda
@@ -27631,7 +30806,7 @@ Date:	Sun Dec 21 21:30:54 2008 +0100
 
     Fix compile warning about uninitialized variable
 
- poppler/ABWOutputDev.cc |    3 ++-
+ poppler/ABWOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit f675916277cb76cd1293225a1271f835a02148fb
@@ -27642,7 +30817,7 @@ Date:	Sat Dec 20 23:23:10 2008 +0100
 
     found with poppler-qt4 unit tests =)
 
- poppler/TextOutputDev.cc |    1 +
+ poppler/TextOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit c976770c64e4c991fff27e413414473583b6fd86
@@ -27654,7 +30829,7 @@ Date:	Sat Dec 20 22:25:55 2008 +0100
     using a hash table instead of a map mapes lookup faster;
     in these cases we don't need the sorting a map gives
 
- qt4/src/poppler-page.cc |    7 ++++---
+ qt4/src/poppler-page.cc | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 944f6049a50eb3be9fb29174d67adc4ad1d0b9fe
@@ -27663,7 +30838,7 @@ Date:	Sat Dec 20 20:13:43 2008 +0100
 
     add find.c and text.c
 
- glib/demo/CMakeLists.txt |    2 ++
+ glib/demo/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 commit ba91b889c3b50239e339938f3c9d31fffcd87d44
@@ -27672,7 +30847,7 @@ Date:	Sat Dec 20 19:29:40 2008 +0100
 
     Make destructor private in TextPage
 
- poppler/TextOutputDev.h |    8 ++++----
+ poppler/TextOutputDev.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 0da16537aa83f6ed6d8895c7e54266263a71c1cf
@@ -27685,11 +30860,11 @@ Date:	Fri Dec 19 19:08:21 2008 +0100
     code
     in such classes.
 
- poppler/CairoOutputDev.cc |  108 +++---------------------
- poppler/CairoOutputDev.h  |	7 +-
- poppler/TextOutputDev.cc  |  206
- ++++++++++++++++++++++++++-------------------
- poppler/TextOutputDev.h   |   34 ++++++--
+ poppler/CairoOutputDev.cc | 108 +++---------------------
+ poppler/CairoOutputDev.h  |   7 +-
+ poppler/TextOutputDev.cc  | 206
+ ++++++++++++++++++++++++++--------------------
+ poppler/TextOutputDev.h   |  34 ++++++--
  4 files changed, 160 insertions(+), 195 deletions(-)
 
 commit 0f8ab301c633133eea3dbd4f2254f31c50e3c4a9
@@ -27698,11 +30873,11 @@ Date:	Sun Dec 14 13:12:34 2008 +0100
 
     [glib-demo] Add find demo
 
- glib/demo/Makefile.am |    2 +
- glib/demo/find.c      |  282
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/find.h      |   31 ++++++
- glib/demo/main.c      |    4 +-
+ glib/demo/Makefile.am |   2 +
+ glib/demo/find.c      | 282
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/find.h      |  31 ++++++
+ glib/demo/main.c      |   4 +-
  4 files changed, 318 insertions(+), 1 deletion(-)
 
 commit 88df9e9aa9adb53f0a9714ea404d46f111495df3
@@ -27711,11 +30886,11 @@ Date:	Sun Dec 14 11:54:35 2008 +0100
 
     [glib-demo] Add Text demo
 
- glib/demo/Makefile.am |    2 +
- glib/demo/main.c      |    4 +-
- glib/demo/text.c      |  175
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/text.h      |   31 +++++++++
+ glib/demo/Makefile.am |   2 +
+ glib/demo/main.c      |   4 +-
+ glib/demo/text.c      | 175
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/text.h      |  31 +++++++++
  4 files changed, 211 insertions(+), 1 deletion(-)
 
 commit 5b0f2355d55a5104820fd0bf16b4e76b25959de4
@@ -27724,9 +30899,9 @@ Date:	Sun Dec 14 11:49:00 2008 +0100
 
     [glib] Use TextPage instead of TextOutputDev when cairo is enabled
 
- glib/poppler-page.cc	|  148
- +++++++++++++++++++++++++++++++++---------------
- glib/poppler-private.h |    4 ++
+ glib/poppler-page.cc	| 148
+ ++++++++++++++++++++++++++++++++++---------------
+ glib/poppler-private.h |   4 ++
  2 files changed, 107 insertions(+), 45 deletions(-)
 
 commit 3ced71fb68d62308db7b9535367eafefb55d1cde
@@ -27739,9 +30914,9 @@ Date:	Sun Dec 14 11:18:00 2008 +0100
     don't need
     to use TextOutputDev and render again.
 
- poppler/CairoOutputDev.cc |  144
- +++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoOutputDev.h  |   19 +++++-
+ poppler/CairoOutputDev.cc | 144
+ ++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.h  |  19 +++++-
  2 files changed, 155 insertions(+), 8 deletions(-)
 
 commit 0bdad35cc4cfdb8da5acaf44678920b7a0025f99
@@ -27750,9 +30925,9 @@ Date:	Sun Dec 14 11:14:12 2008 +0100
 
     Add refcount support to TextPage
 
- poppler/TextOutputDev.cc |   12 +++++++++++-
- poppler/TextOutputDev.h  |    5 +++++
- qt4/src/poppler-page.cc  |    2 +-
+ poppler/TextOutputDev.cc | 12 +++++++++++-
+ poppler/TextOutputDev.h  |  5 +++++
+ qt4/src/poppler-page.cc  |  2 +-
  3 files changed, 17 insertions(+), 2 deletions(-)
 
 commit f86514c3fbc867fc6457feacba23451e89993524
@@ -27763,8 +30938,8 @@ Date:	Wed Dec 17 00:36:39 2008 +0100
 
     Bug 18908
 
- poppler/PSOutputDev.cc |  114
- ++++++++++++++++++++++++++++++------------------
+ poppler/PSOutputDev.cc | 114
+ +++++++++++++++++++++++++++++++------------------
  1 file changed, 72 insertions(+), 42 deletions(-)
 
 commit fc395eb90b418e43453acefb42cd04baf0b7ad40
@@ -27773,7 +30948,7 @@ Date:	Tue Dec 16 21:11:53 2008 +0100
 
     Allow the use of cropbox in pdftoppm
 
- utils/pdftoppm.cc |   16 +++++++++++++---
+ utils/pdftoppm.cc | 16 +++++++++++++---
  1 file changed, 13 insertions(+), 3 deletions(-)
 
 commit 80f415176952635a485356cf36048eee53396c25
@@ -27783,8 +30958,8 @@ Date:	Tue Dec 16 20:37:39 2008 +0100
     Make destructors private/protected since you are not supposed to
     use them
 
- poppler/GfxFont.cc |	 2 +-
- poppler/GfxFont.h  |	11 +++++------
+ poppler/GfxFont.cc |  2 +-
+ poppler/GfxFont.h  | 11 +++++------
  2 files changed, 6 insertions(+), 7 deletions(-)
 
 commit dbcebda953cb36a45a125aada68e85249fb73f43
@@ -27795,7 +30970,7 @@ Date:	Mon Dec 15 20:10:31 2008 +0100
 
     Fixes bug 19095
 
- poppler/Annot.cc |    4 ++++
+ poppler/Annot.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit aaeb0d137232bf1cb11dc5e37b8b45b50c6f9c6a
@@ -27804,7 +30979,7 @@ Date:	Fri Dec 12 00:43:19 2008 +0100
 
     update the xpdf headers installation
 
- CMakeLists.txt |   32 +++++++++++++++++++++-----------
+ CMakeLists.txt | 32 +++++++++++++++++++++-----------
  1 file changed, 21 insertions(+), 11 deletions(-)
 
 commit 7c6527fa05389f705872aaaaff12e739b5d1577e
@@ -27813,7 +30988,7 @@ Date:	Fri Dec 12 00:41:21 2008 +0100
 
     don't install Function.cc, as it is not an header
 
- poppler/Makefile.am |	  1 -
+ poppler/Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
 commit 0179e21b128ffccb5afd13203137ab8435197609
@@ -27822,10 +30997,10 @@ Date:	Fri Dec 12 00:16:38 2008 +0100
 
     Be more helpful with bad boys that want to use poppler core directly
 
- fofi/Makefile.am     |   10 ++++++++++
- splash/SplashClip.h  |    2 +-
- splash/SplashPath.h  |    2 +-
- splash/SplashXPath.h |    2 +-
+ fofi/Makefile.am     | 10 ++++++++++
+ splash/SplashClip.h  |  2 +-
+ splash/SplashPath.h  |  2 +-
+ splash/SplashXPath.h |  2 +-
  4 files changed, 13 insertions(+), 3 deletions(-)
 
 commit 401632e4eeb4b10b1183a820f32461da77e8e4f2
@@ -27834,7 +31009,7 @@ Date:	Fri Dec 12 00:14:04 2008 +0100
 
     Try harder to look for openjpeg
 
- cmake/modules/FindLIBOPENJPEG.cmake |	  2 +-
+ cmake/modules/FindLIBOPENJPEG.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ab539f46089702f60b96b1ba2b2bc1544173c264
@@ -27847,7 +31022,7 @@ Date:	Thu Dec 11 23:15:45 2008 +0100
     children (Table 8.4) so if there is no last reference, don't try to
     read children.
 
- poppler/Outline.cc |	 4 ++++
+ poppler/Outline.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit c9a755f9fd14511f43a2ca7fcda36bdd64bb1d87
@@ -27858,7 +31033,7 @@ Date:	Sun Dec 7 17:59:19 2008 +0100
 
     Bug 18924
 
- poppler/Page.cc |    4 ++++
+ poppler/Page.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 4cd364c179ae91ed383a8237ba1ad263952fd7aa
@@ -27867,7 +31042,7 @@ Date:	Sun Nov 30 16:57:52 2008 +0100
 
     add my copyright here
 
- qt4/src/poppler-private.cc |	 1 +
+ qt4/src/poppler-private.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6b1676deb773675d90469adc84c3de8dcdaf174c
@@ -27876,7 +31051,7 @@ Date:	Sun Nov 30 16:56:43 2008 +0100
 
     [Qt4] support URI actions for TOC items
 
- qt4/src/poppler-private.cc |	 5 +++++
+ qt4/src/poppler-private.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit b5cd58b5565055fd0c13771461245ddcd80edfcf
@@ -27886,8 +31061,8 @@ Date:	Sun Nov 30 16:34:57 2008 +0100
     extract the LinkAction "serialization" in an own function, and make
     it more safe
 
- qt4/src/poppler-private.cc |	85
- ++++++++++++++++++++++++++++++--------------
+ qt4/src/poppler-private.cc | 85
+ ++++++++++++++++++++++++++++++++--------------
  1 file changed, 59 insertions(+), 26 deletions(-)
 
 commit ee191363e22940ae7b06945e68c4738b17c78348
@@ -27896,12 +31071,12 @@ Date:	Sun Nov 30 16:17:32 2008 +0100
 
     move the addTocChildren() implementation in the cpp
 
- qt4/src/poppler-form.cc    |	 1 +
- qt4/src/poppler-page.cc    |	 1 +
- qt4/src/poppler-private.cc |	65
- ++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-private.h  |	64
- ++-----------------------------------------
+ qt4/src/poppler-form.cc    |  1 +
+ qt4/src/poppler-page.cc    |  1 +
+ qt4/src/poppler-private.cc | 65
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-private.h  | 64
+ ++-------------------------------------------
  4 files changed, 69 insertions(+), 62 deletions(-)
 
 commit f8eaabf1aa7e384619129a7509be85d0c3bfb825
@@ -27910,7 +31085,7 @@ Date:	Sun Nov 30 13:33:12 2008 +0100
 
     Update copyrights of the last commits
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5f4fedfae6098e25644ffe5d4b1ed0bac043841d
@@ -27922,7 +31097,7 @@ Date:	Sat Nov 29 19:51:27 2008 +0100
     This is a optimization to save a few reallocations, if the Length
     value is incorrect it will still work
 
- poppler/JPEG2000Stream.cc |   10 ++++++++--
+ poppler/JPEG2000Stream.cc | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 12f6d6ba2052fbdc8ea4ba7c7c9277e75bf170a5
@@ -27936,7 +31111,7 @@ Date:	Sun Nov 23 18:20:14 2008 +0100
     objects outside the content stream, the property list dictionary must
     instead be defined as a named resource.
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 817e123a28e9f6b7e5be23f7ac2ba3bcec5e3f3f
@@ -27945,8 +31120,8 @@ Date:	Sat Nov 22 21:48:37 2008 +1030
 
     Don't compare print flag for non Type 3 fonts in cairo font cache
 
- poppler/CairoFontEngine.cc |	 7 ++++++-
- poppler/CairoFontEngine.h  |	 4 +++-
+ poppler/CairoFontEngine.cc | 7 ++++++-
+ poppler/CairoFontEngine.h  | 4 +++-
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 68f8ade28764855d4f663607c50c8202b1268296
@@ -27957,7 +31132,7 @@ Date:	Sun Nov 23 10:54:46 2008 +0100
 
     Thanks to Bernard Leak for notifying
 
- test/pdf-inspector.cc |    2 +-
+ test/pdf-inspector.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4a4fa7ed44a87e47a6078a1f7bb6f41071672ea7
@@ -27966,7 +31141,7 @@ Date:	Tue Nov 18 20:11:07 2008 +0100
 
     Fix a crash when selecting text in word mode
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a6f5032ab0d6edbf3879f39efff7916b1f7233da
@@ -27975,7 +31150,7 @@ Date:	Sun Nov 16 18:24:06 2008 +0100
 
     optContentConfig is not actually stored in PDFDoc but in Catalog
 
- poppler/PDFDoc.h |    1 -
+ poppler/PDFDoc.h | 1 -
  1 file changed, 1 deletion(-)
 
 commit b843ac34c6c4ca1580f99fa2220c59dfcd91f026
@@ -27984,7 +31159,7 @@ Date:	Sat Nov 15 14:49:02 2008 +0100
 
     [Qt4] deserialize the value of the 'right' coordinate, too
 
- qt4/src/poppler-link.cc |   11 ++++++-----
+ qt4/src/poppler-link.cc | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 03061fdae49842556c9ff48e61914fc88502e1d8
@@ -27995,8 +31170,8 @@ Date:	Thu Nov 13 22:32:22 2008 +0100
 
     Fixes bug 17496
 
- configure.ac	  |   14 ++++++++++++++
- test/Makefile.am |    6 ++++--
+ configure.ac	  | 14 ++++++++++++++
+ test/Makefile.am |  6 ++++--
  2 files changed, 18 insertions(+), 2 deletions(-)
 
 commit 17b18be4fd25f2ca2b4ed7382d9fda50410c44f1
@@ -28007,7 +31182,7 @@ Date:	Wed Nov 12 20:40:57 2008 +1030
 
     Fixes bugs #18254 and #18429
 
- poppler/CairoOutputDev.cc |   15 ++++++++++++++-
+ poppler/CairoOutputDev.cc | 15 ++++++++++++++-
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 commit e2257e6916cd1067d43db9ed45f944413c61ed64
@@ -28016,12 +31191,12 @@ Date:	Sun Nov 9 22:44:48 2008 +0100
 
     Update copyrights of the last commits
 
- poppler/CairoFontEngine.cc    |    1 +
- poppler/CairoFontEngine.h     |    1 +
- poppler/Form.cc	       |    2 +-
- poppler/Gfx.h		       |    1 +
- poppler/OptionalContent.h     |    1 +
- qt4/src/poppler-optcontent.cc |    1 +
+ poppler/CairoFontEngine.cc    | 1 +
+ poppler/CairoFontEngine.h     | 1 +
+ poppler/Form.cc	       | 2 +-
+ poppler/Gfx.h		       | 1 +
+ poppler/OptionalContent.h     | 1 +
+ qt4/src/poppler-optcontent.cc | 1 +
  6 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 069f8ad9453e612e907b561aa50983c34400193d
@@ -28030,8 +31205,8 @@ Date:	Sun Nov 9 20:36:06 2008 +0100
 
     MakeItBuild
 
- glib/CMakeLists.txt	  |    1 +
- glib/demo/CMakeLists.txt |    1 +
+ glib/CMakeLists.txt	  | 1 +
+ glib/demo/CMakeLists.txt | 1 +
  2 files changed, 2 insertions(+)
 
 commit 04025c4f65bbb7e4330f6d17d917a035c0906f3d
@@ -28043,7 +31218,7 @@ Date:	Sun Nov 9 17:03:20 2008 +0100
     Forms crate a temp annot just to get the font size of the form field
     passing a NULL catalog.
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 471255c5a3850984997d91c7850759eb0c7e8a9c
@@ -28052,11 +31227,11 @@ Date:	Sat Nov 8 20:58:57 2008 +0100
 
     [glib-demo] Add Optional Content demo
 
- glib/demo/Makefile.am |    2 +
- glib/demo/layers.c    |  511
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/layers.h    |   31 +++
- glib/demo/main.c      |    4 +-
+ glib/demo/Makefile.am |   2 +
+ glib/demo/layers.c    | 511
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/layers.h    |  31 +++
+ glib/demo/main.c      |   4 +-
  4 files changed, 547 insertions(+), 1 deletion(-)
 
 commit 7363c25e1d83332932d9b4fe16d7fb4e364da628
@@ -28065,15 +31240,15 @@ Date:	Sun Oct 26 19:47:35 2008 +0100
 
     [glib] Add Optional Content support
 
- glib/Makefile.am	   |	2 +
- glib/poppler-document.cc  |  377
- +++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h   |   12 ++
- glib/poppler-layer.cc	   |  201 ++++++++++++++++++++++++
- glib/poppler-layer.h	   |   43 ++++++
- glib/poppler-private.h    |   21 +++
- glib/poppler.h		   |	3 +
- glib/test-poppler-glib.cc |   52 ++++++-
+ glib/Makefile.am	   |   2 +
+ glib/poppler-document.cc  | 377
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h   |  12 ++
+ glib/poppler-layer.cc	   | 201 ++++++++++++++++++++++++
+ glib/poppler-layer.h	   |  43 ++++++
+ glib/poppler-private.h    |  21 +++
+ glib/poppler.h		   |   3 +
+ glib/test-poppler-glib.cc |  52 ++++++-
  8 files changed, 710 insertions(+), 1 deletion(-)
 
 commit c674566f458b54097f21aae0d4bf8637146565c5
@@ -28082,8 +31257,8 @@ Date:	Sun Oct 26 19:42:53 2008 +0100
 
     Fix memory leaks in OptionalContent
 
- poppler/OptionalContent.cc |	13 +++----------
- poppler/OptionalContent.h  |	10 ++++++----
+ poppler/OptionalContent.cc | 13 +++----------
+ poppler/OptionalContent.h  | 10 ++++++----
  2 files changed, 9 insertions(+), 14 deletions(-)
 
 commit 06ca313b8ecb8abb8dec3b418d118525b7bb0fdf
@@ -28092,8 +31267,8 @@ Date:	Sun Oct 26 19:11:45 2008 +0100
 
     Check annotation optional content properties before drawing it
 
- poppler/Annot.cc |   20 ++++++++++++--------
- poppler/Annot.h  |    4 ++--
+ poppler/Annot.cc | 20 ++++++++++++--------
+ poppler/Annot.h  |  4 ++--
  2 files changed, 14 insertions(+), 10 deletions(-)
 
 commit a6d58927b048aa043cb6b6ed3ee9aeb213578924
@@ -28105,9 +31280,9 @@ Date:	Sat Nov 8 20:50:40 2008 +0100
     Before any draw operation we first check whether we are inside an
     optional marked content element that is currently hidden.
 
- poppler/Gfx.cc |  113
- +++++++++++++++++++++++++++++++++++++++-----------------
- poppler/Gfx.h	|    7 +++-
+ poppler/Gfx.cc | 113
+ ++++++++++++++++++++++++++++++++++++++++-----------------
+ poppler/Gfx.h	|   7 +++-
  2 files changed, 84 insertions(+), 36 deletions(-)
 
 commit 5f168f991477e291290350a28f4a60a565e187b9
@@ -28116,7 +31291,7 @@ Date:	Mon Oct 20 17:56:11 2008 +0200
 
     [glib] Show action titles when printing the index in test program
 
- glib/test-poppler-glib.cc |   13 ++++++++-----
+ glib/test-poppler-glib.cc | 13 ++++++++-----
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 commit a906d12e16748d9a40c0db4043a576fd3d004341
@@ -28125,10 +31300,10 @@ Date:	Sat Nov 8 20:20:00 2008 +0100
 
     Minor code cleanup and consistency issues
 
- poppler/OptionalContent.cc	|   22 +++++++++++-----------
- poppler/OptionalContent.h	|    8 ++++----
- qt4/src/poppler-optcontent.cc	|    6 +++---
- qt4/tests/check_optcontent.cpp |    8 ++++----
+ poppler/OptionalContent.cc	| 22 +++++++++++-----------
+ poppler/OptionalContent.h	|  8 ++++----
+ qt4/src/poppler-optcontent.cc	|  6 +++---
+ qt4/tests/check_optcontent.cpp |  8 ++++----
  4 files changed, 22 insertions(+), 22 deletions(-)
 
 commit e73c2ce906b7e1f06d641f7e0733aad6336b4091
@@ -28137,9 +31312,9 @@ Date:	Sun Oct 19 12:44:13 2008 +0200
 
     Delete the optContent object if it's invalid
 
- poppler/Catalog.cc	    |	 4 ++++
- poppler/OptionalContent.cc |	 3 +++
- poppler/OptionalContent.h  |	 5 +++++
+ poppler/Catalog.cc	    | 4 ++++
+ poppler/OptionalContent.cc | 3 +++
+ poppler/OptionalContent.h  | 5 +++++
  3 files changed, 12 insertions(+)
 
 commit 2900e7e4c920d735d5a727e9e39f71df97bd7b93
@@ -28148,7 +31323,7 @@ Date:	Sat Nov 8 18:12:47 2008 +0100
 
     A new cairo is needed
 
- CMakeLists.txt |    2 +-
+ CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit aaaecd2e86769d3a99e21577448a193711985958
@@ -28160,7 +31335,7 @@ Date:	Wed Nov 5 22:47:30 2008 +0100
 
     For the bug 18374 it works and does not seem a security problem
 
- poppler/GfxState.cc |	  7 ++++---
+ poppler/GfxState.cc | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 82f4228a50efe6447c68f7f6d34a7805b7e4b75e
@@ -28169,7 +31344,7 @@ Date:	Wed Nov 5 20:57:17 2008 +0100
 
     Add myself here
 
- qt4/demos/viewer.cpp |    1 +
+ qt4/demos/viewer.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8df7d83439f0e9ab200840f912f1c08bbf44bd6e
@@ -28178,7 +31353,7 @@ Date:	Wed Nov 5 20:49:01 2008 +0100
 
     [Qt4Demo] Fix leak
 
- qt4/demos/viewer.cpp |    1 +
+ qt4/demos/viewer.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit d3c424e0362f53bda5c4e2e415823d78ace76253
@@ -28188,7 +31363,7 @@ Date:	Wed Nov 5 20:14:17 2008 +0100
     Rename i to j so that code is more clear by not shadowing the
     function parameter
 
- poppler/Catalog.cc |	 8 ++++----
+ poppler/Catalog.cc | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 9d12de9b59de4336eabb423f7bf0363b6a35e2a8
@@ -28200,7 +31375,7 @@ Date:	Wed Nov 5 20:00:01 2008 +0100
     Putting more than one "logical line" per "real line" is evil, we
     think if will group it, but does not
 
- poppler/UnicodeTypeTable.cc |	  7 +++++--
+ poppler/UnicodeTypeTable.cc | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 commit fc61dad9daa15f83802ffa5c3cd9b59d80bb310b
@@ -28209,7 +31384,7 @@ Date:	Wed Nov 5 19:52:00 2008 +0100
 
     [Qt] Fix leak
 
- qt/poppler-link.cc |	 8 +++++++-
+ qt/poppler-link.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit 981fb857b0afb1cda7836744dcf37906285512b4
@@ -28218,7 +31393,7 @@ Date:	Wed Nov 5 19:49:18 2008 +0100
 
     [Qt] Fix memory leak
 
- qt/poppler-document.cc |    4 +++-
+ qt/poppler-document.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit e925e92d5cbfc009c138ece117227a3b0894ead6
@@ -28227,7 +31402,7 @@ Date:	Wed Nov 5 19:44:40 2008 +0100
 
     Do not leak uBuf in the error case
 
- poppler/CharCodeToUnicode.cc |    1 +
+ poppler/CharCodeToUnicode.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0741a402632ec5a8641ff11707142bf2731c1833
@@ -28236,11 +31411,11 @@ Date:	Sat Nov 1 22:27:48 2008 +1030
 
     Restore the cairo Type3 font image prescaling funtionality
 
- poppler/CairoFontEngine.cc |	49
- ++++++++++++++++++++++++++------------------
- poppler/CairoFontEngine.h  |	20 ++++++++++--------
- poppler/CairoOutputDev.cc  |	 2 +-
- poppler/CairoOutputDev.h   |	 2 +-
+ poppler/CairoFontEngine.cc | 49
+ +++++++++++++++++++++++++++-------------------
+ poppler/CairoFontEngine.h  | 20 +++++++++++--------
+ poppler/CairoOutputDev.cc  |  2 +-
+ poppler/CairoOutputDev.h   |  2 +-
  4 files changed, 43 insertions(+), 30 deletions(-)
 
 commit 91a7c3fdd44f30b0b50ed05a3313bbb1b5c86e71
@@ -28252,7 +31427,7 @@ Date:	Sat Nov 1 20:57:24 2008 +1030
     Not sure why this was previously required but it now produces
     incorrect results.
 
- poppler/CairoOutputDev.cc |	5 -----
+ poppler/CairoOutputDev.cc | 5 -----
  1 file changed, 5 deletions(-)
 
 commit 3bf4d7d75b455a9a0b5ee3a8c78b218e5af5185a
@@ -28261,7 +31436,7 @@ Date:	Sat Nov 1 20:50:07 2008 +1030
 
     Transform the glyph advance by the font matrix
 
- poppler/CairoFontEngine.cc |	 1 +
+ poppler/CairoFontEngine.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 4aa32bad61d008a854fdc9e902d6834bb1687d7e
@@ -28270,7 +31445,7 @@ Date:	Sat Nov 1 20:49:04 2008 +1030
 
     Use the font BBox, not the font matrix to set the Gfx BBox
 
- poppler/CairoFontEngine.cc |	 1 +
+ poppler/CairoFontEngine.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 987955440c7711f440c3d2b5cc8c05ec07228a77
@@ -28281,7 +31456,7 @@ Date:	Sat Nov 1 20:47:05 2008 +1030
 
     we use for transforming the glyph metrics.
 
- poppler/CairoFontEngine.cc |	 6 +++---
+ poppler/CairoFontEngine.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 5c051aa117477cba5d350adfc539acb4b5f2a56a
@@ -28290,7 +31465,7 @@ Date:	Sat Nov 1 01:59:07 2008 +1030
 
     Require cairo 1.8.2 for user-font support
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit a3edfa30680864b95a5196c5619846de42980857
@@ -28299,11 +31474,11 @@ Date:	Sat Nov 1 01:57:32 2008 +1030
 
     Implement Type 3 fonts in cairo backend using cairo user-fonts
 
- poppler/CairoFontEngine.cc |  174
- ++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoFontEngine.h  |	18 +++++
- poppler/CairoOutputDev.cc  |	 9 ++-
- poppler/CairoOutputDev.h   |	 4 +-
+ poppler/CairoFontEngine.cc | 174
+ +++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoFontEngine.h  |  18 +++++
+ poppler/CairoOutputDev.cc  |	9 ++-
+ poppler/CairoOutputDev.h   |	4 +-
  4 files changed, 194 insertions(+), 11 deletions(-)
 
 commit feab1e982a2ee39bb372d593633a06b6a499822f
@@ -28312,8 +31487,8 @@ Date:	Sat Nov 1 01:21:39 2008 +1030
 
     Add CairoOutputDev functions for getting Type 3 glyph metrics
 
- poppler/CairoOutputDev.cc |   10 ++++++++++
- poppler/CairoOutputDev.h  |	7 +++++++
+ poppler/CairoOutputDev.cc | 10 ++++++++++
+ poppler/CairoOutputDev.h  |  7 +++++++
  2 files changed, 17 insertions(+)
 
 commit a75efe208d899d4a23d5e2fcef200e4225721636
@@ -28322,12 +31497,12 @@ Date:	Sat Nov 1 00:26:40 2008 +1030
 
     Make the catalog available to CairoFontEngine
 
- glib/poppler-document.cc   |	 3 ++-
- poppler/CairoFontEngine.cc |	 2 +-
- poppler/CairoFontEngine.h  |	 3 ++-
- poppler/CairoOutputDev.cc  |	 7 +++++--
- poppler/CairoOutputDev.h   |	 3 ++-
- test/pdf-inspector.cc	    |	 2 +-
+ glib/poppler-document.cc   | 3 ++-
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoFontEngine.h  | 3 ++-
+ poppler/CairoOutputDev.cc  | 7 +++++--
+ poppler/CairoOutputDev.h   | 3 ++-
+ test/pdf-inspector.cc	    | 2 +-
  6 files changed, 13 insertions(+), 7 deletions(-)
 
 commit 941d3976c496b75a3c5a9d19b80044fc2b57bd98
@@ -28338,8 +31513,8 @@ Date:	Fri Oct 31 22:44:41 2008 +1030
 
     for the same document that shares the same CairoFontEngine.
 
- poppler/CairoOutputDev.cc |   16 +++++++++++-----
- poppler/CairoOutputDev.h  |	4 +++-
+ poppler/CairoOutputDev.cc | 16 +++++++++++-----
+ poppler/CairoOutputDev.h  |  4 +++-
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 commit 94cff513d8589f51b243fcb078f82cb931bb6d35
@@ -28348,7 +31523,7 @@ Date:	Fri Oct 31 21:11:01 2008 +1030
 
     Use correct return type in _ft_new_face
 
- poppler/CairoFontEngine.cc |	 2 +-
+ poppler/CairoFontEngine.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0b5ee897a24ce1edfca19a3b843f9b7ee7026d07
@@ -28360,9 +31535,9 @@ Date:	Fri Oct 31 20:55:14 2008 +1030
     Create a CairoFreeType subclass and move the FreeType specific code
     into it.
 
- poppler/CairoFontEngine.cc |  197
- +++++++++++++++++++++++++-------------------
- poppler/CairoFontEngine.h  |	26 ++++--
+ poppler/CairoFontEngine.cc | 197
+ +++++++++++++++++++++++++--------------------
+ poppler/CairoFontEngine.h  |  26 ++++--
  2 files changed, 131 insertions(+), 92 deletions(-)
 
 commit a5865dae5b414de5f6dbda2a512101050c374e06
@@ -28371,21 +31546,21 @@ Date:	Tue Oct 28 10:30:59 2008 +0100
 
     [glib] Add DISABLE_SINGLE_INCLUDES flags and fix glib-demo
 
- configure.ac		 |    4 ++++
- glib/Makefile.am	 |    3 ++-
- glib/demo/Makefile.am	 |    3 ++-
- glib/demo/annots.h	 |    2 +-
- glib/demo/attachments.h |    2 +-
- glib/demo/fonts.h	 |    2 +-
- glib/demo/forms.h	 |    2 +-
- glib/demo/images.h	 |    2 +-
- glib/demo/info.h	 |    2 +-
- glib/demo/links.h	 |    2 +-
- glib/demo/outline.h	 |    2 +-
- glib/demo/page.h	 |    2 +-
- glib/demo/render.h	 |    2 +-
- glib/demo/transitions.h |    2 +-
- glib/demo/utils.h	 |    2 +-
+ configure.ac		 | 4 ++++
+ glib/Makefile.am	 | 3 ++-
+ glib/demo/Makefile.am	 | 3 ++-
+ glib/demo/annots.h	 | 2 +-
+ glib/demo/attachments.h | 2 +-
+ glib/demo/fonts.h	 | 2 +-
+ glib/demo/forms.h	 | 2 +-
+ glib/demo/images.h	 | 2 +-
+ glib/demo/info.h	 | 2 +-
+ glib/demo/links.h	 | 2 +-
+ glib/demo/outline.h	 | 2 +-
+ glib/demo/page.h	 | 2 +-
+ glib/demo/render.h	 | 2 +-
+ glib/demo/transitions.h | 2 +-
+ glib/demo/utils.h	 | 2 +-
  15 files changed, 20 insertions(+), 14 deletions(-)
 
 commit e07bfb54b77430e10e50c33151cf0afc9854006c
@@ -28394,7 +31569,7 @@ Date:	Tue Oct 28 10:29:51 2008 +0100
 
     [glib] Fix build when compiling with GTK_DISABLE_SINGLE_INCLUDES
 
- glib/poppler-page.h |	  3 +--
+ glib/poppler-page.h | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit a84d272ffd2b593ac98148e71b83fba299c60fea
@@ -28403,10 +31578,10 @@ Date:	Tue Oct 28 10:01:00 2008 +0100
 
     [glib] Add disable deprecated compile flags and fix compile warnings
 
- configure.ac		 |    6 ++++++
- glib/Makefile.am	 |    3 ++-
- glib/demo/Makefile.am	 |    4 +++-
- glib/demo/attachments.c |    4 ++--
+ configure.ac		 | 6 ++++++
+ glib/Makefile.am	 | 3 ++-
+ glib/demo/Makefile.am	 | 4 +++-
+ glib/demo/attachments.c | 4 ++--
  4 files changed, 13 insertions(+), 4 deletions(-)
 
 commit 43f2b84a81625abee84c93cdced7fb92c99cd944
@@ -28415,7 +31590,7 @@ Date:	Tue Oct 21 23:00:55 2008 +0200
 
     [Qt4] Small docu improvement
 
- qt4/src/poppler-qt4.h |    3 +++
+ qt4/src/poppler-qt4.h | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 00f9995b4960575cd1f392474c585f2140c8e587
@@ -28426,7 +31601,7 @@ Date:	Sun Oct 12 14:20:01 2008 +0200
 
     See bug 18023 for more info
 
- poppler/TextOutputDev.cc |    4 +++-
+ poppler/TextOutputDev.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 084cc4335cfe2c0e66219eba4c1177ee7ff018c5
@@ -28436,7 +31611,7 @@ Date:	Fri Oct 10 23:15:35 2008 +0200
     obj4 should be the index 1 on the Array, not the 0, that's already
     obj3
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d7442c90206d4b7a8ebc58f995647eb87ac35f42
@@ -28445,7 +31620,7 @@ Date:	Thu Oct 9 22:53:00 2008 +0200
 
     If Name is a Ref we want to get the String it references, not the Ref
 
- poppler/OptionalContent.cc |	 2 +-
+ poppler/OptionalContent.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 93f8dd9e837557bbfc0f058a664c356e3d6e82c0
@@ -28454,11 +31629,11 @@ Date:	Thu Oct 9 21:28:27 2008 +0200
 
     Poppler 0.10.0
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   16 ++++++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 16 ++++++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 22 insertions(+), 6 deletions(-)
 
 commit cdd9bf016de0d3f96b1d5e304c9d02f2bf71ff18
@@ -28467,7 +31642,7 @@ Date:	Wed Oct 8 22:29:11 2008 +0200
 
     Initialize properly OptionalContentGroup::m_name
 
- poppler/OptionalContent.cc |	 3 ++-
+ poppler/OptionalContent.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit c7b87f3b8cbbcca29a1974debc2233f621a2e33b
@@ -28476,7 +31651,7 @@ Date:	Mon Oct 6 19:32:27 2008 +0200
 
     Fix link on Mingw+Msys
 
- test/Makefile.am |    2 +-
+ test/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e92255296511cae9cbbac8de800d8b26e5f681f1
@@ -28487,7 +31662,7 @@ Date:	Sun Oct 5 15:57:06 2008 +0200
     created by
     the (failed) exporting
 
- qt4/src/poppler-pdf-converter.cc |   13 +++++++++++++
+ qt4/src/poppler-pdf-converter.cc | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 commit 360f470b852e37d400949343763a18bf598820e8
@@ -28496,7 +31671,7 @@ Date:	Sat Oct 4 20:04:44 2008 +0200
 
     Remove unused var
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit df7317f1320513b4f66cb6618d753b82042671f5
@@ -28505,7 +31680,7 @@ Date:	Sat Oct 4 19:48:57 2008 +0200
 
     free the object
 
- poppler/PDFDoc.cc |	4 ++++
+ poppler/PDFDoc.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 9946d9af9dd5d5b96d5c777413a3e253dfd1f291
@@ -28515,7 +31690,7 @@ Date:	Sat Oct 4 19:39:46 2008 +0200
     If we try saving a document that was encrypted, we break everything,
     so just fail early
 
- poppler/PDFDoc.cc |	7 +++++++
+ poppler/PDFDoc.cc | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 108959432af7714cb8ffe42d98d40c97f936a2e6
@@ -28524,7 +31699,7 @@ Date:	Sat Oct 4 19:39:24 2008 +0200
 
     Correctly return wheter it was saved or not
 
- qt4/src/poppler-pdf-converter.cc |    8 +++++---
+ qt4/src/poppler-pdf-converter.cc | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 4c6cb1c204d782e2ac2113b57f6d372b4716017d
@@ -28533,7 +31708,7 @@ Date:	Sat Oct 4 01:46:58 2008 +0200
 
     Remove spurious //
 
- fofi/FoFiType1.cc |	2 +-
+ fofi/FoFiType1.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e8e7809ab4b115cbe67251da12989fc024912514
@@ -28546,7 +31721,7 @@ Date:	Sat Oct 4 01:43:02 2008 +0200
     Fixes bug 17018, while at it, i've added some comments and some
     error() to make things a bit clearer
 
- fofi/FoFiType1.cc |   28 ++++++++++++++++++++++++----
+ fofi/FoFiType1.cc | 28 ++++++++++++++++++++++++----
  1 file changed, 24 insertions(+), 4 deletions(-)
 
 commit 7604e025038fee24c2cb3001f2100d5d1e48efe1
@@ -28557,7 +31732,7 @@ Date:	Sat Oct 4 00:35:46 2008 +0200
 
     we suck :-( Fixes kde bug 172105
 
- qt4/src/poppler-link-extractor.cc |	3 +++
+ qt4/src/poppler-link-extractor.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 450b21e4528a8e890d3dda37ecb0a68602f8efaa
@@ -28566,8 +31741,8 @@ Date:	Wed Oct 1 00:46:29 2008 +0200
 
     I've changed these files this year too, update copyright
 
- goo/gmem.cc |	  2 +-
- goo/gmem.h  |	  2 +-
+ goo/gmem.cc | 2 +-
+ goo/gmem.h  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 98310ca24841789cf53b10d34e271ceb4e054001
@@ -28579,8 +31754,8 @@ Date:	Tue Sep 30 23:59:43 2008 +0200
 
     Fixes bug 17852
 
- poppler/Function.cc |	  2 ++
- poppler/GfxState.cc |	  2 +-
+ poppler/Function.cc | 2 ++
+ poppler/GfxState.cc | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit d12f5f4395eb18f8d29182e24acddd3e2b5cfe88
@@ -28589,11 +31764,11 @@ Date:	Tue Sep 30 23:20:26 2008 +0200
 
     0.9.3
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   17 +++++++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 17 +++++++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 23 insertions(+), 6 deletions(-)
 
 commit d61e464754521555a06ed0901955f49be4def29a
@@ -28602,8 +31777,8 @@ Date:	Tue Sep 30 19:26:17 2008 +0200
 
     Timothy also agreed, now Ed Catmur is the last one missing to answer
 
- utils/ImageOutputDev.cc |    3 +++
- utils/ImageOutputDev.h  |    3 +++
+ utils/ImageOutputDev.cc | 3 +++
+ utils/ImageOutputDev.h  | 3 +++
  2 files changed, 6 insertions(+)
 
 commit 3225f54fea7cbb6b25d7223268cdeccfdd823375
@@ -28614,11 +31789,11 @@ Date:	Tue Sep 30 00:27:49 2008 +0200
 
     Only Timothy Lee and Ed Catmur left :-)
 
- poppler/Catalog.cc |	 3 +++
- poppler/Outline.cc |	 3 +++
- poppler/Outline.h  |	 3 +++
- splash/Splash.cc   |	 3 +++
- splash/Splash.h    |	 3 +++
+ poppler/Catalog.cc | 3 +++
+ poppler/Outline.cc | 3 +++
+ poppler/Outline.h  | 3 +++
+ splash/Splash.cc   | 3 +++
+ splash/Splash.h    | 3 +++
  5 files changed, 15 insertions(+)
 
 commit 268d803c9dd67b7f78f8dcdc3c7653c8b2c2d08f
@@ -28627,7 +31802,7 @@ Date:	Mon Sep 29 21:14:40 2008 +0200
 
     Let HmtlOutputDev process images
 
- utils/HtmlOutputDev.h |    3 ++-
+ utils/HtmlOutputDev.h | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit a29984ab777c64a1cb286b667a6a91ad9b191f40
@@ -28644,10 +31819,10 @@ Date:	Sun Sep 28 23:38:34 2008 +0200
 
     [Qt4] various apidox improvements
 
- qt4/src/Mainpage.dox	|   10 +---
- qt4/src/poppler-link.h |   92 ++++++++++++++++++++++++++++++++----
- qt4/src/poppler-qt4.h	|  121
- ++++++++++++++++++++++++++++++++----------------
+ qt4/src/Mainpage.dox	|  10 +---
+ qt4/src/poppler-link.h |  92 +++++++++++++++++++++++++++++++++----
+ qt4/src/poppler-qt4.h	| 121
+ +++++++++++++++++++++++++++++++++----------------
  3 files changed, 168 insertions(+), 55 deletions(-)
 
 commit 68658721583b05ebacb1165ac36e91d49735bbd9
@@ -28657,7 +31832,7 @@ Date:	Sun Sep 28 19:29:06 2008 +0200
     If tables is null, don't try to write to file as it'll crash, fixes
     crash on 17811 when using cairooutputdev
 
- fofi/FoFiTrueType.cc |    4 ++++
+ fofi/FoFiTrueType.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 3cb5b7fc5ae168ef58fd1905f61c1b9abe6cb86c
@@ -28668,9 +31843,9 @@ Date:	Sun Sep 28 19:25:53 2008 +0200
 
     Fixes the other part of bug 17811
 
- fofi/FoFiTrueType.cc |    4 ++--
- goo/gmem.cc	      |   21 +++++++++++++++++++++
- goo/gmem.h	      |    1 +
+ fofi/FoFiTrueType.cc |  4 ++--
+ goo/gmem.cc	      | 21 +++++++++++++++++++++
+ goo/gmem.h	      |  1 +
  3 files changed, 24 insertions(+), 2 deletions(-)
 
 commit aa7ef03af49f74ed558dcbab8ad4c594bb2b7d53
@@ -28681,7 +31856,7 @@ Date:	Sun Sep 28 19:24:43 2008 +0200
 
     Fixes part of bug 17811
 
- poppler/DCTStream.cc |    1 +
+ poppler/DCTStream.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit e2461c9aa4d74b5511621d7222979948e31541ad
@@ -28690,8 +31865,8 @@ Date:	Sun Sep 28 18:07:25 2008 +0200
 
     [Qt4] Activate the 'printing' flag by default in the PSConverter.
 
- qt4/src/poppler-ps-converter.cc |    2 +-
- qt4/src/poppler-qt4.h		 |    2 ++
+ qt4/src/poppler-ps-converter.cc | 2 +-
+ qt4/src/poppler-qt4.h		 | 2 ++
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 957d7acb66635e9748c6bc7a31cdbbcbb8da9011
@@ -28700,10 +31875,10 @@ Date:	Sat Sep 27 17:23:20 2008 +0200
 
     Misc mingw fixes
 
- configure.ac	   |	2 +-
- glib/Makefile.am  |	2 +-
- glib/demo/info.cc |	1 +
- m4/libjpeg.m4	   |	2 +-
+ configure.ac	   | 2 +-
+ glib/Makefile.am  | 2 +-
+ glib/demo/info.cc | 1 +
+ m4/libjpeg.m4	   | 2 +-
  4 files changed, 4 insertions(+), 3 deletions(-)
 
 commit b3828203c4e594754957033ea826e8e22164fd5b
@@ -28714,7 +31889,7 @@ Date:	Fri Sep 26 23:08:14 2008 +0200
 
     Only miss, Marco Pesenti Gritti, Timothy Lee and Ed Catmur
 
- poppler/CairoOutputDev.cc |	3 +++
+ poppler/CairoOutputDev.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit a197a07728d19abc2708979c95b4ef53e88fcb55
@@ -28723,7 +31898,7 @@ Date:	Fri Sep 26 18:42:05 2008 +0200
 
     Compile where localtime_r is not available
 
- glib/demo/info.cc |   10 ++++++++--
+ glib/demo/info.cc | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 commit 38884e1722ac7e15c62cece20035c5fb0020f4b3
@@ -28735,7 +31910,7 @@ Date:	Wed Sep 24 14:18:38 2008 +0200
 
     Fixes pdf on KDE bug 171365
 
- poppler/GfxFont.cc |	 2 +-
+ poppler/GfxFont.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0e080aaf44816e5d5b9008f3c2fb54868932f0ac
@@ -28746,8 +31921,8 @@ Date:	Wed Sep 24 13:12:13 2008 +0200
 
     Spotted by Carlo Bramini
 
- test/gtk-cairo-test.cc |    3 ---
- test/pdf-inspector.cc	|    3 ---
+ test/gtk-cairo-test.cc | 3 ---
+ test/pdf-inspector.cc	| 3 ---
  2 files changed, 6 deletions(-)
 
 commit 6888b023fdb199d3c5fb705bd928aedf68eeffdb
@@ -28759,7 +31934,7 @@ Date:	Tue Sep 23 23:28:04 2008 +0200
 
     Fixes bug 17744
 
- poppler/SplashOutputDev.cc |	 4 +++-
+ poppler/SplashOutputDev.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 539d29f4f3b24b98c9fc5f88d3477e427fbe409d
@@ -28768,11 +31943,11 @@ Date:	Tue Sep 23 22:39:50 2008 +0200
 
     0.9.2
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   19 +++++++++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 19 +++++++++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 25 insertions(+), 6 deletions(-)
 
 commit abd070a79d8345bda3853395a39e4e2882c4ff8a
@@ -28784,7 +31959,7 @@ Date:	Mon Sep 22 20:23:11 2008 +0200
     Benchmarking in release mode, both in "human feel" and callgrind
     the benefit/lost is almost inexistant
 
- poppler/Object.h |   36 ++++++++++++++++++++++--------------
+ poppler/Object.h | 36 ++++++++++++++++++++++--------------
  1 file changed, 22 insertions(+), 14 deletions(-)
 
 commit df47e4c441e4ec79b1bb40de7044c9501f243b76
@@ -28804,9 +31979,9 @@ Date:	Tue Sep 16 12:56:04 2008 +0100
     just 90
     MiB.
 
- configure.ac		    |	 1 +
- poppler/CairoFontEngine.cc |  214
- ++++++++++++++++++++++++++++++++++++++------
+ configure.ac		    |	1 +
+ poppler/CairoFontEngine.cc | 214
+ +++++++++++++++++++++++++++++++++++++++------
  2 files changed, 190 insertions(+), 25 deletions(-)
 
 commit 41d1edddcf84ca23c0fc39c5f4f3a49e408a9f1a
@@ -28815,7 +31990,7 @@ Date:	Sun Sep 21 16:33:33 2008 +0200
 
     [glib-demo] Fix a crash in forms demo
 
- glib/demo/forms.c |   12 +++++++-----
+ glib/demo/forms.c | 12 +++++++-----
  1 file changed, 7 insertions(+), 5 deletions(-)
 
 commit fe26075353226be9a02c8cf1a6a29586de15ce86
@@ -28824,7 +31999,7 @@ Date:	Sun Sep 21 12:03:21 2008 +0200
 
     really use the key passed to it
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 8aa531cb478d6ae838a94f9f31e6a0bbd0dd957c
@@ -28833,7 +32008,7 @@ Date:	Sun Sep 21 11:18:22 2008 +0200
 
     Read the 'readOnly' attribute directly in the FormField constructor.
 
- poppler/Form.cc |   12 +++---------
+ poppler/Form.cc | 12 +++---------
  1 file changed, 3 insertions(+), 9 deletions(-)
 
 commit b56f64d676bdabd4a3ebe0eb2237f4c202a3707d
@@ -28842,7 +32017,7 @@ Date:	Sun Sep 21 00:53:54 2008 +0200
 
     Handle streams as entries for the catalog JS name tree.
 
- poppler/Catalog.cc |	18 +++++++++++++-----
+ poppler/Catalog.cc | 18 +++++++++++++-----
  1 file changed, 13 insertions(+), 5 deletions(-)
 
 commit 93386d67b3d7adbd87547e9742e4df1c10eadbc1
@@ -28851,11 +32026,11 @@ Date:	Sat Sep 20 16:20:03 2008 +0200
 
     Compile with -pedantic
 
- poppler/Form.h			 |    4 ++--
- qt4/src/poppler-embeddedfile.cc |    4 ++--
- qt4/src/poppler-movie.cc	 |    3 ++-
- qt4/src/poppler-sound.cc	 |    3 ++-
- qt4/src/poppler-textbox.cc	 |    2 +-
+ poppler/Form.h			 | 4 ++--
+ qt4/src/poppler-embeddedfile.cc | 4 ++--
+ qt4/src/poppler-movie.cc	 | 3 ++-
+ qt4/src/poppler-sound.cc	 | 3 ++-
+ qt4/src/poppler-textbox.cc	 | 2 +-
  5 files changed, 9 insertions(+), 7 deletions(-)
 
 commit 6961fd8efe3db6ee7077dc2ed072498696dae31a
@@ -28864,14 +32039,14 @@ Date:	Sat Sep 20 16:13:37 2008 +0200
 
     Remove some warnings and errors when compiling with gcc and -pedantic
 
- fofi/FoFiTrueType.cc	    |	 3 ++-
- glib/poppler-annot.cc	    |	 8 ++++----
- glib/poppler-attachment.cc |	 2 +-
- glib/poppler-document.cc   |	 6 +++---
- glib/poppler-form-field.cc |	 2 +-
- glib/poppler-page.cc	    |	 2 +-
- poppler/Annot.h	    |	 5 +++--
- splash/SplashTypes.h	    |	 3 ++-
+ fofi/FoFiTrueType.cc	    | 3 ++-
+ glib/poppler-annot.cc	    | 8 ++++----
+ glib/poppler-attachment.cc | 2 +-
+ glib/poppler-document.cc   | 6 +++---
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-page.cc	    | 2 +-
+ poppler/Annot.h	    | 5 +++--
+ splash/SplashTypes.h	    | 3 ++-
  8 files changed, 17 insertions(+), 14 deletions(-)
 
 commit 4e9a04da358b1527a08102e601a52f07930532f2
@@ -28881,28 +32056,28 @@ Date:	Sat Sep 20 16:10:50 2008 +0200
     Add mention of GPLv2 or later in poppler changes to all files except
     Splash.cc and Splash.h, i've still no answer from Marco :-(
 
- splash/SplashBitmap.cc       |    3 +++
- splash/SplashBitmap.h	      |    3 +++
- splash/SplashErrorCodes.h    |    3 +++
- splash/SplashFTFont.cc       |    3 +++
- splash/SplashFTFont.h	      |    3 +++
- splash/SplashFTFontEngine.cc |    3 +++
- splash/SplashFTFontEngine.h  |    3 +++
- splash/SplashFTFontFile.cc   |    3 +++
- splash/SplashFTFontFile.h    |    3 +++
- splash/SplashFont.cc	      |    3 +++
- splash/SplashFont.h	      |    3 +++
- splash/SplashFontEngine.cc   |    3 +++
- splash/SplashFontEngine.h    |    3 +++
- splash/SplashFontFile.cc     |    3 +++
- splash/SplashFontFile.h      |    3 +++
- splash/SplashT1Font.cc       |    3 +++
- splash/SplashT1Font.h	      |    3 +++
- splash/SplashT1FontEngine.cc |    3 +++
- splash/SplashT1FontFile.cc   |    3 +++
- splash/SplashT1FontFile.h    |    3 +++
- splash/SplashTypes.h	      |    3 +++
- splash/SplashXPathScanner.cc |    3 +++
+ splash/SplashBitmap.cc       | 3 +++
+ splash/SplashBitmap.h	      | 3 +++
+ splash/SplashErrorCodes.h    | 3 +++
+ splash/SplashFTFont.cc       | 3 +++
+ splash/SplashFTFont.h	      | 3 +++
+ splash/SplashFTFontEngine.cc | 3 +++
+ splash/SplashFTFontEngine.h  | 3 +++
+ splash/SplashFTFontFile.cc   | 3 +++
+ splash/SplashFTFontFile.h    | 3 +++
+ splash/SplashFont.cc	      | 3 +++
+ splash/SplashFont.h	      | 3 +++
+ splash/SplashFontEngine.cc   | 3 +++
+ splash/SplashFontEngine.h    | 3 +++
+ splash/SplashFontFile.cc     | 3 +++
+ splash/SplashFontFile.h      | 3 +++
+ splash/SplashT1Font.cc       | 3 +++
+ splash/SplashT1Font.h	      | 3 +++
+ splash/SplashT1FontEngine.cc | 3 +++
+ splash/SplashT1FontFile.cc   | 3 +++
+ splash/SplashT1FontFile.h    | 3 +++
+ splash/SplashTypes.h	      | 3 +++
+ splash/SplashXPathScanner.cc | 3 +++
  22 files changed, 66 insertions(+)
 
 commit beb87362072d5b480cf6b2c02445ec17c119ff56
@@ -28911,7 +32086,7 @@ Date:	Sat Sep 20 15:47:25 2008 +0200
 
     Add Tomas' Copyright
 
- utils/HtmlFonts.cc |	 1 +
+ utils/HtmlFonts.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8ccb1bb651b129875ef802356c4a229b2ce31973
@@ -28920,7 +32095,7 @@ Date:	Sat Sep 20 15:45:47 2008 +0200
 
     Initialize pos the correct value to not have crashes
 
- utils/HtmlFonts.cc |	 3 ++-
+ utils/HtmlFonts.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 77bf8ec94e36fef7e120f1dc4bb1390be71cfb97
@@ -28929,7 +32104,7 @@ Date:	Sat Sep 20 14:17:06 2008 +0200
 
     Fix memory leak
 
- utils/HtmlOutputDev.cc |    1 +
+ utils/HtmlOutputDev.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit b22be54dc2205269974315ca748d835d0990d6da
@@ -28938,7 +32113,7 @@ Date:	Sat Sep 20 14:16:26 2008 +0200
 
     Fix mismatched free/delete
 
- utils/HtmlOutputDev.cc |    3 ++-
+ utils/HtmlOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ac16174da1d6f19445f78e7cd7c4a18cb9524dde
@@ -28948,7 +32123,7 @@ Date:	Sat Sep 20 00:52:19 2008 +0200
     make sure the image is setup before using it, otherwise some things
     don't print correctly like PDF from bug 17645
 
- poppler/PSOutputDev.cc |    6 ++++++
+ poppler/PSOutputDev.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit ffa4ffdf7fe83035c72addd8c4c8ee566621ba06
@@ -28957,11 +32132,11 @@ Date:	Wed Sep 17 23:27:30 2008 +0200
 
     0.9.1
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   13 +++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 13 +++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 19 insertions(+), 6 deletions(-)
 
 commit f57cbe32bcde0808943b9be2456dd69fa5b6dd27
@@ -28974,7 +32149,7 @@ Date:	Sun Sep 14 22:18:38 2008 +0200
     Fixes bug 17568 and i don't see how it can break existing things
     because it's already on an error path
 
- poppler/XRef.cc |   25 +++++++++++++++++++++++++
+ poppler/XRef.cc | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
 commit 1a852064ff5a1a15bc315ddca472a0ad74292581
@@ -28983,7 +32158,7 @@ Date:	Sat Sep 13 12:11:41 2008 +0200
 
     [glib-demo] Do not try to get info about remote destinations
 
- glib/demo/utils.c |   11 ++++++-----
+ glib/demo/utils.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 951cffeb2cbff4e179043033b5ac7f5eb764d6dc
@@ -28996,7 +32171,7 @@ Date:	Fri Sep 12 12:05:53 2008 +0200
     I am not sure this is the correct fix, but fixes crash on files of
     bugs 13972, 16092 and 17523 and they seem to work ok
 
- poppler/Decrypt.cc |	 6 ++++++
+ poppler/Decrypt.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 491109edbe827860e764b5fcb67456867923858d
@@ -29008,7 +32183,7 @@ Date:	Wed Sep 10 23:00:32 2008 +0200
 
     Fixes bug 17504
 
- utils/HtmlOutputDev.cc |    3 ++-
+ utils/HtmlOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 7dfc1e4c9348d537896bda7b0f2ae591afc72866
@@ -29017,7 +32192,7 @@ Date:	Wed Sep 10 00:03:50 2008 +0200
 
     we want to distribute this file too
 
- qt4/src/Makefile.am |	  3 ++-
+ qt4/src/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ddb73e8dc1ccbddf3b170e12c7153ccaf716d7cc
@@ -29026,7 +32201,7 @@ Date:	Tue Sep 9 23:47:33 2008 +0200
 
     We want to distribute cmake/modules/FindLIBOPENJPEG.cmake too
 
- Makefile.am |	  1 +
+ Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 646ccc2bb8563d411dc25bdbab53725ae08572ba
@@ -29035,7 +32210,7 @@ Date:	Tue Sep 9 23:22:17 2008 +0200
 
     m_doc->doc->getOptContentConfig() can be null, so check for it
 
- qt4/src/poppler-document.cc |	  2 +-
+ qt4/src/poppler-document.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d7f0bce67101f37f8d3e69d7d701388bcdc7200f
@@ -29045,13 +32220,13 @@ Date:	Tue Sep 9 23:18:49 2008 +0200
     Qt4 frontend had timezone parsing that got lost when moving to the
     common function, i suck
 
- glib/poppler-document.cc    |	  6 ++++--
- poppler/DateInfo.cc	     |	 20 ++++++++++++++------
- poppler/DateInfo.h	     |	  2 +-
- qt/poppler-document.cc      |	  6 ++++--
- qt4/src/poppler-document.cc |	 22 +++++++++++++++++++---
- utils/pdfinfo.cc	     |	  6 ++++--
- utils/pdftohtml.cc	     |	  6 ++++--
+ glib/poppler-document.cc    |	6 ++++--
+ poppler/DateInfo.cc	     | 20 ++++++++++++++------
+ poppler/DateInfo.h	     |	2 +-
+ qt/poppler-document.cc      |	6 ++++--
+ qt4/src/poppler-document.cc | 22 +++++++++++++++++++---
+ utils/pdfinfo.cc	     |	6 ++++--
+ utils/pdftohtml.cc	     |	6 ++++--
  7 files changed, 50 insertions(+), 18 deletions(-)
 
 commit 0af8609e6c932de2d85168cc9147854ee84b3a1b
@@ -29060,7 +32235,7 @@ Date:	Tue Sep 9 20:55:27 2008 +0200
 
     i want this packaged too
 
- utils/Makefile.am |	2 ++
+ utils/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit dd0f4c1510382e17cf33d3fe163e384da1d6d289
@@ -29069,7 +32244,7 @@ Date:	Tue Sep 9 20:48:04 2008 +0200
 
     Fix includepath
 
- fofi/FoFiTrueType.cc |    2 +-
+ fofi/FoFiTrueType.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 16c0842c3e01608a72709af55cc5cb8b567efedf
@@ -29078,8 +32253,8 @@ Date:	Tue Sep 9 20:36:18 2008 +0200
 
     API changed, so increase soname
 
- glib/CMakeLists.txt |	  2 +-
- glib/Makefile.am    |	  2 +-
+ glib/CMakeLists.txt | 2 +-
+ glib/Makefile.am    | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 217c0d1f80a78713977a7bfbe680fce90f1c6b36
@@ -29091,10 +32266,10 @@ Date:	Mon Sep 8 23:56:28 2008 +0200
     Now only need to wait for Carlos and Iñigo's answer to a BIC change
     in glib/ and we'll have 0.9.0 :-)
 
- CMakeLists.txt   |    2 +-
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ msvc/config.h	  | 6 +++---
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 6 insertions(+), 6 deletions(-)
 
 commit e34022a8fcfb9fe211dd6b561377d855972b2087
@@ -29103,8 +32278,8 @@ Date:	Mon Sep 8 23:36:04 2008 +0200
 
     Increase soname for libpoppler, i'm almost sure we broke BC there
 
- CMakeLists.txt      |	  2 +-
- poppler/Makefile.am |	  2 +-
+ CMakeLists.txt      | 2 +-
+ poppler/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit bc275049d6ef083daf71a043ccf23fd0634f5c4d
@@ -29113,8 +32288,8 @@ Date:	Mon Sep 8 23:33:24 2008 +0200
 
     soname 3.1.0 for qt4 libs, we are BC/SC but got new API
 
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Makefile.am	|    2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am	| 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 06743a25a73adc3fba95f7b4ad74a6dde1a54ead
@@ -29123,8 +32298,8 @@ Date:	Mon Sep 8 23:23:06 2008 +0200
 
     added news for 0.9.0
 
- NEWS |  115
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ NEWS | 115
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 115 insertions(+)
 
 commit d35ca2ce5df12d40e295873e44b1f18ea40ba897
@@ -29133,10 +32308,10 @@ Date:	Sun Sep 7 01:13:33 2008 +0200
 
     [Qt4] apidox improvements
 
- qt4/src/poppler-annotation.h |   70
- +++++++++++++++++++++++++++++++++++++++---
- qt4/src/poppler-link.h       |   12 +++++---
- qt4/src/poppler-qt4.h	      |   22 +++++++++++--
+ qt4/src/poppler-annotation.h | 70
+ +++++++++++++++++++++++++++++++++++++++++---
+ qt4/src/poppler-link.h       | 12 +++++---
+ qt4/src/poppler-qt4.h	      | 22 ++++++++++++--
  3 files changed, 93 insertions(+), 11 deletions(-)
 
 commit 796d4c002d47c85716775d173eddfb2ae8866eaf
@@ -29145,9 +32320,9 @@ Date:	Sat Sep 6 22:48:13 2008 +0200
 
     no more need for including the qt3 paths
 
- qt4/demos/CMakeLists.txt |    1 -
- qt4/src/CMakeLists.txt   |    1 -
- qt4/tests/CMakeLists.txt |    1 -
+ qt4/demos/CMakeLists.txt | 1 -
+ qt4/src/CMakeLists.txt   | 1 -
+ qt4/tests/CMakeLists.txt | 1 -
  3 files changed, 3 deletions(-)
 
 commit db7ee3b3ae0f42155f9245691e4bfdef98a8ed6f
@@ -29156,7 +32331,7 @@ Date:	Sat Sep 6 23:16:05 2008 +0200
 
     [Qt4] Fix docu
 
- qt4/src/poppler-qt4.h |    2 +-
+ qt4/src/poppler-qt4.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3366059a25611f19ab592cda18c5efe0b9359771
@@ -29168,8 +32343,8 @@ Date:	Sat Sep 6 16:34:58 2008 +0200
     - map the 'strictMargins' and 'forceRasterize' bool options as flags
     - add a flag for setting the "printing" mode
 
- qt4/src/poppler-ps-converter.cc |   34 ++++++++++++++++++++++++++--------
- qt4/src/poppler-qt4.h		 |   26 ++++++++++++++++++++++++++
+ qt4/src/poppler-ps-converter.cc | 34 ++++++++++++++++++++++++++--------
+ qt4/src/poppler-qt4.h		 | 26 ++++++++++++++++++++++++++
  2 files changed, 52 insertions(+), 8 deletions(-)
 
 commit afa26d5c9ac9feb61aad30eb65dc00c9854d7f2e
@@ -29178,7 +32353,7 @@ Date:	Sat Sep 6 15:46:12 2008 +0200
 
     we are printing so pass the print flag as true
 
- qt/poppler-document.cc |    2 +-
+ qt/poppler-document.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f5d1eb5eaabaf3ab4bb87b8b4b901bbf30b20b29
@@ -29190,7 +32365,7 @@ Date:	Sat Sep 6 15:43:32 2008 +0200
     Fixes KDE bug 170459, you'd wonder how many times i've made the
     same mistake...
 
- qt4/src/poppler-ps-converter.cc |    2 +-
+ qt4/src/poppler-ps-converter.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 58e828d732f06bae9133dd518d89fa4348f1cca8
@@ -29199,8 +32374,8 @@ Date:	Fri Sep 5 18:45:23 2008 +0200
 
     Only like QtTest to the tests, not to the lib itself
 
- configure.ac	       |   13 +++++++++++--
- qt4/tests/Makefile.am |   22 +++++++++++-----------
+ configure.ac	       | 13 +++++++++++--
+ qt4/tests/Makefile.am | 22 +++++++++++-----------
  2 files changed, 22 insertions(+), 13 deletions(-)
 
 commit 49b3e4560f62a9a7db350d94d50e229f5e1208bf
@@ -29211,7 +32386,7 @@ Date:	Fri Sep 5 18:17:45 2008 +0200
 
     Fixes a crash when filename is a dictionary
 
- poppler/Annot.cc |    8 +++++---
+ poppler/Annot.cc | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit 996d2e176057e22acbc374cff7a712ce6fd92d93
@@ -29220,16 +32395,16 @@ Date:	Fri Sep 5 18:17:25 2008 +0200
 
     Unify multiple File Specification parsers
 
- CMakeLists.txt		|    2 +
- poppler/FileSpec.cc	|  146
- ++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FileSpec.h	|   24 ++++++++
- poppler/Link.cc	|  104 +++++-----------------------------
- poppler/Link.h		|    4 --
- poppler/Makefile.am	|    2 +
- poppler/PSOutputDev.cc |   35 +-----------
- poppler/PSOutputDev.h	|    1 -
- poppler/Sound.cc	|    7 ++-
+ CMakeLists.txt		|   2 +
+ poppler/FileSpec.cc	| 146
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/FileSpec.h	|  24 ++++++++
+ poppler/Link.cc	| 104 +++++------------------------------
+ poppler/Link.h		|   4 --
+ poppler/Makefile.am	|   2 +
+ poppler/PSOutputDev.cc |  35 +-----------
+ poppler/PSOutputDev.h	|   1 -
+ poppler/Sound.cc	|   7 ++-
  9 files changed, 197 insertions(+), 128 deletions(-)
 
 commit 31f3eb2d6b43f7fbf4d978730d109b08b1563989
@@ -29240,7 +32415,7 @@ Date:	Wed Sep 3 21:49:23 2008 +0200
 
     Fixes bug 16121 and 15535
 
- poppler/Form.cc |    8 ++++++--
+ poppler/Form.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit c75abac7ba07990ef54a46fa0d429eea580a71ef
@@ -29249,7 +32424,7 @@ Date:	Tue Sep 2 19:16:55 2008 +0200
 
     Kjartan was missing and just agreed
 
- utils/HtmlOutputDev.cc |    3 +++
+ utils/HtmlOutputDev.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 630aa133017d15ddc7bf96c79f43c5b60fa9749a
@@ -29269,12 +32444,12 @@ Date:	Tue Sep 2 01:24:39 2008 +0200
     mostly the start of the \since marker addition, plus few other
     documentation addition/improvements
 
- qt4/src/poppler-annotation.h |    9 +++++++
- qt4/src/poppler-form.h       |    8 ++++++
- qt4/src/poppler-link.h       |   14 +++++++---
- qt4/src/poppler-optcontent.h |   11 ++++++++
- qt4/src/poppler-qt4.h	      |   59
- ++++++++++++++++++++++++++++++++++++------
+ qt4/src/poppler-annotation.h |  9 +++++++
+ qt4/src/poppler-form.h       |  8 ++++++
+ qt4/src/poppler-link.h       | 14 ++++++++---
+ qt4/src/poppler-optcontent.h | 11 +++++++++
+ qt4/src/poppler-qt4.h	      | 59
+ ++++++++++++++++++++++++++++++++++++++------
  5 files changed, 90 insertions(+), 11 deletions(-)
 
 commit 6bc4881477ea15d70d420e57b5663052f2f9df76
@@ -29287,7 +32462,7 @@ Date:	Tue Sep 2 00:47:56 2008 +0200
     empty, so
     we don't have it in the apidox
 
- qt4/src/Doxyfile |    8 +++++---
+ qt4/src/Doxyfile | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 commit de822554acdb1b2bc9e70c0668c43a10c0ec129a
@@ -29296,7 +32471,7 @@ Date:	Mon Sep 1 23:50:37 2008 +0200
 
     Initialize widget to null before calling initialize not after :-(
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1a7b7199112d97e816a099cbc1a5672c83e64156
@@ -29305,7 +32480,7 @@ Date:	Mon Sep 1 20:42:06 2008 +0200
 
     Add my copyright
 
- poppler/Dict.cc |    1 +
+ poppler/Dict.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 1fef34782a003f46fceab0d3bed36212bbf32c4c
@@ -29322,7 +32497,7 @@ Date:	Mon Sep 1 20:35:37 2008 +0200
     second key while we were using the first, searching backwards we
     use the second now too and the pdf works
 
- poppler/Dict.cc |    2 +-
+ poppler/Dict.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bb7996eaaad6a70404891bb2ff530160737ea3d7
@@ -29331,7 +32506,7 @@ Date:	Mon Sep 1 20:29:25 2008 +0200
 
     Do not crash on documents with no pages
 
- qt4/tests/test-poppler-qt4.cpp |    6 ++++++
+ qt4/tests/test-poppler-qt4.cpp | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 0c11d390e4b0e3765ae20968359c7562c9857db7
@@ -29364,75 +32539,75 @@ Date:	Mon Sep 1 20:13:33 2008 +0200
 	UnicodeTypeTable.cc
 	UnicodeTypeTable.h
 
- poppler/Annot.cc	      |    3 +++
- poppler/Annot.h	      |    3 +++
- poppler/Array.cc	      |    3 +++
- poppler/Array.h	      |    3 +++
- poppler/ArthurOutputDev.cc   |    3 +++
- poppler/ArthurOutputDev.h    |    3 +++
- poppler/CMap.cc	      |    3 +++
- poppler/CMap.h		      |    3 +++
- poppler/CairoFontEngine.cc   |    3 +++
- poppler/CairoFontEngine.h    |    3 +++
- poppler/CairoOutputDev.h     |    3 +++
- poppler/Catalog.h	      |    3 +++
- poppler/CharCodeToUnicode.cc |    3 +++
- poppler/CharCodeToUnicode.h  |    3 +++
- poppler/Decrypt.cc	      |    3 +++
- poppler/Decrypt.h	      |    3 +++
- poppler/Dict.cc	      |    3 +++
- poppler/Dict.h		      |    3 +++
- poppler/Error.cc	      |    3 +++
- poppler/Error.h	      |    3 +++
- poppler/Function.cc	      |    3 +++
- poppler/Gfx.cc		      |    3 +++
- poppler/Gfx.h		      |    3 +++
- poppler/GfxFont.h	      |    3 +++
- poppler/GfxState.cc	      |    3 +++
- poppler/GfxState.h	      |    3 +++
- poppler/GlobalParams.h       |    3 +++
- poppler/JBIG2Stream.cc       |    3 +++
- poppler/JPXStream.cc	      |    3 +++
- poppler/Lexer.cc	      |    3 +++
- poppler/Lexer.h	      |    3 +++
- poppler/Link.cc	      |    3 +++
- poppler/Link.h		      |    3 +++
- poppler/Object.cc	      |    3 +++
- poppler/Object.h	      |    3 +++
- poppler/OutputDev.cc	      |    3 +++
- poppler/OutputDev.h	      |    3 +++
- poppler/PDFDoc.cc	      |    3 +++
- poppler/PDFDoc.h	      |    3 +++
- poppler/PDFDocEncoding.cc    |    3 +++
- poppler/PDFDocEncoding.h     |    3 +++
- poppler/PSOutputDev.cc       |    3 +++
- poppler/PSOutputDev.h	      |    3 +++
- poppler/PSTokenizer.cc       |    3 +++
- poppler/PSTokenizer.h	      |    3 +++
- poppler/Page.cc	      |    3 +++
- poppler/Page.h		      |    3 +++
- poppler/Parser.cc	      |    3 +++
- poppler/Parser.h	      |    3 +++
- poppler/SplashOutputDev.cc   |    3 +++
- poppler/SplashOutputDev.h    |    3 +++
- poppler/Stream-CCITT.h       |    3 +++
- poppler/Stream.cc	      |    3 +++
- poppler/Stream.h	      |    3 +++
- poppler/UTF8.h		      |    3 +++
- poppler/XRef.cc	      |    3 +++
- poppler/XRef.h		      |    3 +++
- utils/HtmlFonts.cc	      |    3 +++
- utils/HtmlLinks.cc	      |    3 +++
- utils/HtmlOutputDev.h	      |    3 +++
- utils/parseargs.c	      |    3 +++
- utils/parseargs.h	      |    3 +++
- utils/pdffonts.cc	      |    3 +++
- utils/pdfimages.cc	      |    3 +++
- utils/pdfinfo.cc	      |    3 +++
- utils/pdftohtml.cc	      |    3 +++
- utils/pdftoppm.cc	      |    3 +++
- utils/pdftops.cc	      |    3 +++
- utils/pdftotext.cc	      |    3 +++
+ poppler/Annot.cc	      | 3 +++
+ poppler/Annot.h	      | 3 +++
+ poppler/Array.cc	      | 3 +++
+ poppler/Array.h	      | 3 +++
+ poppler/ArthurOutputDev.cc   | 3 +++
+ poppler/ArthurOutputDev.h    | 3 +++
+ poppler/CMap.cc	      | 3 +++
+ poppler/CMap.h		      | 3 +++
+ poppler/CairoFontEngine.cc   | 3 +++
+ poppler/CairoFontEngine.h    | 3 +++
+ poppler/CairoOutputDev.h     | 3 +++
+ poppler/Catalog.h	      | 3 +++
+ poppler/CharCodeToUnicode.cc | 3 +++
+ poppler/CharCodeToUnicode.h  | 3 +++
+ poppler/Decrypt.cc	      | 3 +++
+ poppler/Decrypt.h	      | 3 +++
+ poppler/Dict.cc	      | 3 +++
+ poppler/Dict.h		      | 3 +++
+ poppler/Error.cc	      | 3 +++
+ poppler/Error.h	      | 3 +++
+ poppler/Function.cc	      | 3 +++
+ poppler/Gfx.cc		      | 3 +++
+ poppler/Gfx.h		      | 3 +++
+ poppler/GfxFont.h	      | 3 +++
+ poppler/GfxState.cc	      | 3 +++
+ poppler/GfxState.h	      | 3 +++
+ poppler/GlobalParams.h       | 3 +++
+ poppler/JBIG2Stream.cc       | 3 +++
+ poppler/JPXStream.cc	      | 3 +++
+ poppler/Lexer.cc	      | 3 +++
+ poppler/Lexer.h	      | 3 +++
+ poppler/Link.cc	      | 3 +++
+ poppler/Link.h		      | 3 +++
+ poppler/Object.cc	      | 3 +++
+ poppler/Object.h	      | 3 +++
+ poppler/OutputDev.cc	      | 3 +++
+ poppler/OutputDev.h	      | 3 +++
+ poppler/PDFDoc.cc	      | 3 +++
+ poppler/PDFDoc.h	      | 3 +++
+ poppler/PDFDocEncoding.cc    | 3 +++
+ poppler/PDFDocEncoding.h     | 3 +++
+ poppler/PSOutputDev.cc       | 3 +++
+ poppler/PSOutputDev.h	      | 3 +++
+ poppler/PSTokenizer.cc       | 3 +++
+ poppler/PSTokenizer.h	      | 3 +++
+ poppler/Page.cc	      | 3 +++
+ poppler/Page.h		      | 3 +++
+ poppler/Parser.cc	      | 3 +++
+ poppler/Parser.h	      | 3 +++
+ poppler/SplashOutputDev.cc   | 3 +++
+ poppler/SplashOutputDev.h    | 3 +++
+ poppler/Stream-CCITT.h       | 3 +++
+ poppler/Stream.cc	      | 3 +++
+ poppler/Stream.h	      | 3 +++
+ poppler/UTF8.h		      | 3 +++
+ poppler/XRef.cc	      | 3 +++
+ poppler/XRef.h		      | 3 +++
+ utils/HtmlFonts.cc	      | 3 +++
+ utils/HtmlLinks.cc	      | 3 +++
+ utils/HtmlOutputDev.h	      | 3 +++
+ utils/parseargs.c	      | 3 +++
+ utils/parseargs.h	      | 3 +++
+ utils/pdffonts.cc	      | 3 +++
+ utils/pdfimages.cc	      | 3 +++
+ utils/pdfinfo.cc	      | 3 +++
+ utils/pdftohtml.cc	      | 3 +++
+ utils/pdftoppm.cc	      | 3 +++
+ utils/pdftops.cc	      | 3 +++
+ utils/pdftotext.cc	      | 3 +++
  69 files changed, 207 insertions(+)
 
 commit 8670bfed7900586725b30e3af67f6849acc6efda
@@ -29443,7 +32618,7 @@ Date:	Sat Aug 30 12:47:13 2008 +0200
 
     See bug 16999 for more info
 
- utils/ImageOutputDev.cc |   12 +++++++++++-
+ utils/ImageOutputDev.cc | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 commit 1c98f197664b1a2c06e2caf32116a8487f4054bf
@@ -29454,7 +32629,7 @@ Date:	Sat Aug 30 12:44:02 2008 +0200
 
     See bug 17321 for a more in depth explanation
 
- poppler/CharCodeToUnicode.cc |    3 ++-
+ poppler/CharCodeToUnicode.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 8f1deb3f8000bdeb845a6c786a654bc7eb684f0a
@@ -29464,17 +32639,17 @@ Date:	Fri Aug 29 23:06:19 2008 +0200
     Are we a lib or aren't we? Unify String to Date parsing so we all
     behave the same way
 
- CMakeLists.txt			     |	  2 ++
- glib/poppler-document.cc	     |	 29 ++--------------
- poppler/DateInfo.cc		     |	 62
- +++++++++++++++++++++++++++++++++++
- poppler/DateInfo.h		     |	 27 +++++++++++++++
- poppler/Makefile.am		     |	  2 ++
- qt/poppler-document.cc		     |	 22 ++-----------
- qt4/src/poppler-annotation-helper.h |	 16 ++-------
- qt4/src/poppler-document.cc	     |	 52 +++--------------------------
- utils/pdfinfo.cc		     |	 16 ++-------
- utils/pdftohtml.cc		     |	  9 ++---
+ CMakeLists.txt			     |	2 ++
+ glib/poppler-document.cc	     | 29 ++---------------
+ poppler/DateInfo.cc		     | 62
+ +++++++++++++++++++++++++++++++++++++
+ poppler/DateInfo.h		     | 27 ++++++++++++++++
+ poppler/Makefile.am		     |	2 ++
+ qt/poppler-document.cc		     | 22 ++-----------
+ qt4/src/poppler-annotation-helper.h | 16 ++--------
+ qt4/src/poppler-document.cc	     | 52 +++----------------------------
+ utils/pdfinfo.cc		     | 16 ++--------
+ utils/pdftohtml.cc		     |	9 ++----
  10 files changed, 111 insertions(+), 126 deletions(-)
 
 commit c39f23dca98d3efe8d094c9a3e1bd460ba57d1ce
@@ -29483,7 +32658,7 @@ Date:	Fri Aug 29 20:50:57 2008 +0200
 
     Add a readme for contributors with licensing and misc info
 
- README.contributors |	 20 ++++++++++++++++++++
+ README.contributors | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 commit 35a72590ffd3284e63601af79599e5fa025e567f
@@ -29495,7 +32670,7 @@ Date:	Thu Aug 28 00:58:11 2008 +0200
 
     10 MB in size is a font of 3200x3200, huge enough to be discarted
 
- poppler/SplashOutputDev.cc |	20 +++++++++++++++++++-
+ poppler/SplashOutputDev.cc | 20 +++++++++++++++++++-
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 commit 33727cf6773b12d736ba245fdd146559ce93102d
@@ -29504,7 +32679,7 @@ Date:	Sun Aug 24 20:36:13 2008 +0200
 
     fix location of the comment
 
- fofi/FoFiType1.cc |	6 +++---
+ fofi/FoFiType1.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit abe29b4fdb33f449649fdea5d7af2deeb702f0bb
@@ -29514,11 +32689,11 @@ Date:	Sun Aug 24 20:24:35 2008 +0200
     All changes made to fofi/ files under the poppler project are by
     people that accepts to license the code under GPLv2+
 
- fofi/FoFiBase.cc     |    3 +++
- fofi/FoFiTrueType.cc |    3 +++
- fofi/FoFiTrueType.h  |    3 +++
- fofi/FoFiType1.cc    |    3 +++
- fofi/FoFiType1C.h    |    3 +++
+ fofi/FoFiBase.cc     | 3 +++
+ fofi/FoFiTrueType.cc | 3 +++
+ fofi/FoFiTrueType.h  | 3 +++
+ fofi/FoFiType1.cc    | 3 +++
+ fofi/FoFiType1C.h    | 3 +++
  5 files changed, 15 insertions(+)
 
 commit 6346d7050a03935c71336c65d5f8f0fe2860d321
@@ -29528,12 +32703,12 @@ Date:	Sun Aug 24 20:23:50 2008 +0200
     All changes made to goo/ files under the poppler project are by
     people that accepts to license the code under GPLv2+
 
- goo/GooString.cc |    3 +++
- goo/GooString.h  |    3 +++
- goo/gfile.cc	  |    3 +++
- goo/gfile.h	  |    3 +++
- goo/gmem.cc	  |    3 +++
- goo/gmem.h	  |    3 +++
+ goo/GooString.cc | 3 +++
+ goo/GooString.h  | 3 +++
+ goo/gfile.cc	  | 3 +++
+ goo/gfile.h	  | 3 +++
+ goo/gmem.cc	  | 3 +++
+ goo/gmem.h	  | 3 +++
  6 files changed, 18 insertions(+)
 
 commit d6e1f1fb4e83527d3ece51d98fa20262713b7da1
@@ -29542,7 +32717,7 @@ Date:	Sun Aug 24 20:22:06 2008 +0200
 
     .cc -> .h
 
- poppler/FontInfo.h |	 2 +-
+ poppler/FontInfo.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9f0ac70f7ad806cadce379d4fabb90eff697ad52
@@ -29551,10 +32726,10 @@ Date:	Sun Aug 24 19:25:27 2008 +0200
 
     Add missing addresses
 
- poppler/ABWOutputDev.cc |    4 ++--
- poppler/ABWOutputDev.h  |    2 +-
- poppler/FlateStream.cc  |    2 +-
- poppler/FlateStream.h	 |    2 +-
+ poppler/ABWOutputDev.cc | 4 ++--
+ poppler/ABWOutputDev.h  | 2 +-
+ poppler/FlateStream.cc  | 2 +-
+ poppler/FlateStream.h	 | 2 +-
  4 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 22f6af73961686895f207fe13022a21333455862
@@ -29571,8 +32746,8 @@ Date:	Sun Aug 24 18:57:52 2008 +0200
 
     [Qt4] add showControl and playMode properties of MovieObject's
 
- qt4/src/poppler-movie.cc |   14 ++++++++++++++
- qt4/src/poppler-qt4.h	  |   20 ++++++++++++++++++++
+ qt4/src/poppler-movie.cc | 14 ++++++++++++++
+ qt4/src/poppler-qt4.h	  | 20 ++++++++++++++++++++
  2 files changed, 34 insertions(+)
 
 commit c444c652859b6e52160e5571e84f8eb1292d65f1
@@ -29581,7 +32756,7 @@ Date:	Sun Aug 24 18:47:58 2008 +0200
 
     [Qt4] make the MovieObject ctor private, with only Page able to use it
 
- qt4/src/poppler-qt4.h |    9 +++++----
+ qt4/src/poppler-qt4.h | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 6d6913a79779769ce0fe2f0b516a90a50e51b947
@@ -29590,8 +32765,8 @@ Date:	Sun Aug 24 18:45:45 2008 +0200
 
     fix Jeff's entry
 
- poppler/DCTStream.cc |    2 +-
- poppler/DCTStream.h  |    2 +-
+ poppler/DCTStream.cc | 2 +-
+ poppler/DCTStream.h  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 25bd5967f9f550a32e20eea91cd00cbeff98249e
@@ -29602,9 +32777,9 @@ Date:	Sun Aug 24 18:45:25 2008 +0200
 
     the annotation has all the data we need, so just init from that
 
- qt4/src/poppler-movie.cc |    8 ++++----
- qt4/src/poppler-page.cc  |    4 +---
- qt4/src/poppler-qt4.h	  |    4 ++--
+ qt4/src/poppler-movie.cc | 8 ++++----
+ qt4/src/poppler-page.cc  | 4 +---
+ qt4/src/poppler-qt4.h	  | 4 ++--
  3 files changed, 7 insertions(+), 9 deletions(-)
 
 commit 47f54ad4de111f62a5b8c25520ef6b2bca6026d2
@@ -29617,172 +32792,171 @@ Date:	Sun Aug 24 18:18:13 2008 +0200
     qt and qt4 dirs too, glib is missing if someone wants to fix it,
     but it's not crucial as it's not a fork of some other GPL software
 
- AUTHORS				  |    4 +++-
- fofi/FoFiBase.cc			  |   11 +++++++++++
- fofi/FoFiTrueType.cc			  |   14 ++++++++++++++
- fofi/FoFiTrueType.h			  |   12 ++++++++++++
- fofi/FoFiType1.cc			  |   12 ++++++++++++
- fofi/FoFiType1C.h			  |   11 +++++++++++
- goo/GooString.cc			  |   13 +++++++++++++
- goo/GooString.h			  |   12 ++++++++++++
- goo/GooTimer.cc			  |    3 +++
- goo/GooTimer.h				  |    8 ++++++--
- goo/GooVector.h			  |   12 ++++++++++++
- goo/gfile.cc				  |   13 +++++++++++++
- goo/gfile.h				  |   11 +++++++++++
- goo/gmem.cc				  |   13 +++++++++++++
- goo/gmem.h				  |   13 +++++++++++++
- poppler/ABWOutputDev.cc		  |    3 ++-
- poppler/ABWOutputDev.h			  |    2 +-
- poppler/Annot.cc			  |   19 +++++++++++++++++++
- poppler/Annot.h			  |   17 +++++++++++++++++
- poppler/Array.cc			  |   11 +++++++++++
- poppler/Array.h			  |   11 +++++++++++
- poppler/ArthurOutputDev.cc		  |   14 +++++++++++++-
- poppler/ArthurOutputDev.h		  |   13 ++++++++++++-
- poppler/CMap.cc			  |   12 ++++++++++++
- poppler/CMap.h				  |   11 +++++++++++
- poppler/CairoFontEngine.cc		  |   17 +++++++++++++++++
- poppler/CairoFontEngine.h		  |   17 +++++++++++++++++
- poppler/CairoOutputDev.cc		  |   19 +++++++++++++++++++
- poppler/CairoOutputDev.h		  |   16 ++++++++++++++++
- poppler/Catalog.cc			  |   19 +++++++++++++++++++
- poppler/Catalog.h			  |   16 ++++++++++++++++
- poppler/CharCodeToUnicode.cc		  |   14 ++++++++++++++
- poppler/CharCodeToUnicode.h		  |   13 +++++++++++++
- poppler/DCTStream.cc			  |    5 ++++-
- poppler/DCTStream.h			  |    6 +++++-
- poppler/Decrypt.cc			  |   12 ++++++++++++
- poppler/Decrypt.h			  |   11 +++++++++++
- poppler/Dict.cc			  |   13 +++++++++++++
- poppler/Dict.h				  |   13 +++++++++++++
- poppler/Error.cc			  |   13 +++++++++++++
- poppler/Error.h			  |   13 +++++++++++++
- poppler/FlateStream.cc			  |    2 ++
- poppler/FlateStream.h			  |    2 ++
- poppler/FontInfo.cc			  |   22 ++++++++++++++++++++++
- poppler/FontInfo.h			  |   21 +++++++++++++++++++++
- poppler/Form.cc			  |   10 +++++++++-
- poppler/Form.h				  |    6 +++++-
- poppler/Function.cc			  |   12 ++++++++++++
- poppler/Gfx.cc				  |   23 +++++++++++++++++++++++
- poppler/Gfx.h				  |   13 +++++++++++++
- poppler/GfxFont.cc			  |   19 +++++++++++++++++++
- poppler/GfxFont.h			  |   16 ++++++++++++++++
- poppler/GfxState.cc			  |   14 ++++++++++++++
- poppler/GfxState.h			  |   13 +++++++++++++
- poppler/GlobalParams.cc		  |   19 +++++++++++++++++++
- poppler/GlobalParams.h			  |   15 +++++++++++++++
- poppler/JBIG2Stream.cc			  |   13 +++++++++++++
- poppler/JPXStream.cc			  |   11 +++++++++++
- poppler/Lexer.cc			  |   12 ++++++++++++
- poppler/Lexer.h			  |   12 ++++++++++++
- poppler/Link.cc			  |   14 ++++++++++++++
- poppler/Link.h				  |   12 ++++++++++++
- poppler/Movie.cc			  |   17 ++++++++++++++++-
- poppler/Object.cc			  |   11 +++++++++++
- poppler/Object.h			  |   12 ++++++++++++
- poppler/OptionalContent.cc		  |    5 ++++-
- poppler/Outline.cc			  |   11 +++++++++++
- poppler/Outline.h			  |   11 +++++++++++
- poppler/OutputDev.cc			  |   13 +++++++++++++
- poppler/OutputDev.h			  |   14 ++++++++++++++
- poppler/PDFDoc.cc			  |   15 +++++++++++++++
- poppler/PDFDoc.h			  |   15 +++++++++++++++
- poppler/PDFDocEncoding.cc		  |   13 ++++++++++++-
- poppler/PDFDocEncoding.h		  |   11 +++++++++++
- poppler/PSOutputDev.cc			  |   15 +++++++++++++++
- poppler/PSOutputDev.h			  |   14 ++++++++++++++
- poppler/PSTokenizer.cc			  |   12 ++++++++++++
- poppler/PSTokenizer.h			  |   11 +++++++++++
- poppler/Page.cc			  |   20 ++++++++++++++++++++
- poppler/Page.h				  |   16 ++++++++++++++++
- poppler/PageLabelInfo.cc		  |   12 ++++++++++++
- poppler/PageLabelInfo.h		  |   12 ++++++++++++
- poppler/PageTransition.h		  |   18 ++++++++++++++++++
- poppler/Parser.cc			  |   12 ++++++++++++
- poppler/Parser.h			  |   11 +++++++++++
- poppler/SplashOutputDev.cc		  |   16 ++++++++++++++++
- poppler/SplashOutputDev.h		  |   11 +++++++++++
- poppler/Stream-CCITT.h			  |   11 +++++++++++
- poppler/Stream.cc			  |   14 ++++++++++++++
- poppler/Stream.h			  |   13 +++++++++++++
- poppler/TextOutputDev.cc		  |   18 ++++++++++++++++++
- poppler/TextOutputDev.h		  |   15 +++++++++++++++
- poppler/UTF8.h				  |   11 +++++++++++
- poppler/UnicodeTypeTable.cc		  |   13 +++++++++++++
- poppler/UnicodeTypeTable.h		  |   11 +++++++++++
- poppler/XRef.cc			  |   17 ++++++++++++++++-
- poppler/XRef.h				  |   14 ++++++++++++++
- qt/poppler-document.cc			  |    3 +++
- qt/poppler-fontinfo.cc			  |    3 +--
- qt/poppler-page.cc			  |    7 ++++++-
- qt/poppler-private.h			  |    4 ++++
- qt/poppler-qt.h			  |    5 ++++-
- qt4/src/poppler-annotation-helper.h	  |    1 +
- qt4/src/poppler-annotation.cc		  |    3 ++-
- qt4/src/poppler-annotation.h		  |    4 +++-
- qt4/src/poppler-document.cc		  |    4 +++-
- qt4/src/poppler-embeddedfile.cc	  |    1 +
- qt4/src/poppler-fontinfo.cc		  |    5 ++++-
- qt4/src/poppler-form.cc		  |    2 +-
- qt4/src/poppler-form.h			  |    2 +-
- qt4/src/poppler-link-extractor-private.h |    2 +-
- qt4/src/poppler-link-extractor.cc	  |    2 +-
- qt4/src/poppler-link.cc		  |    3 ++-
- qt4/src/poppler-link.h			  |    1 +
- qt4/src/poppler-optcontent-private.h	  |    1 +
- qt4/src/poppler-optcontent.cc		  |    1 +
- qt4/src/poppler-optcontent.h		  |    1 +
- qt4/src/poppler-page-private.h		  |    2 ++
- qt4/src/poppler-page.cc		  |    4 ++++
- qt4/src/poppler-private.h		  |    4 +++-
- qt4/src/poppler-ps-converter.cc	  |    1 +
- qt4/src/poppler-qt4.h			  |    5 ++++-
- qt4/src/poppler-textbox.cc		  |    2 ++
- splash/Splash.cc			  |   12 ++++++++++++
- splash/Splash.h			  |   12 ++++++++++++
- splash/SplashBitmap.cc			  |   12 ++++++++++++
- splash/SplashBitmap.h			  |   11 +++++++++++
- splash/SplashErrorCodes.h		  |   11 +++++++++++
- splash/SplashFTFont.cc			  |   12 ++++++++++++
- splash/SplashFTFont.h			  |   11 +++++++++++
- splash/SplashFTFontEngine.cc		  |   11 +++++++++++
- splash/SplashFTFontEngine.h		  |   11 +++++++++++
- splash/SplashFTFontFile.cc		  |   11 +++++++++++
- splash/SplashFTFontFile.h		  |   11 +++++++++++
- splash/SplashFont.cc			  |   11 +++++++++++
- splash/SplashFont.h			  |   11 +++++++++++
- splash/SplashFontEngine.cc		  |   11 +++++++++++
- splash/SplashFontEngine.h		  |   11 +++++++++++
- splash/SplashFontFile.cc		  |   12 ++++++++++++
- splash/SplashFontFile.h		  |   12 ++++++++++++
- splash/SplashT1Font.cc			  |   11 +++++++++++
- splash/SplashT1Font.h			  |   11 +++++++++++
- splash/SplashT1FontEngine.cc		  |   11 +++++++++++
- splash/SplashT1FontFile.cc		  |   11 +++++++++++
- splash/SplashT1FontFile.h		  |   11 +++++++++++
- splash/SplashTypes.h			  |   11 +++++++++++
- splash/SplashXPathScanner.cc		  |   11 +++++++++++
- utils/HtmlFonts.cc			  |   24 ++++++++++++++++++++++++
- utils/HtmlFonts.h			  |   12 ++++++++++++
- utils/HtmlLinks.cc			  |   23 +++++++++++++++++++++++
- utils/HtmlLinks.h			  |   12 ++++++++++++
- utils/HtmlOutputDev.cc			  |   13 +++++++++++++
- utils/HtmlOutputDev.h			  |   11 +++++++++++
- utils/ImageOutputDev.cc		  |   13 +++++++++++++
- utils/ImageOutputDev.h			  |   12 ++++++++++++
- utils/parseargs.c			  |   13 +++++++++++++
- utils/parseargs.h			  |   11 +++++++++++
- utils/pdffonts.cc			  |   12 ++++++++++++
- utils/pdfimages.cc			  |   11 +++++++++++
- utils/pdfinfo.cc			  |   12 ++++++++++++
- utils/pdftoabw.cc			  |   26
- +++++++++++++++++++-------
- utils/pdftohtml.cc			  |   11 +++++++++++
- utils/pdftoppm.cc			  |   11 +++++++++++
- utils/pdftops.cc			  |   12 ++++++++++++
- utils/pdftotext.cc			  |   12 ++++++++++++
+ AUTHORS				  |  4 +++-
+ fofi/FoFiBase.cc			  | 11 +++++++++++
+ fofi/FoFiTrueType.cc			  | 14 ++++++++++++++
+ fofi/FoFiTrueType.h			  | 12 ++++++++++++
+ fofi/FoFiType1.cc			  | 12 ++++++++++++
+ fofi/FoFiType1C.h			  | 11 +++++++++++
+ goo/GooString.cc			  | 13 +++++++++++++
+ goo/GooString.h			  | 12 ++++++++++++
+ goo/GooTimer.cc			  |  3 +++
+ goo/GooTimer.h				  |  8 ++++++--
+ goo/GooVector.h			  | 12 ++++++++++++
+ goo/gfile.cc				  | 13 +++++++++++++
+ goo/gfile.h				  | 11 +++++++++++
+ goo/gmem.cc				  | 13 +++++++++++++
+ goo/gmem.h				  | 13 +++++++++++++
+ poppler/ABWOutputDev.cc		  |  3 ++-
+ poppler/ABWOutputDev.h			  |  2 +-
+ poppler/Annot.cc			  | 19 +++++++++++++++++++
+ poppler/Annot.h			  | 17 +++++++++++++++++
+ poppler/Array.cc			  | 11 +++++++++++
+ poppler/Array.h			  | 11 +++++++++++
+ poppler/ArthurOutputDev.cc		  | 14 +++++++++++++-
+ poppler/ArthurOutputDev.h		  | 13 ++++++++++++-
+ poppler/CMap.cc			  | 12 ++++++++++++
+ poppler/CMap.h				  | 11 +++++++++++
+ poppler/CairoFontEngine.cc		  | 17 +++++++++++++++++
+ poppler/CairoFontEngine.h		  | 17 +++++++++++++++++
+ poppler/CairoOutputDev.cc		  | 19 +++++++++++++++++++
+ poppler/CairoOutputDev.h		  | 16 ++++++++++++++++
+ poppler/Catalog.cc			  | 19 +++++++++++++++++++
+ poppler/Catalog.h			  | 16 ++++++++++++++++
+ poppler/CharCodeToUnicode.cc		  | 14 ++++++++++++++
+ poppler/CharCodeToUnicode.h		  | 13 +++++++++++++
+ poppler/DCTStream.cc			  |  5 ++++-
+ poppler/DCTStream.h			  |  6 +++++-
+ poppler/Decrypt.cc			  | 12 ++++++++++++
+ poppler/Decrypt.h			  | 11 +++++++++++
+ poppler/Dict.cc			  | 13 +++++++++++++
+ poppler/Dict.h				  | 13 +++++++++++++
+ poppler/Error.cc			  | 13 +++++++++++++
+ poppler/Error.h			  | 13 +++++++++++++
+ poppler/FlateStream.cc			  |  2 ++
+ poppler/FlateStream.h			  |  2 ++
+ poppler/FontInfo.cc			  | 22 ++++++++++++++++++++++
+ poppler/FontInfo.h			  | 21 +++++++++++++++++++++
+ poppler/Form.cc			  | 10 +++++++++-
+ poppler/Form.h				  |  6 +++++-
+ poppler/Function.cc			  | 12 ++++++++++++
+ poppler/Gfx.cc				  | 23 +++++++++++++++++++++++
+ poppler/Gfx.h				  | 13 +++++++++++++
+ poppler/GfxFont.cc			  | 19 +++++++++++++++++++
+ poppler/GfxFont.h			  | 16 ++++++++++++++++
+ poppler/GfxState.cc			  | 14 ++++++++++++++
+ poppler/GfxState.h			  | 13 +++++++++++++
+ poppler/GlobalParams.cc		  | 19 +++++++++++++++++++
+ poppler/GlobalParams.h			  | 15 +++++++++++++++
+ poppler/JBIG2Stream.cc			  | 13 +++++++++++++
+ poppler/JPXStream.cc			  | 11 +++++++++++
+ poppler/Lexer.cc			  | 12 ++++++++++++
+ poppler/Lexer.h			  | 12 ++++++++++++
+ poppler/Link.cc			  | 14 ++++++++++++++
+ poppler/Link.h				  | 12 ++++++++++++
+ poppler/Movie.cc			  | 17 ++++++++++++++++-
+ poppler/Object.cc			  | 11 +++++++++++
+ poppler/Object.h			  | 12 ++++++++++++
+ poppler/OptionalContent.cc		  |  5 ++++-
+ poppler/Outline.cc			  | 11 +++++++++++
+ poppler/Outline.h			  | 11 +++++++++++
+ poppler/OutputDev.cc			  | 13 +++++++++++++
+ poppler/OutputDev.h			  | 14 ++++++++++++++
+ poppler/PDFDoc.cc			  | 15 +++++++++++++++
+ poppler/PDFDoc.h			  | 15 +++++++++++++++
+ poppler/PDFDocEncoding.cc		  | 13 ++++++++++++-
+ poppler/PDFDocEncoding.h		  | 11 +++++++++++
+ poppler/PSOutputDev.cc			  | 15 +++++++++++++++
+ poppler/PSOutputDev.h			  | 14 ++++++++++++++
+ poppler/PSTokenizer.cc			  | 12 ++++++++++++
+ poppler/PSTokenizer.h			  | 11 +++++++++++
+ poppler/Page.cc			  | 20 ++++++++++++++++++++
+ poppler/Page.h				  | 16 ++++++++++++++++
+ poppler/PageLabelInfo.cc		  | 12 ++++++++++++
+ poppler/PageLabelInfo.h		  | 12 ++++++++++++
+ poppler/PageTransition.h		  | 18 ++++++++++++++++++
+ poppler/Parser.cc			  | 12 ++++++++++++
+ poppler/Parser.h			  | 11 +++++++++++
+ poppler/SplashOutputDev.cc		  | 16 ++++++++++++++++
+ poppler/SplashOutputDev.h		  | 11 +++++++++++
+ poppler/Stream-CCITT.h			  | 11 +++++++++++
+ poppler/Stream.cc			  | 14 ++++++++++++++
+ poppler/Stream.h			  | 13 +++++++++++++
+ poppler/TextOutputDev.cc		  | 18 ++++++++++++++++++
+ poppler/TextOutputDev.h		  | 15 +++++++++++++++
+ poppler/UTF8.h				  | 11 +++++++++++
+ poppler/UnicodeTypeTable.cc		  | 13 +++++++++++++
+ poppler/UnicodeTypeTable.h		  | 11 +++++++++++
+ poppler/XRef.cc			  | 17 ++++++++++++++++-
+ poppler/XRef.h				  | 14 ++++++++++++++
+ qt/poppler-document.cc			  |  3 +++
+ qt/poppler-fontinfo.cc			  |  3 +--
+ qt/poppler-page.cc			  |  7 ++++++-
+ qt/poppler-private.h			  |  4 ++++
+ qt/poppler-qt.h			  |  5 ++++-
+ qt4/src/poppler-annotation-helper.h	  |  1 +
+ qt4/src/poppler-annotation.cc		  |  3 ++-
+ qt4/src/poppler-annotation.h		  |  4 +++-
+ qt4/src/poppler-document.cc		  |  4 +++-
+ qt4/src/poppler-embeddedfile.cc	  |  1 +
+ qt4/src/poppler-fontinfo.cc		  |  5 ++++-
+ qt4/src/poppler-form.cc		  |  2 +-
+ qt4/src/poppler-form.h			  |  2 +-
+ qt4/src/poppler-link-extractor-private.h |  2 +-
+ qt4/src/poppler-link-extractor.cc	  |  2 +-
+ qt4/src/poppler-link.cc		  |  3 ++-
+ qt4/src/poppler-link.h			  |  1 +
+ qt4/src/poppler-optcontent-private.h	  |  1 +
+ qt4/src/poppler-optcontent.cc		  |  1 +
+ qt4/src/poppler-optcontent.h		  |  1 +
+ qt4/src/poppler-page-private.h		  |  2 ++
+ qt4/src/poppler-page.cc		  |  4 ++++
+ qt4/src/poppler-private.h		  |  4 +++-
+ qt4/src/poppler-ps-converter.cc	  |  1 +
+ qt4/src/poppler-qt4.h			  |  5 ++++-
+ qt4/src/poppler-textbox.cc		  |  2 ++
+ splash/Splash.cc			  | 12 ++++++++++++
+ splash/Splash.h			  | 12 ++++++++++++
+ splash/SplashBitmap.cc			  | 12 ++++++++++++
+ splash/SplashBitmap.h			  | 11 +++++++++++
+ splash/SplashErrorCodes.h		  | 11 +++++++++++
+ splash/SplashFTFont.cc			  | 12 ++++++++++++
+ splash/SplashFTFont.h			  | 11 +++++++++++
+ splash/SplashFTFontEngine.cc		  | 11 +++++++++++
+ splash/SplashFTFontEngine.h		  | 11 +++++++++++
+ splash/SplashFTFontFile.cc		  | 11 +++++++++++
+ splash/SplashFTFontFile.h		  | 11 +++++++++++
+ splash/SplashFont.cc			  | 11 +++++++++++
+ splash/SplashFont.h			  | 11 +++++++++++
+ splash/SplashFontEngine.cc		  | 11 +++++++++++
+ splash/SplashFontEngine.h		  | 11 +++++++++++
+ splash/SplashFontFile.cc		  | 12 ++++++++++++
+ splash/SplashFontFile.h		  | 12 ++++++++++++
+ splash/SplashT1Font.cc			  | 11 +++++++++++
+ splash/SplashT1Font.h			  | 11 +++++++++++
+ splash/SplashT1FontEngine.cc		  | 11 +++++++++++
+ splash/SplashT1FontFile.cc		  | 11 +++++++++++
+ splash/SplashT1FontFile.h		  | 11 +++++++++++
+ splash/SplashTypes.h			  | 11 +++++++++++
+ splash/SplashXPathScanner.cc		  | 11 +++++++++++
+ utils/HtmlFonts.cc			  | 24 ++++++++++++++++++++++++
+ utils/HtmlFonts.h			  | 12 ++++++++++++
+ utils/HtmlLinks.cc			  | 23 +++++++++++++++++++++++
+ utils/HtmlLinks.h			  | 12 ++++++++++++
+ utils/HtmlOutputDev.cc			  | 13 +++++++++++++
+ utils/HtmlOutputDev.h			  | 11 +++++++++++
+ utils/ImageOutputDev.cc		  | 13 +++++++++++++
+ utils/ImageOutputDev.h			  | 12 ++++++++++++
+ utils/parseargs.c			  | 13 +++++++++++++
+ utils/parseargs.h			  | 11 +++++++++++
+ utils/pdffonts.cc			  | 12 ++++++++++++
+ utils/pdfimages.cc			  | 11 +++++++++++
+ utils/pdfinfo.cc			  | 12 ++++++++++++
+ utils/pdftoabw.cc			  | 26 +++++++++++++++++++-------
+ utils/pdftohtml.cc			  | 11 +++++++++++
+ utils/pdftoppm.cc			  | 11 +++++++++++
+ utils/pdftops.cc			  | 12 ++++++++++++
+ utils/pdftotext.cc			  | 12 ++++++++++++
  165 files changed, 1795 insertions(+), 37 deletions(-)
 
 commit 0dfbb8996ee91aa044eb2bdf2859ef64005116f8
@@ -29791,8 +32965,8 @@ Date:	Wed Aug 20 22:10:07 2008 +0200
 
     Fixes escaping of hyphens in man pages
 
- utils/pdfinfo.1 |    2 +-
- utils/pdftops.1 |   16 ++++++++--------
+ utils/pdfinfo.1 |  2 +-
+ utils/pdftops.1 | 16 ++++++++--------
  2 files changed, 9 insertions(+), 9 deletions(-)
 
 commit 6cfa0e598a81460e5d0a7d60d8584366d2a70165
@@ -29802,7 +32976,7 @@ Date:	Wed Aug 20 19:57:42 2008 +0200
     Fix synopsis of pdftops in man page to clarify that a PDF file is
     required in all cases
 
- utils/pdftops.1 |    4 ++--
+ utils/pdftops.1 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 48a73cc709a8bed9d2d0f9cbd2a9d2b6c0dad05b
@@ -29811,7 +32985,7 @@ Date:	Sat Aug 23 19:26:01 2008 +0200
 
     [Qt4] convert the title of movie annotations
 
- qt4/src/poppler-page.cc |    6 ++++++
+ qt4/src/poppler-page.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 419ec15ac825f2e0052b411462f00ac57fed030e
@@ -29820,8 +32994,8 @@ Date:	Sat Aug 23 19:25:04 2008 +0200
 
     [Qt4] get/set the title for movie annotations
 
- qt4/src/poppler-annotation.cc |   13 +++++++++++++
- qt4/src/poppler-annotation.h  |    3 +++
+ qt4/src/poppler-annotation.cc | 13 +++++++++++++
+ qt4/src/poppler-annotation.h  |  3 +++
  2 files changed, 16 insertions(+)
 
 commit 63bcaf113fcb5a4a9e5c120df2c3dafb2977c90a
@@ -29830,7 +33004,7 @@ Date:	Sat Aug 23 01:58:30 2008 +0200
 
     [Qt4] convert the movie annotation from the core type to the Qt4 one
 
- qt4/src/poppler-page.cc |   18 +++++++++++++++---
+ qt4/src/poppler-page.cc | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 commit 5cc490de74af12726bdeb9b5a6a0f0d1d79383b5
@@ -29841,9 +33015,9 @@ Date:	Sat Aug 23 01:55:41 2008 +0200
 
     right mow it just holds the movie object
 
- qt4/src/poppler-annotation.cc |   74
- +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h  |   26 ++++++++++++++-
+ qt4/src/poppler-annotation.cc | 74
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h  | 26 ++++++++++++++-
  2 files changed, 99 insertions(+), 1 deletion(-)
 
 commit 3d5c2e22d790d7c139e1cd28aebb21cfe76b8b6b
@@ -29852,8 +33026,8 @@ Date:	Sat Aug 23 01:54:30 2008 +0200
 
     compile the new poppler-movie.cc
 
- qt4/src/CMakeLists.txt |    1 +
- qt4/src/Makefile.am	|    1 +
+ qt4/src/CMakeLists.txt | 1 +
+ qt4/src/Makefile.am	| 1 +
  2 files changed, 2 insertions(+)
 
 commit 599698a9b133999f1f0bb0548489111e9d7b6f05
@@ -29864,9 +33038,9 @@ Date:	Sat Aug 23 01:52:58 2008 +0200
 
     slightly differs from the version in core
 
- qt4/src/poppler-movie.cc |   73
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h	  |   34 +++++++++++++++++++++
+ qt4/src/poppler-movie.cc | 73
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	  | 34 ++++++++++++++++++++++
  2 files changed, 107 insertions(+)
 
 commit 820f15009845870701e1f4e7f4fc4fb93312ab3e
@@ -29880,7 +33054,7 @@ Date:	Sat Aug 23 01:45:07 2008 +0200
     an object
     is valid before either doing a "smart copy" or "postprocessing" it
 
- poppler/Movie.cc |   14 ++++++++------
+ poppler/Movie.cc | 14 ++++++++------
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 commit c3a006ae35250e9a5638c2ce713b7470380751c7
@@ -29889,7 +33063,7 @@ Date:	Sat Aug 23 01:04:34 2008 +0200
 
     compile attachments.c in the demo with cmake as well
 
- glib/demo/CMakeLists.txt |    1 +
+ glib/demo/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit b5a7987a50b3d28fbfa219e2cef85b9e53aaf079
@@ -29899,7 +33073,7 @@ Date:	Thu Aug 21 20:40:18 2008 +0200
     [glib-demo] Fix attachments demo with documents that don't contain
     attachments
 
- glib/demo/attachments.c |   27 ++++++++++++++++++++-------
+ glib/demo/attachments.c | 27 ++++++++++++++++++++-------
  1 file changed, 20 insertions(+), 7 deletions(-)
 
 commit a2b0aefedbdb20ce0ef8398a700202021fcf00db
@@ -29908,7 +33082,7 @@ Date:	Thu Aug 21 20:14:50 2008 +0200
 
     [glib-demo] Fix typo
 
- glib/demo/attachments.c |    4 ++--
+ glib/demo/attachments.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9e563d6d877624b1caf82ac30c5ae30a1eb48f21
@@ -29917,8 +33091,8 @@ Date:	Thu Aug 21 20:12:33 2008 +0200
 
     [glib-demo] Add checksum validation to attachments demo
 
- glib/demo/attachments.c |  101
- +++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/attachments.c | 101
+ ++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 101 insertions(+)
 
 commit e233325e6f13d8b232bf68a2812fe755e7fccd4d
@@ -29927,13 +33101,13 @@ Date:	Thu Aug 21 19:03:32 2008 +0200
 
     [glib-demo] Add demo for attachments
 
- glib/demo/Makefile.am	 |    2 +
- glib/demo/attachments.c |  242
- +++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/attachments.h |   31 ++++++
- glib/demo/main.c	 |    4 +-
- glib/demo/utils.c	 |   23 +++++
- glib/demo/utils.h	 |    1 +
+ glib/demo/Makefile.am	 |   2 +
+ glib/demo/attachments.c | 242
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/attachments.h |  31 +++++++
+ glib/demo/main.c	 |   4 +-
+ glib/demo/utils.c	 |  23 +++++
+ glib/demo/utils.h	 |   1 +
  6 files changed, 302 insertions(+), 1 deletion(-)
 
 commit 0e2efa0fce5bf059ce85d3e3bec2293b405ec3c9
@@ -29942,7 +33116,7 @@ Date:	Thu Aug 21 19:02:24 2008 +0200
 
     [glib] Make sure name and descripction are valid utf8 strings
 
- glib/poppler-attachment.cc |	 4 ++--
+ glib/poppler-attachment.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 15a73704ab6b009ca5e07c08f0b12d970adc387d
@@ -29958,7 +33132,7 @@ Date:	Tue Aug 19 09:18:03 2008 +0100
     a reference
     was still being held by the unfreed cairo_t).
 
- poppler/CairoOutputDev.cc |   11 ++++++++---
+ poppler/CairoOutputDev.cc | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 commit d3110e392097db54e9ee59300213e490dee39126
@@ -29970,8 +33144,8 @@ Date:	Tue Aug 19 19:19:09 2008 +0200
 
     Notified by Caolan McNamara <caolanm@redhat.com>
 
- poppler/PreScanOutputDev.h |	 2 +-
- poppler/SecurityHandler.h  |	 2 +-
+ poppler/PreScanOutputDev.h | 2 +-
+ poppler/SecurityHandler.h  | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 303249e5548bfbf6823e97850e498970d802b4a0
@@ -29981,8 +33155,8 @@ Date:	Fri Aug 15 01:52:52 2008 +0200
     Revert 123a87aff2e35b10efe6a1d715585b427e4a9afa it creates problems
     with some pdf files
 
- poppler/Gfx.cc |   14 ++------------
- poppler/Gfx.h	|    3 ---
+ poppler/Gfx.cc | 14 ++------------
+ poppler/Gfx.h	|  3 ---
  2 files changed, 2 insertions(+), 15 deletions(-)
 
 commit 27ddf3c5e839358c8553d41743faa8ee304767bf
@@ -29992,7 +33166,7 @@ Date:	Wed Aug 13 13:55:57 2008 +0200
     [Qt4] make sure to use the correct page width/height for form
     widgets coordinates
 
- qt4/src/poppler-form.cc |   12 +++++++++---
+ qt4/src/poppler-form.cc | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 commit 2e7b0eb4af8cf5938833e5659d01b77096e7b7f7
@@ -30001,8 +33175,8 @@ Date:	Tue Aug 12 13:49:52 2008 +0200
 
     [Qt4] add a method to get the activation action of a FormField
 
- qt4/src/poppler-form.cc |   19 +++++++++++++++++++
- qt4/src/poppler-form.h  |    8 ++++++++
+ qt4/src/poppler-form.cc | 19 +++++++++++++++++++
+ qt4/src/poppler-form.h  |  8 ++++++++
  2 files changed, 27 insertions(+)
 
 commit f9e679adbd6830da26eb9909bcb16e3bdf0da6b4
@@ -30011,8 +33185,8 @@ Date:	Tue Aug 12 13:47:15 2008 +0200
 
     create a static version of PageData::convertLinkActionToLink()
 
- qt4/src/poppler-page-private.h |    2 ++
- qt4/src/poppler-page.cc	|    5 +++++
+ qt4/src/poppler-page-private.h | 2 ++
+ qt4/src/poppler-page.cc	| 5 +++++
  2 files changed, 7 insertions(+)
 
 commit a6ecc864ea3e94d7232cff6a2e8f49919d8f24ff
@@ -30021,7 +33195,7 @@ Date:	Tue Aug 12 01:23:21 2008 +0200
 
     initialize widget, fixes crash on EC2006.pdf
 
- poppler/Annot.cc |    1 +
+ poppler/Annot.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 123a87aff2e35b10efe6a1d715585b427e4a9afa
@@ -30034,8 +33208,8 @@ Date:	Tue Aug 12 00:37:09 2008 +0200
     This brings us a speedup of 16 times (from 11 seconds to about 600
     msec) in kde bug 168663
 
- poppler/Gfx.cc |   14 ++++++++++++--
- poppler/Gfx.h	|    3 +++
+ poppler/Gfx.cc | 14 ++++++++++++--
+ poppler/Gfx.h	|  3 +++
  2 files changed, 15 insertions(+), 2 deletions(-)
 
 commit 5ad1a12183f4b8e328f32386a74b5616e7e59070
@@ -30047,7 +33221,7 @@ Date:	Mon Aug 4 20:34:42 2008 +0200
     With this change and freetype from CVS i can render Bug 16940 using
     the splash renderer
 
- fofi/FoFiTrueType.cc |    8 +++++++-
+ fofi/FoFiTrueType.cc | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 commit d322720428fa416b7d5f23acc72d1d4b4f74d041
@@ -30056,7 +33230,7 @@ Date:	Mon Aug 4 20:16:50 2008 +0200
 
     Report an error when FoFiTrueType::load or FoFiTrueType::make fail
 
- poppler/SplashOutputDev.cc |	 5 +++++
+ poppler/SplashOutputDev.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 901ebc84ff7c0872c3f9f5e6eaf418ba6400fa10
@@ -30069,7 +33243,7 @@ Date:	Sun Aug 3 10:54:09 2008 +0200
     and
     not red,green,blue.
 
- qt4/src/poppler-private.h |	8 ++++----
+ qt4/src/poppler-private.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 66b34c78943be598778a3ef438b0cefac668c6a2
@@ -30080,7 +33254,7 @@ Date:	Sat Aug 2 13:54:34 2008 +0200
 
     That was included erroneously when the file writing code was added
 
- poppler/Stream.cc |	1 -
+ poppler/Stream.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit fd8d71ea8b12393201ece9c09372fd69c7573025
@@ -30089,9 +33263,9 @@ Date:	Fri Aug 1 23:47:51 2008 +0200
 
     These defines are unneeded too
 
- msvc/poppler/poppler-config.h |   30 ------------------------------
- poppler-config.h.cmake        |   30 ------------------------------
- poppler/poppler-config.h.in   |   30 ------------------------------
+ msvc/poppler/poppler-config.h | 30 ------------------------------
+ poppler-config.h.cmake        | 30 ------------------------------
+ poppler/poppler-config.h.in   | 30 ------------------------------
  3 files changed, 90 deletions(-)
 
 commit 391b5d5cdd9f63fe90229f88cdad628fb63c0206
@@ -30103,17 +33277,17 @@ Date:	Fri Aug 1 23:36:09 2008 +0200
 
     Did not modify PSOutputDev.cc output as PS is too fragile
 
- msvc/poppler/poppler-config.h |    9 +--------
- poppler-config.h.cmake        |    9 +--------
- poppler/PSOutputDev.cc        |    2 +-
- poppler/poppler-config.h.in   |    9 +--------
- utils/pdffonts.cc	       |    3 ++-
- utils/pdfimages.cc	       |    3 ++-
- utils/pdfinfo.cc	       |    3 ++-
- utils/pdftohtml.cc	       |    3 ++-
- utils/pdftoppm.cc	       |    3 ++-
- utils/pdftops.cc	       |    3 ++-
- utils/pdftotext.cc	       |    3 ++-
+ msvc/poppler/poppler-config.h | 9 +--------
+ poppler-config.h.cmake        | 9 +--------
+ poppler/PSOutputDev.cc        | 2 +-
+ poppler/poppler-config.h.in   | 9 +--------
+ utils/pdffonts.cc	       | 3 ++-
+ utils/pdfimages.cc	       | 3 ++-
+ utils/pdfinfo.cc	       | 3 ++-
+ utils/pdftohtml.cc	       | 3 ++-
+ utils/pdftoppm.cc	       | 3 ++-
+ utils/pdftops.cc	       | 3 ++-
+ utils/pdftotext.cc	       | 3 ++-
  11 files changed, 18 insertions(+), 32 deletions(-)
 
 commit d14fb1513be045363f7edec21cee04fd4937ede2
@@ -30124,8 +33298,8 @@ Date:	Fri Aug 1 23:14:28 2008 +0200
 
     Forgot to commit this earlier :-(
 
- poppler/GlobalParams.cc |   19 +++++++++++++++++++
- poppler/GlobalParams.h  |    2 ++
+ poppler/GlobalParams.cc | 19 +++++++++++++++++++
+ poppler/GlobalParams.h  |  2 ++
  2 files changed, 21 insertions(+)
 
 commit 9fd34443d765ccd61864d18bceadc049d905b957
@@ -30134,9 +33308,9 @@ Date:	Fri Aug 1 23:09:39 2008 +0200
 
     remove defines we don't use at all
 
- msvc/poppler/poppler-config.h |    4 ----
- poppler-config.h.cmake        |    4 ----
- poppler/poppler-config.h.in   |    4 ----
+ msvc/poppler/poppler-config.h | 4 ----
+ poppler-config.h.cmake        | 4 ----
+ poppler/poppler-config.h.in   | 4 ----
  3 files changed, 12 deletions(-)
 
 commit 0f13013dc3079915572b6b002dac8d01d2dbde04
@@ -30145,9 +33319,9 @@ Date:	Fri Aug 1 23:06:50 2008 +0200
 
     xpdfrc has been dead for a while
 
- msvc/poppler/poppler-config.h |   25 -------------------------
- poppler-config.h.cmake        |   25 -------------------------
- poppler/poppler-config.h.in   |   25 -------------------------
+ msvc/poppler/poppler-config.h | 25 -------------------------
+ poppler-config.h.cmake        | 25 -------------------------
+ poppler/poppler-config.h.in   | 25 -------------------------
  3 files changed, 75 deletions(-)
 
 commit 96392667d1331d2f8750f27c116e34bbf9282dca
@@ -30157,9 +33331,9 @@ Date:	Fri Aug 1 22:20:55 2008 +0200
     Provide a default constructor for FontInfo so you can use it as
     metatype for qvariant
 
- qt4/src/poppler-fontinfo.cc |	  5 +++++
- qt4/src/poppler-private.h   |	  7 +++++++
- qt4/src/poppler-qt4.h	     |	  5 +++++
+ qt4/src/poppler-fontinfo.cc | 5 +++++
+ qt4/src/poppler-private.h   | 7 +++++++
+ qt4/src/poppler-qt4.h	     | 5 +++++
  3 files changed, 17 insertions(+)
 
 commit 9fd1077e63d97a316380b8df4821bf4c9434fb52
@@ -30168,7 +33342,7 @@ Date:	Fri Aug 1 17:47:51 2008 +0200
 
     Build with cmake too
 
- utils/CMakeLists.txt |    4 ++--
+ utils/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d8d6a3f46620d45c279b7ca1a4a2fa3a36285cde
@@ -30185,17 +33359,17 @@ Date:	Fri Aug 1 17:44:07 2008 +0200
     so i've added the -listenc option to get the user the list of
     encodings he can use
 
- utils/Makefile.am	 |    2 ++
- utils/pdffonts.1	 |   18 ------------------
- utils/pdfimages.1	 |   14 --------------
- utils/pdfinfo.1	 |   28 ++++------------------------
- utils/pdfinfo.cc	 |   16 ++++++++++++++--
- utils/pdftoppm.1	 |   42 +++++++++++++++++++++---------------------
- utils/pdftops.1	 |   41 +++--------------------------------------
- utils/pdftotext.1	 |   32 ++++----------------------------
- utils/pdftotext.cc	 |   16 ++++++++++++++--
- utils/printencodings.cc |   34 ++++++++++++++++++++++++++++++++++
- utils/printencodings.h  |   24 ++++++++++++++++++++++++
+ utils/Makefile.am	 |  2 ++
+ utils/pdffonts.1	 | 18 ------------------
+ utils/pdfimages.1	 | 14 --------------
+ utils/pdfinfo.1	 | 28 ++++------------------------
+ utils/pdfinfo.cc	 | 16 ++++++++++++++--
+ utils/pdftoppm.1	 | 42 +++++++++++++++++++++---------------------
+ utils/pdftops.1	 | 41 +++--------------------------------------
+ utils/pdftotext.1	 | 32 ++++----------------------------
+ utils/pdftotext.cc	 | 16 ++++++++++++++--
+ utils/printencodings.cc | 34 ++++++++++++++++++++++++++++++++++
+ utils/printencodings.h  | 24 ++++++++++++++++++++++++
  11 files changed, 120 insertions(+), 147 deletions(-)
 
 commit f5b0ca794b0879e3d239bf1d6138b15ead27d9ca
@@ -30204,7 +33378,7 @@ Date:	Tue Jul 29 20:18:33 2008 +0930
 
     Fix ActualText string length check in TextOutputDev.cc
 
- poppler/TextOutputDev.cc |    2 +-
+ poppler/TextOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 21bbdc9d663995336900f1ce97cf294f04464e01
@@ -30213,9 +33387,9 @@ Date:	Mon Jul 28 21:02:07 2008 +0200
 
     make xml output valid xml
 
- utils/HtmlLinks.cc	|   33 +++++++++++++++++--
- utils/HtmlOutputDev.cc |   85
- ++++++++++++++++++++++++++++++------------------
+ utils/HtmlLinks.cc	| 33 ++++++++++++++++++--
+ utils/HtmlOutputDev.cc | 85
+ ++++++++++++++++++++++++++++++++------------------
  2 files changed, 85 insertions(+), 33 deletions(-)
 
 commit dccfc4c2910b47a77cd7b6019d9365f1684ffd0c
@@ -30226,7 +33400,7 @@ Date:	Mon Jul 28 20:58:13 2008 +0200
 
     See bug 16592 to cases where this helps
 
- utils/HtmlOutputDev.cc |   14 ++++++++++++--
+ utils/HtmlOutputDev.cc | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit 0fd5a3db1ddad447d44b64eff9abfb077a7853a0
@@ -30235,8 +33409,8 @@ Date:	Mon Jul 28 20:52:19 2008 +0200
 
     Make html output to keep all the spaces with &nbsp;
 
- utils/HtmlFonts.cc	|    2 ++
- utils/HtmlOutputDev.cc |    2 +-
+ utils/HtmlFonts.cc	| 2 ++
+ utils/HtmlOutputDev.cc | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 650c73fa0f570f699d907e33060fb23290940b42
@@ -30245,7 +33419,7 @@ Date:	Mon Jul 28 20:44:13 2008 +0200
 
     findDest crashes on null goostrings so rework the ifs a bit
 
- utils/HtmlOutputDev.cc |   16 +++++++++-------
+ utils/HtmlOutputDev.cc | 16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 commit adee9c0e9e8b2de20309b3ae6eb8e6d6ed05cf85
@@ -30254,7 +33428,7 @@ Date:	Sat Jul 26 00:04:03 2008 +0200
 
     We are not storing the ctu, so decref and leak-- :-)
 
- poppler/Annot.cc |    1 +
+ poppler/Annot.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit e7b3e3ae3080bd6f239f7d96761729ad30b075ae
@@ -30263,7 +33437,7 @@ Date:	Fri Jul 25 23:52:28 2008 +0200
 
     Fix leak
 
- qt4/src/poppler-form.cc |    1 +
+ qt4/src/poppler-form.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 006b974d4faae53e6bd51a4281dd923ab1c2d4e8
@@ -30272,7 +33446,7 @@ Date:	Fri Jul 25 23:15:11 2008 +0200
 
     Fix memory leak
 
- poppler/Annot.cc |    1 +
+ poppler/Annot.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3a549d75acceedfa25dcf79074d0cdfb643c746e
@@ -30281,7 +33455,7 @@ Date:	Fri Jul 25 23:08:21 2008 +0200
 
     Free the previous modified object in case it exists
 
- poppler/XRef.cc |    1 +
+ poppler/XRef.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 040d244b97a554342061c777a286e99dbb9acabd
@@ -30290,7 +33464,7 @@ Date:	Fri Jul 25 21:31:55 2008 +0200
 
     Need this or otherwise it crashes on complete overwrite
 
- poppler/PDFDoc.cc |	1 +
+ poppler/PDFDoc.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 11ebceeef938a7e6fa9b5437e65b5b4b822f3018
@@ -30304,10 +33478,10 @@ Date:	Fri Jul 25 21:30:24 2008 +0200
      - Update gen to 0 when resizing entries
      - On XRef::add correctly initialize all newly allocated entries
 
- poppler/PDFDoc.cc |	4 ++--
- poppler/XRef.cc   |   57
- ++++++++++++++++++++++++++++++++++++++++++-----------
- poppler/XRef.h    |	2 +-
+ poppler/PDFDoc.cc |  4 ++--
+ poppler/XRef.cc   | 57
+ ++++++++++++++++++++++++++++++++++++++++++++-----------
+ poppler/XRef.h    |  2 +-
  3 files changed, 49 insertions(+), 14 deletions(-)
 
 commit 03d445f485f90972ab1c05d79b2999b763ab7377
@@ -30316,7 +33490,7 @@ Date:	Fri Jul 25 20:16:54 2008 +0200
 
     Fix XRef::writeToFile after my change
 
- poppler/XRef.cc |   10 +++-------
+ poppler/XRef.cc | 10 +++-------
  1 file changed, 3 insertions(+), 7 deletions(-)
 
 commit 136fa97576f2df0d7a7563b34651ca222927ea57
@@ -30336,9 +33510,9 @@ Date:	Fri Jul 25 20:12:51 2008 +0200
 
 	poppler/XRef.cc
 
- poppler/XRef.cc |   70
- ++++++++++++++++++++-----------------------------------
- poppler/XRef.h  |    1 -
+ poppler/XRef.cc | 70
+ +++++++++++++++++++++------------------------------------
+ poppler/XRef.h  |  1 -
  2 files changed, 25 insertions(+), 46 deletions(-)
 
 commit 55572b77da95c47393b78f3aff804ea9c5ae17e5
@@ -30348,7 +33522,7 @@ Date:	Tue Jul 22 22:50:00 2008 +0200
     Really do what the comment says and also init changeLeft, changeTop
     and changeZoom
 
- poppler/Link.cc |    1 +
+ poppler/Link.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8dc7afaeea08183de331ecfd41ce1971e7772fd0
@@ -30360,8 +33534,8 @@ Date:	Tue Jul 22 21:05:03 2008 +0200
 
     Fixes infinite loop on http://bugs.kde.org/show_bug.cgi?id=166145
 
- poppler/FontInfo.cc |	 44 ++++++++++++++++++++++++++++++++++++--------
- poppler/FontInfo.h  |	  4 ++++
+ poppler/FontInfo.cc | 44 ++++++++++++++++++++++++++++++++++++--------
+ poppler/FontInfo.h  |	4 ++++
  2 files changed, 40 insertions(+), 8 deletions(-)
 
 commit 9fb17c952dcff798e45280eeb9c718680147e766
@@ -30372,7 +33546,7 @@ Date:	Sun Jul 20 13:47:11 2008 +0200
 
     Fixes bug 16579
 
- glib/poppler-page.cc |    2 +-
+ glib/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3696025977fd345b12767f75a2de6ed7e9467365
@@ -30383,7 +33557,7 @@ Date:	Fri Jul 18 23:32:25 2008 +0200
     is Annots
     is not a valid object
 
- poppler/Page.cc |    1 +
+ poppler/Page.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0189ff8b86de18486f7397076f7a0fbf133a1a33
@@ -30395,7 +33569,7 @@ Date:	Tue Jul 1 20:16:50 2008 +0200
 
     Fixes bug 16579
 
- poppler/Page.cc |    2 +-
+ poppler/Page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5bd77dcdd5220d63934f4b3e78d85a936947a53d
@@ -30404,7 +33578,7 @@ Date:	Tue Jul 1 00:49:01 2008 +0200
 
     forgot about we use autofoo too
 
- qt4/tests/Makefile.am |    5 +++++
+ qt4/tests/Makefile.am | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 5ed2503003d973b5461594af15485af49591451d
@@ -30413,8 +33587,8 @@ Date:	Tue Jul 1 00:43:26 2008 +0200
 
     unittesting about ActualText
 
- qt4/tests/CMakeLists.txt	|    1 +
- qt4/tests/check_actualtext.cpp |   33 +++++++++++++++++++++++++++++++++
+ qt4/tests/CMakeLists.txt	|  1 +
+ qt4/tests/check_actualtext.cpp | 33 +++++++++++++++++++++++++++++++++
  2 files changed, 34 insertions(+)
 
 commit f3bb2eb556f5248242f6db85052ef045fcb697c6
@@ -30423,7 +33597,7 @@ Date:	Tue Jul 1 00:41:35 2008 +0200
 
     Unbreak ActualText extraction
 
- poppler/Gfx.cc |   10 +---------
+ poppler/Gfx.cc | 10 +---------
  1 file changed, 1 insertion(+), 9 deletions(-)
 
 commit 9e9543b105b39f8b0048c00fc94741e43ad615e9
@@ -30432,7 +33606,7 @@ Date:	Thu Jun 26 20:19:06 2008 +0200
 
     use FindPackageHandleStandardArgs
 
- cmake/modules/FindLIBOPENJPEG.cmake |	 11 ++---------
+ cmake/modules/FindLIBOPENJPEG.cmake | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 commit fec41ceddebe194f139bcc5b2f3fa74e7d1ae502
@@ -30442,7 +33616,7 @@ Date:	Thu Jun 26 20:18:27 2008 +0200
     need to use LIBOPENJPEG_FOUND, as it really represents whether
     libopenjpeg was found or not
 
- CMakeLists.txt |   18 +++++++++---------
+ CMakeLists.txt | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 commit 5498d93e59a0b79e5add3dc6181d5e98ba689217
@@ -30481,8 +33655,8 @@ Date:	Fri Jun 20 21:42:34 2008 -0700
     per-CairoOutputDev
     copy.
 
- poppler/CairoOutputDev.cc |   18 +++++++++++++++---
- poppler/CairoOutputDev.h  |	4 +++-
+ poppler/CairoOutputDev.cc | 18 +++++++++++++++---
+ poppler/CairoOutputDev.h  |  4 +++-
  2 files changed, 18 insertions(+), 4 deletions(-)
 
 commit c75632d62a052d3c3739b96f5586f97c68baf25b
@@ -30492,7 +33666,7 @@ Date:	Tue Jun 24 02:31:43 2008 +0200
     Open in WriteOnly mode, fixes the fact that when writing to an
     existing file, the contents beyond what we wrote were still there
 
- qt4/src/poppler-base-converter.cc |	2 +-
+ qt4/src/poppler-base-converter.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9810fdfc54aac80aa99561a9d820d11b062e4637
@@ -30501,7 +33675,7 @@ Date:	Tue Jun 24 02:12:21 2008 +0200
 
     the entry is not updated here either, fix uninitialized variable use
 
- poppler/XRef.cc |    1 +
+ poppler/XRef.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2da15db4751d3cb93d40b48e348dbc51f6e7a29f
@@ -30511,9 +33685,9 @@ Date:	Fri Jun 20 11:39:08 2008 +0200
     Do not create an OCGs object if there isn't an OCProperties dictionary
     in the Catalog
 
- poppler/Catalog.cc	    |	 5 +++--
- poppler/Gfx.cc		    |	12 +++++++++++-
- poppler/OptionalContent.cc |	25 +++++--------------------
+ poppler/Catalog.cc	    |  5 +++--
+ poppler/Gfx.cc		    | 12 +++++++++++-
+ poppler/OptionalContent.cc | 25 +++++--------------------
  3 files changed, 19 insertions(+), 23 deletions(-)
 
 commit d6fb5dcb7b7596961800d9744d17b6adb8d9a2ad
@@ -30538,8 +33712,8 @@ Date:	Wed Jun 18 11:24:05 2008 -0700
     is
     wrapped by calls to saveState/restoreState in Gfx::doShowText.
 
- poppler/CairoOutputDev.cc |	4 ++--
- poppler/CairoOutputDev.h  |	2 +-
+ poppler/CairoOutputDev.cc | 4 ++--
+ poppler/CairoOutputDev.h  | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit c3a00c83f1d24c1f88e7ed3b3f772460e578f3cc
@@ -30548,7 +33722,7 @@ Date:	Sun Jun 15 02:39:31 2008 +0200
 
     poppler-page-transition.h is here now
 
- qt4/src/Doxyfile |    2 +-
+ qt4/src/Doxyfile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2affed0fc97b958ae46f531c471a3cf0b04c0f55
@@ -30558,7 +33732,7 @@ Date:	Sat Jun 14 01:24:49 2008 +0200
     Give warnings if the build configuration for stream decoders is
     different from default one
 
- configure.ac |   20 +++++++++++++++++---
+ configure.ac | 20 +++++++++++++++++---
  1 file changed, 17 insertions(+), 3 deletions(-)
 
 commit 8e74bc612cb4102891324ffdbfcdb47293ecb95e
@@ -30567,7 +33741,7 @@ Date:	Sat Jun 14 01:13:53 2008 +0200
 
     Warn the user if he does not have any enabled rendering backend
 
- configure.ac |    3 +++
+ configure.ac | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 99d2361032cbaafd69bd796170757ed6482f208d
@@ -30581,14 +33755,14 @@ Date:	Sat Jun 14 00:53:38 2008 +0200
     http://lists.freedesktop.org/archives/poppler/2008-June/003874.html
     for more information
 
- CMakeLists.txt			     |	 30 +++++-
- cmake/modules/FindLIBOPENJPEG.cmake |	 44 +++++++++
- configure.ac			     |	 33 +++++++
- poppler/JPEG2000Stream.cc	     |	181
- +++++++++++++++++++++++++++++++++++
- poppler/JPEG2000Stream.h	     |	 48 ++++++++++
- poppler/Makefile.am		     |	 22 ++++-
- poppler/Stream.cc		     |	  7 +-
+ CMakeLists.txt			     |	30 +++++-
+ cmake/modules/FindLIBOPENJPEG.cmake |	44 +++++++++
+ configure.ac			     |	33 +++++++
+ poppler/JPEG2000Stream.cc	     | 181
+ ++++++++++++++++++++++++++++++++++++
+ poppler/JPEG2000Stream.h	     |	48 ++++++++++
+ poppler/Makefile.am		     |	22 ++++-
+ poppler/Stream.cc		     |	 7 +-
  7 files changed, 360 insertions(+), 5 deletions(-)
 
 commit e368838d7f9691c7b1adf7d7f62f65abed91eea7
@@ -30598,9 +33772,9 @@ Date:	Wed Jun 11 00:48:53 2008 +0200
     [Qt4] Add the possibility of getting a QByteArray with the data of
     an embedded font
 
- qt4/src/poppler-document.cc |	 23 +++++++++++++++++++++++
- qt4/src/poppler-private.h   |	  3 +++
- qt4/src/poppler-qt4.h	     |	  5 +++++
+ qt4/src/poppler-document.cc | 23 +++++++++++++++++++++++
+ qt4/src/poppler-private.h   |	3 +++
+ qt4/src/poppler-qt4.h	     |	5 +++++
  3 files changed, 31 insertions(+)
 
 commit 184292ffb8fef5aa5a72bdbfcc0c95b663f452bd
@@ -30609,8 +33783,8 @@ Date:	Tue Jun 10 23:00:11 2008 +0200
 
     Make the fontRef and the embRef accessible to FontInfo users
 
- poppler/FontInfo.cc |	  2 +-
- poppler/FontInfo.h  |	  3 +++
+ poppler/FontInfo.cc | 2 +-
+ poppler/FontInfo.h  | 3 +++
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 86b7e8a3bee74c5b89c451137cf9c2758ba6913f
@@ -30619,8 +33793,8 @@ Date:	Sun Jun 8 18:00:05 2008 +0930
 
     Ensure cairo renders Type 3 glyphs with only the fill color
 
- poppler/CairoOutputDev.cc |	3 +++
- poppler/CairoOutputDev.h  |	2 +-
+ poppler/CairoOutputDev.cc | 3 +++
+ poppler/CairoOutputDev.h  | 2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 99e2d95728f41c91ab59a01c62d82b19a7a2e083
@@ -30629,7 +33803,7 @@ Date:	Sun Jun 1 00:49:32 2008 +0930
 
     glib: save/restore cairo state when rendering a page
 
- glib/poppler-page.cc |    2 ++
+ glib/poppler-page.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 6f40ee4af6b59f9d2c326adc8d2574e45f4d4d29
@@ -30638,10 +33812,10 @@ Date:	Sun Jun 8 23:46:04 2008 +0200
 
     Make sure we use Qt4 moc to generate moc files of the qt4 frontend
 
- configure.ac	       |   20 ++++++++++++++++++++
- qt4/demos/Makefile.am |    2 +-
- qt4/src/Makefile.am   |    2 +-
- qt4/tests/Makefile.am |    2 +-
+ configure.ac	       | 20 ++++++++++++++++++++
+ qt4/demos/Makefile.am |  2 +-
+ qt4/src/Makefile.am   |  2 +-
+ qt4/tests/Makefile.am |  2 +-
  4 files changed, 23 insertions(+), 3 deletions(-)
 
 commit 86aa8fc0708f7da4a907a8bdb1845e53d29892b7
@@ -30650,7 +33824,7 @@ Date:	Thu Jun 5 19:21:08 2008 +0200
 
     Fix leak on ABWOutputDev.cc
 
- poppler/ABWOutputDev.cc |    2 ++
+ poppler/ABWOutputDev.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 979ef1cafa968d776a2b804ce555b11212212397
@@ -30659,8 +33833,8 @@ Date:	Tue Jun 3 21:07:15 2008 +0200
 
     Support for surrogates outside the BMP plane
 
- poppler/TextOutputDev.cc |   19 ++++++++++++++++++-
- poppler/UTF8.h		  |   14 ++++++++++++++
+ poppler/TextOutputDev.cc | 19 ++++++++++++++++++-
+ poppler/UTF8.h		  | 14 ++++++++++++++
  2 files changed, 32 insertions(+), 1 deletion(-)
 
 commit 1614ab3036cf25c9b94967163996678d386ce0ac
@@ -30669,14 +33843,14 @@ Date:	Sun Jun 1 16:32:55 2008 +0200
 
     Do not limit CharCodeToUnicodeString to 8 characters
 
- poppler/Annot.cc	      |   10 +++++-----
- poppler/CharCodeToUnicode.cc |   37 ++++++++++++++++++++----------------
- poppler/CharCodeToUnicode.h  |    2 +-
- poppler/Gfx.cc		      |    8 ++++----
- poppler/GfxFont.cc	      |   43
- +++++++++++++++++++++++-------------------
- poppler/GfxFont.h	      |    6 +++---
- poppler/PSOutputDev.cc       |    4 ++--
+ poppler/Annot.cc	      | 10 +++++-----
+ poppler/CharCodeToUnicode.cc | 37 +++++++++++++++++++++----------------
+ poppler/CharCodeToUnicode.h  |  2 +-
+ poppler/Gfx.cc		      |  8 ++++----
+ poppler/GfxFont.cc	      | 43
+ ++++++++++++++++++++++++-------------------
+ poppler/GfxFont.h	      |  6 +++---
+ poppler/PSOutputDev.cc       |  4 ++--
  7 files changed, 60 insertions(+), 50 deletions(-)
 
 commit bf95c6970dacaa62512de858cf60ff6cf0c1bf7c
@@ -30685,7 +33859,7 @@ Date:	Sun Jun 1 00:07:11 2008 +0200
 
     [Qt] Fix leak when calling Poppler::Document::scanForFonts
 
- qt/poppler-document.cc |    1 +
+ qt/poppler-document.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit d21d7271fc74ab78cd157549138d0027cf179471
@@ -30694,7 +33868,7 @@ Date:	Sat May 31 23:57:31 2008 +0200
 
     Make sure file exists before printing it
 
- utils/HtmlOutputDev.cc |    2 +-
+ utils/HtmlOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0480a788c0f25af1bc09360b599debb37f831e10
@@ -30703,7 +33877,7 @@ Date:	Tue May 27 23:20:32 2008 +0200
 
     require gthread-2.0
 
- cmake/modules/FindGTK.cmake |	  9 +++++----
+ cmake/modules/FindGTK.cmake | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 commit 2e40ef652eb9fca7fe947acb2adfecc96ad3c50e
@@ -30712,7 +33886,7 @@ Date:	Mon May 26 22:13:38 2008 +0200
 
     Do not shadow a paramer with a local variable name
 
- qt4/src/poppler-page.cc |    8 ++++----
+ qt4/src/poppler-page.cc | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 1fd856aa1fb48869111e5b86f263bfd94fa7af17
@@ -30721,7 +33895,7 @@ Date:	Mon May 26 20:52:53 2008 +0200
 
     Do not leak tSplash if transpGroupStack->blendingColorSpace is NULL
 
- poppler/SplashOutputDev.cc |	 4 ++--
+ poppler/SplashOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 492209ec8648342a3a5447611f3f1ce63b63e8e9
@@ -30731,7 +33905,7 @@ Date:	Mon May 26 20:51:06 2008 +0200
     Move variables only used inside the loop inside the loop, fix delete
     of uninitialized data due to my previous patch
 
- poppler/Page.cc |   16 ++++++----------
+ poppler/Page.cc | 16 ++++++----------
  1 file changed, 6 insertions(+), 10 deletions(-)
 
 commit 79ab8cceb318f3bb5ebad431824e3ae593aea340
@@ -30740,7 +33914,7 @@ Date:	Mon May 26 20:38:59 2008 +0200
 
     Do not leak memory if data_out is NULL
 
- poppler/Page.cc |   35 ++++++++++++++++++-----------------
+ poppler/Page.cc | 35 ++++++++++++++++++-----------------
  1 file changed, 18 insertions(+), 17 deletions(-)
 
 commit f44c33344d4af31ee008826179bcd92db445f35a
@@ -30749,8 +33923,8 @@ Date:	Sun May 25 19:16:12 2008 +0200
 
     [glib] Init glib threads in demo app as required by g_timer
 
- configure.ac	  |    4 ++--
- glib/demo/main.c |    4 ++++
+ configure.ac	  | 4 ++--
+ glib/demo/main.c | 4 ++++
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 58d5b7b9ab9ac245481299c4765f3bd305580d2e
@@ -30762,7 +33936,7 @@ Date:	Wed May 21 22:18:29 2008 +0200
     I'm not sure this is the real and correct fix, but it works more
     than previous code so it's and improvement
 
- qt4/src/poppler-page.cc |    6 +-----
+ qt4/src/poppler-page.cc | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 commit e3e4113c73128f49f99289b592446d4382b5d65c
@@ -30773,7 +33947,7 @@ Date:	Mon May 12 15:39:43 2008 +0200
 
     Needed by some reader using poppler internals, bad you!
 
- poppler/TextOutputDev.h |    5 +++++
+ poppler/TextOutputDev.h | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit ff699e64bd1de78915aad4ddb79d6f529aef2b87
@@ -30784,7 +33958,7 @@ Date:	Sun May 11 23:44:50 2008 +0200
 
     Fixes crash http://bugs.freedesktop.org/show_bug.cgi?id=15899
 
- poppler/OptionalContent.cc |	33 ++++++++++++++++++---------------
+ poppler/OptionalContent.cc | 33 ++++++++++++++++++---------------
  1 file changed, 18 insertions(+), 15 deletions(-)
 
 commit ac26ba5148b99a03a56e37ba201ad420b8619943
@@ -30793,7 +33967,7 @@ Date:	Fri May 9 20:17:37 2008 +0200
 
     Do not crash on unlock with wrong password
 
- qt/poppler-private.h |    2 +-
+ qt/poppler-private.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 19ec5a531cb03a7bee1cfcc9c7d5c4390fbd069d
@@ -30802,7 +33976,7 @@ Date:	Thu May 8 23:15:58 2008 +0200
 
     Fix build with --enable-fixedpoint
 
- splash/Splash.cc |    4 ++--
+ splash/Splash.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 1cf5f0fda542efef575a123622637d81b9c42053
@@ -30811,7 +33985,7 @@ Date:	Wed May 7 18:49:28 2008 +0200
 
     [Qt] Fix Document::unlock
 
- qt/poppler-document.cc |    4 +++-
+ qt/poppler-document.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit b5041924eb023cc095f2445935ff713cf65dacce
@@ -30820,7 +33994,7 @@ Date:	Wed May 7 16:44:03 2008 +0200
 
     do not delete the GooString owned by an Object
 
- poppler/Annot.cc |    4 ----
+ poppler/Annot.cc | 4 ----
  1 file changed, 4 deletions(-)
 
 commit 546a7b700862db00240de9fd50bdba1dd347765b
@@ -30829,9 +34003,9 @@ Date:	Sun May 4 15:26:26 2008 +0200
 
     Fix leaks on error conditions
 
- poppler/Annot.cc	    |	 6 ++++++
- poppler/ArthurOutputDev.cc |	 1 +
- poppler/JBIG2Stream.cc     |	 1 +
+ poppler/Annot.cc	    | 6 ++++++
+ poppler/ArthurOutputDev.cc | 1 +
+ poppler/JBIG2Stream.cc     | 1 +
  3 files changed, 8 insertions(+)
 
 commit 914f1b1d814ab3d958aa0ca21ad73ef5aed20b89
@@ -30841,7 +34015,7 @@ Date:	Sat May 3 18:21:28 2008 +0200
     A widget annot does not always belong to a form, so check before
     accessing the widget member
 
- poppler/Annot.cc |    4 ++--
+ poppler/Annot.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c907e41ab18dda10cd3c9789bd0e7fe71b6402a8
@@ -30850,7 +34024,7 @@ Date:	Wed Apr 30 00:42:34 2008 +0200
 
     findSegment can return NULL check for it
 
- poppler/JBIG2Stream.cc |    6 +++---
+ poppler/JBIG2Stream.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 8b7f29b577bca3295e99fea4a5cf4a6bb7ba2617
@@ -30859,7 +34033,7 @@ Date:	Wed Apr 30 00:26:28 2008 +0200
 
     new[] implies delete[]
 
- poppler/ABWOutputDev.cc |    2 +-
+ poppler/ABWOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 926c13825d5f7364286975db8ffa507b92f4b3ab
@@ -30868,7 +34042,7 @@ Date:	Tue Apr 29 23:44:51 2008 +0200
 
     add lost return when adding kees patch
 
- poppler/Object.h |    2 +-
+ poppler/Object.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ba9283f6bc78e97006e52ef5de20c958ee9e1a37
@@ -30877,7 +34051,7 @@ Date:	Tue Apr 29 23:42:00 2008 +0200
 
     make the function static
 
- utils/pdftoppm.cc |	2 +-
+ utils/pdftoppm.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 931a8272f556ba8a35342f0c5bf53bdb57ea7a31
@@ -30886,7 +34060,7 @@ Date:	Tue Apr 29 23:41:31 2008 +0200
 
     make the variable static
 
- utils/pdftoabw.cc |	2 +-
+ utils/pdftoabw.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1887d2910d2006c7fc3ecc95db0150f1537e9d0a
@@ -30895,20 +34069,20 @@ Date:	Tue Apr 29 23:35:17 2008 +0200
 
     constify some static arrays
 
- poppler/CompactFontTables.h |	  2 +-
- poppler/Decrypt.cc	     |	  8 ++++----
- poppler/Function.cc	     |	  2 +-
- poppler/GfxFont.cc	     |	  6 +++---
- poppler/GfxState.cc	     |	  4 ++--
- poppler/JBIG2Stream.cc      |	 10 +++++-----
- poppler/JPXStream.cc	     |	  4 ++--
- poppler/Lexer.cc	     |	  2 +-
- poppler/PSOutputDev.cc      |	  6 +++---
- poppler/PSTokenizer.cc      |	  2 +-
- poppler/SplashOutputDev.cc  |	  2 +-
- poppler/Stream-CCITT.h      |	 12 ++++++------
- poppler/Stream.cc	     |	 10 +++++-----
- poppler/UnicodeTypeTable.cc |	  2 +-
+ poppler/CompactFontTables.h |	2 +-
+ poppler/Decrypt.cc	     |	8 ++++----
+ poppler/Function.cc	     |	2 +-
+ poppler/GfxFont.cc	     |	6 +++---
+ poppler/GfxState.cc	     |	4 ++--
+ poppler/JBIG2Stream.cc      | 10 +++++-----
+ poppler/JPXStream.cc	     |	4 ++--
+ poppler/Lexer.cc	     |	2 +-
+ poppler/PSOutputDev.cc      |	6 +++---
+ poppler/PSTokenizer.cc      |	2 +-
+ poppler/SplashOutputDev.cc  |	2 +-
+ poppler/Stream-CCITT.h      | 12 ++++++------
+ poppler/Stream.cc	     | 10 +++++-----
+ poppler/UnicodeTypeTable.cc |	2 +-
  14 files changed, 36 insertions(+), 36 deletions(-)
 
 commit 51140e2d9490696d716f77d3225da0bfdfc212b4
@@ -30917,10 +34091,10 @@ Date:	Tue Apr 29 23:14:59 2008 +0200
 
     more static markers
 
- poppler/Annot.cc	    |	 2 +-
- poppler/DCTStream.cc	    |	 2 +-
- poppler/Object.cc	    |	 2 +-
- poppler/SplashOutputDev.cc |	 2 +-
+ poppler/Annot.cc	    | 2 +-
+ poppler/DCTStream.cc	    | 2 +-
+ poppler/Object.cc	    | 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 893703cb9eee879f728db329f7ee1fc19e7f980e
@@ -30929,7 +34103,7 @@ Date:	Tue Apr 29 23:03:51 2008 +0200
 
     add static
 
- poppler/XRef.cc |    2 +-
+ poppler/XRef.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7333bc913111e56ee241b7ef2bf6e9fea68b7da2
@@ -30938,7 +34112,7 @@ Date:	Tue Apr 29 23:01:13 2008 +0200
 
     add static
 
- poppler/JBIG2Stream.cc |   30 +++++++++++++++---------------
+ poppler/JBIG2Stream.cc | 30 +++++++++++++++---------------
  1 file changed, 15 insertions(+), 15 deletions(-)
 
 commit 1ea36507f9c9f163b6772268046e7560d0c00dbc
@@ -30947,7 +34121,7 @@ Date:	Tue Apr 29 22:47:19 2008 +0200
 
     make findModifier static
 
- poppler/GlobalParams.cc |    2 +-
+ poppler/GlobalParams.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit be9961571dbfabb982e6f69abd3bbc98fa971864
@@ -30956,7 +34130,7 @@ Date:	Tue Apr 29 21:48:09 2008 +0200
 
     make variables not used outside static
 
- utils/pdftohtml.cc |	 4 ++--
+ utils/pdftohtml.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit b157064a85350da6ea9c4f46e965e45ebc59d227
@@ -30965,7 +34139,7 @@ Date:	Tue Apr 29 21:43:23 2008 +0200
 
     constify setPSPaperSize
 
- utils/pdftops.cc |    2 +-
+ utils/pdftops.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ee57ead8a6f34fa8de044399e5912395e0f3a425
@@ -30976,16 +34150,16 @@ Date:	Tue Apr 29 21:37:57 2008 +0200
 
     Gives me binaries 2KB smaller (in total) in release build
 
- utils/parseargs.c  |	18 +++++++++---------
- utils/parseargs.h  |	 4 ++--
- utils/pdffonts.cc  |	 2 +-
- utils/pdfimages.cc |	 2 +-
- utils/pdfinfo.cc   |	 2 +-
- utils/pdftoabw.cc  |	 2 +-
- utils/pdftohtml.cc |	 2 +-
- utils/pdftoppm.cc  |	 2 +-
- utils/pdftops.cc   |	 2 +-
- utils/pdftotext.cc |	 2 +-
+ utils/parseargs.c  | 18 +++++++++---------
+ utils/parseargs.h  |  4 ++--
+ utils/pdffonts.cc  |  2 +-
+ utils/pdfimages.cc |  2 +-
+ utils/pdfinfo.cc   |  2 +-
+ utils/pdftoabw.cc  |  2 +-
+ utils/pdftohtml.cc |  2 +-
+ utils/pdftoppm.cc  |  2 +-
+ utils/pdftops.cc   |  2 +-
+ utils/pdftotext.cc |  2 +-
  10 files changed, 19 insertions(+), 19 deletions(-)
 
 commit 9f93d9eb464877e0d23dcf205295da9162f03253
@@ -30996,7 +34170,7 @@ Date:	Tue Apr 29 20:45:01 2008 +0200
 
     Makes my release build 64 bytes smaller
 
- poppler/Function.cc |	  2 +-
+ poppler/Function.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 29e3e779c68371b7c4aadcf68ee0712046f39c6d
@@ -31005,7 +34179,7 @@ Date:	Sat Apr 26 23:47:01 2008 +0200
 
     remember to call the base implementation here
 
- qt4/demos/optcontent.cpp |    1 +
+ qt4/demos/optcontent.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit a188f3cd36775d78ace5b5d62c8ab7c059b3b2b1
@@ -31014,7 +34188,7 @@ Date:	Sat Apr 26 23:42:09 2008 +0200
 
     reset the current page to 0, when closing a document
 
- qt4/demos/viewer.cpp |    1 +
+ qt4/demos/viewer.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit 7eca6da6436ffc1c41cfed1a07be4dafa1172463
@@ -31024,7 +34198,7 @@ Date:	Sat Apr 26 23:41:45 2008 +0200
     no need to manually disconnect from the model, as it will be deleted
     by the document anyway
 
- qt4/demos/optcontent.cpp |    1 -
+ qt4/demos/optcontent.cpp | 1 -
  1 file changed, 1 deletion(-)
 
 commit 6cddda7f3c3b8ddb95e6aba1b234a27c4454c23d
@@ -31033,8 +34207,8 @@ Date:	Sat Apr 26 22:41:59 2008 +0200
 
     sync updateFont() with SplashOutputDev
 
- poppler/ArthurOutputDev.cc |	75
- ++++++++++++++++++++++++++++++++++----------
+ poppler/ArthurOutputDev.cc | 75
+ ++++++++++++++++++++++++++++++++++++----------
  1 file changed, 59 insertions(+), 16 deletions(-)
 
 commit ddc7c1f8c24762bae615e7dec92e92a58c827478
@@ -31043,7 +34217,7 @@ Date:	Sat Apr 26 18:12:51 2008 +0200
 
     construct AnnotPolygon for Polygon and PolyLine annotations
 
- poppler/Annot.cc |    4 ++--
+ poppler/Annot.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit f9c7e8037b7165b6271ce7aea0d315053c4d66a5
@@ -31060,7 +34234,7 @@ Date:	Sat Apr 26 17:56:42 2008 +0200
 
     use the base implementation to update all the states
 
- poppler/ArthurOutputDev.cc |	11 +----------
+ poppler/ArthurOutputDev.cc | 11 +----------
  1 file changed, 1 insertion(+), 10 deletions(-)
 
 commit 45d2a9529bf241554c59437118cb8c705554dc27
@@ -31070,7 +34244,7 @@ Date:	Sat Apr 26 17:55:39 2008 +0200
     Set the font antialiasing from the painter settings, instead of the
     global settings.
 
- poppler/ArthurOutputDev.cc |	 2 +-
+ poppler/ArthurOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5faa72fd70e0d85268e807a8b870d80dda9189a9
@@ -31079,7 +34253,7 @@ Date:	Sat Apr 26 17:53:28 2008 +0200
 
     Get the font and painter matrices, and reenable the font drawing.
 
- poppler/ArthurOutputDev.cc |	28 +++++++++++++++++++++-------
+ poppler/ArthurOutputDev.cc | 28 +++++++++++++++++++++-------
  1 file changed, 21 insertions(+), 7 deletions(-)
 
 commit f5fec4fdedd8d316b19968545e447e2036a1bb47
@@ -31088,8 +34262,8 @@ Date:	Wed Apr 23 19:53:03 2008 +0200
 
     provide type-checking for union pointer accesses
 
- poppler/Object.h |   68
- ++++++++++++++++++++++++++++++++++--------------------
+ poppler/Object.h | 68
+ +++++++++++++++++++++++++++++++++++---------------------
  1 file changed, 43 insertions(+), 25 deletions(-)
 
 commit a567c921ce538616f4ba0b7933086ef5a8ab0f55
@@ -31101,7 +34275,7 @@ Date:	Tue Apr 22 23:09:10 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   19 ++++++++++---------
+ poppler/Annot.cc | 19 ++++++++++---------
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 commit 73798c95b8a4c0504e9246e6f73fd31f812ad6fa
@@ -31112,10 +34286,10 @@ Date:	Mon Apr 21 19:56:52 2008 +0200
 
     Should fix bug 15625
 
- configure.ac	     |	  2 +
- m4/acx_pthread.m4   |	280
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Makefile.am |	  4 +
+ configure.ac	     |	 2 +
+ m4/acx_pthread.m4   | 280
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Makefile.am |	 4 +
  3 files changed, 286 insertions(+)
 
 commit 6c248bdad77235a45402d9693a0b822cc208b6b9
@@ -31124,7 +34298,7 @@ Date:	Sun Apr 20 18:32:59 2008 +0200
 
     the dtor should be virtual
 
- qt4/src/poppler-converter-private.h |	  2 +-
+ qt4/src/poppler-converter-private.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 68dba1a452ca70add5b05ab8e2adab838bc2cb73
@@ -31133,7 +34307,7 @@ Date:	Sun Apr 20 16:21:10 2008 +0200
 
     if ncand is a Guint cand should be one too
 
- poppler/CMap.cc |    2 +-
+ poppler/CMap.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0b91eb19f5a3d07b625ee5188f1fcb4b4b1544ea
@@ -31142,7 +34316,7 @@ Date:	Sun Apr 20 16:17:50 2008 +0200
 
     Unused var--
 
- poppler/GfxFont.cc |	 2 +-
+ poppler/GfxFont.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1ed3cc40987b691319fd9f1a30296d80de5732fd
@@ -31151,7 +34325,7 @@ Date:	Wed Apr 16 15:45:45 2008 +0200
 
     fix border style conversion
 
- qt4/src/poppler-page.cc |    2 +-
+ qt4/src/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 7c8feb4e3627bde2052a7e536d2d49d1cbbce8ee
@@ -31164,8 +34338,8 @@ Date:	Tue Apr 15 21:57:31 2008 +0200
     we treat 16 bit images as 8 bit ones until it's fixed correctly.
     Fixes http://bugs.kde.org/show_bug.cgi?id=158165
 
- poppler/GfxState.cc |	  6 ++++++
- poppler/Stream.cc   |	  9 +++++++++
+ poppler/GfxState.cc | 6 ++++++
+ poppler/Stream.cc   | 9 +++++++++
  2 files changed, 15 insertions(+)
 
 commit f338a9ded5d42dd65853c5c7bbe27f6724096416
@@ -31174,7 +34348,7 @@ Date:	Sun Apr 13 21:41:51 2008 +0200
 
     [Qt4] convert the sound annotations
 
- qt4/src/poppler-page.cc |   16 ++++++++++++++--
+ qt4/src/poppler-page.cc | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
 commit 733d51fca04ee682fed2242f868edd545f3755fa
@@ -31183,9 +34357,9 @@ Date:	Sun Apr 13 21:38:25 2008 +0200
 
     [Qt4] First version of a SoundAnnotation.
 
- qt4/src/poppler-annotation.cc |   87
- +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h  |   30 +++++++++++++-
+ qt4/src/poppler-annotation.cc | 87
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h  | 30 ++++++++++++++-
  2 files changed, 116 insertions(+), 1 deletion(-)
 
 commit feb1ea091111bd7292879c465590acfd7671c876
@@ -31194,8 +34368,8 @@ Date:	Sun Apr 13 21:36:26 2008 +0200
 
     First version of AnnotSound.
 
- poppler/Annot.cc |   37 ++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h  |   26 ++++++++++++++++++++++++++
+ poppler/Annot.cc | 37 ++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h  | 26 ++++++++++++++++++++++++++
  2 files changed, 62 insertions(+), 1 deletion(-)
 
 commit ec2cf81edf1b2c6707de4d30316ff5f5e24534d4
@@ -31204,7 +34378,7 @@ Date:	Sun Apr 13 18:31:21 2008 +0200
 
     [Qt4] convert the file attachment annotations
 
- qt4/src/poppler-page.cc |   15 +++++++++++++--
+ qt4/src/poppler-page.cc | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 commit 9fa2e96c96d365ae67859545ebd635d726784fca
@@ -31213,9 +34387,9 @@ Date:	Sun Apr 13 18:29:00 2008 +0200
 
     [Qt4] Initial version of FileAttachmentAnnotation
 
- qt4/src/poppler-annotation.cc |   88
- +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h  |   29 +++++++++++++-
+ qt4/src/poppler-annotation.cc | 88
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h  | 29 +++++++++++++-
  2 files changed, 116 insertions(+), 1 deletion(-)
 
 commit 5899aff11f94e707654574e830e0757b1df558d4
@@ -31230,9 +34404,9 @@ Date:	Sun Apr 13 10:50:39 2008 +0200
     out how to convert, yet.
     Covert also the Caret annotations.
 
- qt4/src/poppler-annotation-helper.h |	  2 +-
- qt4/src/poppler-page.cc	     |	851
- ++++++++++++++++-------------------
+ qt4/src/poppler-annotation-helper.h |	 2 +-
+ qt4/src/poppler-page.cc	     | 851
+ +++++++++++++++++-------------------
  2 files changed, 393 insertions(+), 460 deletions(-)
 
 commit 40a12793c5ccea206d79e0c17e2f2d0cf74bb4f3
@@ -31241,7 +34415,7 @@ Date:	Sun Apr 13 02:21:55 2008 +0200
 
     add getters for the AnnotPolygon properties
 
- poppler/Annot.h |    6 ++++++
+ poppler/Annot.h | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 9311f75d4c3da991efb8afd00701a0ce1cbae1b0
@@ -31252,9 +34426,9 @@ Date:	Sun Apr 13 01:52:36 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   99
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |   37 ++++++++++++++++++++
+ poppler/Annot.cc | 99
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  | 37 +++++++++++++++++++++
  2 files changed, 136 insertions(+)
 
 commit 01aa052ed761a4ada471d196985825986bb58627
@@ -31265,9 +34439,9 @@ Date:	Sun Apr 13 01:13:49 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   96
- +++++++++++++++++++++++++++++-------------------------
- poppler/Annot.h  |    4 ++-
+ poppler/Annot.cc | 96
+ ++++++++++++++++++++++++++++++--------------------------
+ poppler/Annot.h  |  4 ++-
  2 files changed, 55 insertions(+), 45 deletions(-)
 
 commit ca52830e9519ae7b778f98e5c2547daef7da5f09
@@ -31278,8 +34452,8 @@ Date:	Sun Apr 13 00:54:13 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |    9 +++------
- poppler/Annot.h  |    5 +++--
+ poppler/Annot.cc | 9 +++------
+ poppler/Annot.h  | 5 +++--
  2 files changed, 6 insertions(+), 8 deletions(-)
 
 commit 4b87196b7829c87d15af4e8b4138ca97548fb519
@@ -31292,9 +34466,9 @@ Date:	Sun Apr 13 00:18:24 2008 +0200
     This way, it can be shared and reused in various places (Catalog,
     AnnotFileAttachment, etc).
 
- poppler/Catalog.cc |  205
- ++++++++++++++++++++++++++++------------------------
- poppler/Catalog.h  |	 1 +
+ poppler/Catalog.cc | 205
+ +++++++++++++++++++++++++++++------------------------
+ poppler/Catalog.h  |	1 +
  2 files changed, 112 insertions(+), 94 deletions(-)
 
 commit 45b407e51905948690065749085a4af1cbb29a8e
@@ -31303,8 +34477,8 @@ Date:	Sun Apr 13 00:14:38 2008 +0200
 
     correctly get the FileSpec dictionary
 
- poppler/Annot.cc |    4 +++-
- poppler/Annot.h  |    2 +-
+ poppler/Annot.cc | 4 +++-
+ poppler/Annot.h  | 2 +-
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 commit c3aa3a97d9c553ea7976741d798901352fb5381c
@@ -31313,7 +34487,7 @@ Date:	Sat Apr 12 22:45:57 2008 +0200
 
     properly initialize an AnnotPath
 
- poppler/Annot.cc |    9 ++-------
+ poppler/Annot.cc | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 commit a3406fb2ace1390db1c181823a7bfc66c9174d98
@@ -31322,8 +34496,8 @@ Date:	Sat Apr 12 22:40:42 2008 +0200
 
     properly dispose the memory of the ink lists
 
- poppler/Annot.cc |   13 ++++++++++++-
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 13 ++++++++++++-
+ poppler/Annot.h  |  1 +
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit 0dad70e2d12e8b587cab8ce2d914c81c6897a1d1
@@ -31336,7 +34510,7 @@ Date:	Sat Apr 12 22:15:35 2008 +0200
     - dispose with free what you allocate with malloc
     - fix logic when checking for an even number of points
 
- poppler/Annot.cc |    8 ++++----
+ poppler/Annot.cc | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 77404e24ea1e175fc9b55097dc5b35cc34760659
@@ -31345,7 +34519,7 @@ Date:	Sat Apr 12 21:08:54 2008 +0200
 
     a length is an int
 
- poppler/Annot.h |    2 +-
+ poppler/Annot.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bc2b2ffd2144f951c311e968fba4bc50b7c43ff3
@@ -31376,7 +34550,7 @@ Date:	Sat Apr 12 00:44:08 2008 +0200
      tion also applies when color spaces are defined in terms of other
      color spaces.
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bacc1dd9f37ff19c5e54878a5b08e7d734584bbf
@@ -31386,8 +34560,8 @@ Date:	Sat Apr 12 17:20:09 2008 +0200
     Read the "in reply to" reference as such, without reading the
     associated annotation dictionary.
 
- poppler/Annot.cc |   10 ++++------
- poppler/Annot.h  |    4 ++--
+ poppler/Annot.cc | 10 ++++------
+ poppler/Annot.h  |  4 ++--
  2 files changed, 6 insertions(+), 8 deletions(-)
 
 commit ffe09454a0948a6107bcc38f23ba2068151c547d
@@ -31398,9 +34572,9 @@ Date:	Sat Apr 12 17:17:59 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |  130
- ++++++++++++++++++++++++++++++++++++++++++++++++++----
- poppler/Annot.h  |   84 +++++++++++++++++++++++++++++------
+ poppler/Annot.cc | 130
+ +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/Annot.h  |  84 +++++++++++++++++++++++++++++------
  2 files changed, 193 insertions(+), 21 deletions(-)
 
 commit 8757c577241dda31bc59c7d1c208c159ad428877
@@ -31411,8 +34585,8 @@ Date:	Sat Apr 12 10:38:07 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   38 ++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h  |   25 +++++++++++++++++++++++++
+ poppler/Annot.cc | 38 ++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h  | 25 +++++++++++++++++++++++++
  2 files changed, 61 insertions(+), 2 deletions(-)
 
 commit 36989658149fc9e5e8a049ce070a102f35b7bddc
@@ -31423,9 +34597,9 @@ Date:	Sat Apr 12 09:55:26 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |  113
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |   45 ++++++++++++++++++++++
+ poppler/Annot.cc | 113
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  45 ++++++++++++++++++++++
  2 files changed, 158 insertions(+)
 
 commit 464b171d0e9b989196c287f2ee4dfbbc14212aa9
@@ -31447,7 +34621,7 @@ Date:	Sat Apr 12 00:44:08 2008 +0200
      tion also applies when color spaces are defined in terms of other
      color spaces.
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 42db4890e8295aaec5a1be12d1414fc0a9048550
@@ -31508,7 +34682,7 @@ Date:	Thu Mar 27 10:52:22 2008 +0000
     destruction of the CairoFont, and then to release the FT_Face from the
     destroy notify of the cairo_font_face_t.
 
- poppler/CairoFontEngine.cc |	19 +++++++++----------
+ poppler/CairoFontEngine.cc | 19 +++++++++----------
  1 file changed, 9 insertions(+), 10 deletions(-)
 
 commit 5f60843824582ece36d806508ec388330ddee854
@@ -31519,10 +34693,10 @@ Date:	Tue Apr 8 00:30:57 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   64
- +++++++++++++++++---------------------------------
- poppler/Annot.h  |   69
- +++++++++++++++++++++++++-----------------------------
+ poppler/Annot.cc | 64
+ ++++++++++++++++++----------------------------------
+ poppler/Annot.h  | 69
+ ++++++++++++++++++++++++++------------------------------
  2 files changed, 54 insertions(+), 79 deletions(-)
 
 commit a6f70f465a3e6719d63cefbe3c27bae015be43c1
@@ -31531,7 +34705,7 @@ Date:	Sun Apr 6 13:12:01 2008 +0200
 
     add getters for the coordinates in an AnnotLine
 
- poppler/Annot.h |    4 ++++
+ poppler/Annot.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 1d83d6edf9a843335e37a4d1e0e0dd71eb23d93b
@@ -31540,8 +34714,8 @@ Date:	Sun Apr 6 12:24:42 2008 +0200
 
     [Qt4] the caret symbol is an enum value, now
 
- qt4/src/poppler-annotation.cc |   35 ++++++++++++++++++++++++++++-------
- qt4/src/poppler-annotation.h  |    7 +++++--
+ qt4/src/poppler-annotation.cc | 35 ++++++++++++++++++++++++++++-------
+ qt4/src/poppler-annotation.h  |  7 +++++--
  2 files changed, 33 insertions(+), 9 deletions(-)
 
 commit 229d991a3258cb9b56f5e00f2deb3c976253cf68
@@ -31551,8 +34725,8 @@ Date:	Sun Apr 6 12:23:04 2008 +0200
     the caret symbol does not seem to allow additional values, so convert
     it to an enum
 
- poppler/Annot.cc |   11 +++++++----
- poppler/Annot.h  |    9 +++++++--
+ poppler/Annot.cc | 11 +++++++----
+ poppler/Annot.h  |  9 +++++++--
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 commit fc24500ddd9182f97d23c46eaafc6be79a6721eb
@@ -31561,7 +34735,7 @@ Date:	Sun Apr 6 11:43:49 2008 +0200
 
     propetly initialise a couple of members; leak less
 
- poppler/ArthurOutputDev.cc |	 5 +++++
+ poppler/ArthurOutputDev.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 9409de1e7c5b3770c7ef00c01ee376953dd532a5
@@ -31572,7 +34746,7 @@ Date:	Sun Apr 6 01:38:25 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   35 ++---------------------------------
+ poppler/Annot.cc | 35 ++---------------------------------
  1 file changed, 2 insertions(+), 33 deletions(-)
 
 commit 28c5ee2e9fc2a24d2f2efb3d74d5cf882a106239
@@ -31581,7 +34755,7 @@ Date:	Sat Apr 5 23:19:33 2008 +0200
 
     typo fix
 
- poppler/Annot.h |    2 +-
+ poppler/Annot.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ed02769688466ca72bf35d4223c3822a1245604b
@@ -31590,8 +34764,8 @@ Date:	Sat Apr 5 19:36:21 2008 +0200
 
     read the destination of a link annotation
 
- poppler/Annot.cc |    5 ++++-
- poppler/Annot.h  |    4 ++--
+ poppler/Annot.cc | 5 ++++-
+ poppler/Annot.h  | 4 ++--
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit ca31bf12a9d70bac88e457f7799e9935aba58640
@@ -31600,7 +34774,7 @@ Date:	Sat Apr 5 16:48:53 2008 +0200
 
     variable forgotten in the copy&paste...
 
- qt4/src/poppler-annotation.cc |    6 +++---
+ qt4/src/poppler-annotation.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 4168daa141b76e5fcd07d046aca8dac2f3037ff9
@@ -31609,7 +34783,7 @@ Date:	Sat Apr 5 16:34:12 2008 +0200
 
     [Qt4] deserialize also CaretAnnotation's
 
- qt4/src/poppler-annotation.cc |    3 +++
+ qt4/src/poppler-annotation.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit b55bcc2aa95825863bef23ab96364b350a49949d
@@ -31618,9 +34792,9 @@ Date:	Sat Apr 5 16:31:31 2008 +0200
 
     [Qt4] first version of a CaretAnnotation.
 
- qt4/src/poppler-annotation.cc |   80
- +++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h  |   25 ++++++++++++-
+ qt4/src/poppler-annotation.cc | 80
+ +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h  | 25 +++++++++++++-
  2 files changed, 104 insertions(+), 1 deletion(-)
 
 commit 4c9a02b7e49666efe10fdc16e7a03d8d520b65ec
@@ -31629,8 +34803,8 @@ Date:	Sat Apr 5 16:01:58 2008 +0200
 
     First version of AnnotCaret.
 
- poppler/Annot.cc |   36 +++++++++++++++++++++++++++++++++++-
- poppler/Annot.h  |   22 ++++++++++++++++++++++
+ poppler/Annot.cc | 36 +++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h  | 22 ++++++++++++++++++++++
  2 files changed, 57 insertions(+), 1 deletion(-)
 
 commit d260fe9e514c667b66969b982119429cc922eb07
@@ -31640,7 +34814,7 @@ Date:	Sat Apr 5 15:54:29 2008 +0200
     isolate the code for parsing a "difference rectangle" in an own
     function
 
- poppler/Annot.cc |   54
+ poppler/Annot.cc | 54
  +++++++++++++++++++++++++++++++-----------------------
  1 file changed, 31 insertions(+), 23 deletions(-)
 
@@ -31650,9 +34824,9 @@ Date:	Sat Apr 5 15:36:43 2008 +0200
 
     First version of AnnotGeometry.
 
- poppler/Annot.cc |   77
- ++++++++++++++++++++++++++++++++++++++++++++++++++++--
- poppler/Annot.h  |   24 +++++++++++++++++
+ poppler/Annot.cc | 77
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/Annot.h  | 24 ++++++++++++++++++
  2 files changed, 99 insertions(+), 2 deletions(-)
 
 commit 95d9d2362534c0524ad0448818b2d69b0909d482
@@ -31665,7 +34839,7 @@ Date:	Sat Apr 5 03:23:00 2008 +0200
     with the proper one (either X or Y);
     free the "point" object after each iteration
 
- poppler/Annot.cc |   11 ++++++++---
+ poppler/Annot.cc | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 commit af1ffcbcec1730332d11f8da4a7ddac833b22408
@@ -31675,7 +34849,7 @@ Date:	Sat Apr 5 02:54:00 2008 +0200
     More robust reading of QuadPoints (reset the allocated memory,
     use the heap)
 
- poppler/Annot.cc |    7 +++----
+ poppler/Annot.cc | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 68fd98d69bac20282665cf6b824da30c3b310f0b
@@ -31684,8 +34858,8 @@ Date:	Sat Apr 5 02:51:41 2008 +0200
 
     Really implement AnnotTextMarkup.
 
- poppler/Annot.cc |   29 +++++++++++++++++++++++++----
- poppler/Annot.h  |    2 +-
+ poppler/Annot.cc | 29 +++++++++++++++++++++++++----
+ poppler/Annot.h  |  2 +-
  2 files changed, 26 insertions(+), 5 deletions(-)
 
 commit 69a2ecfaf8f8cffd3027db5c3cc88c41413e42f1
@@ -31694,8 +34868,8 @@ Date:	Sat Apr 5 01:38:28 2008 +0200
 
     Add the Stamp annotation type.
 
- poppler/Annot.cc |   28 +++++++++++++++++++++++++++-
- poppler/Annot.h  |   20 ++++++++++++++++++++
+ poppler/Annot.cc | 28 +++++++++++++++++++++++++++-
+ poppler/Annot.h  | 20 ++++++++++++++++++++
  2 files changed, 47 insertions(+), 1 deletion(-)
 
 commit 97be4332818bcf58461816be995d88926809a4e5
@@ -31706,9 +34880,9 @@ Date:	Fri Apr 4 23:49:12 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- glib/demo/annots.c    |   32 +++++---------------------------
- glib/poppler-annot.cc |   27 +++++----------------------
- glib/poppler-annot.h  |   13 +------------
+ glib/demo/annots.c    | 32 +++++---------------------------
+ glib/poppler-annot.cc | 27 +++++----------------------
+ glib/poppler-annot.h  | 13 +------------
  3 files changed, 11 insertions(+), 61 deletions(-)
 
 commit 5caac407cdaf58621ac27e5561b31a995404ccb3
@@ -31719,8 +34893,8 @@ Date:	Fri Apr 4 23:36:46 2008 +0200
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   25 ++++++-------------------
- poppler/Annot.h  |   15 +++------------
+ poppler/Annot.cc | 25 ++++++-------------------
+ poppler/Annot.h  | 15 +++------------
  2 files changed, 9 insertions(+), 31 deletions(-)
 
 commit 0b714a61383da1b62daf2a60e3f6fcda09b4e9f2
@@ -31729,7 +34903,7 @@ Date:	Thu Apr 3 20:02:52 2008 +0200
 
     FindFirstFile returns INVALID_HANDLE_VALUE and not NULL on error
 
- goo/gfile.cc |   12 ++++++------
+ goo/gfile.cc | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit be765f27cc5430d9bb2a3e113eb245d67c20a376
@@ -31739,7 +34913,7 @@ Date:	Mon Mar 31 12:37:33 2008 +0200
     [glib] Fix a crash in outline demo due to page_num == dest_page_num
     - 1
 
- glib/demo/utils.c |	2 +-
+ glib/demo/utils.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e991e9ac6fcc0b6928b96fe8326eebcf3cb720ca
@@ -31748,7 +34922,7 @@ Date:	Sat Mar 29 13:25:52 2008 +0100
 
     Add the export macro
 
- qt4/src/poppler-page-transition.h |	4 +++-
+ qt4/src/poppler-page-transition.h | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit b70ca35dce6da6efdff254c11a63de4f44228278
@@ -31757,12 +34931,12 @@ Date:	Sat Mar 29 00:30:31 2008 +0100
 
     Duplicate page-transition files on qt4
 
- qt4/src/CMakeLists.txt			   |	4 +-
- qt4/src/Makefile.am			   |	4 +-
- qt4/src/poppler-page-transition-private.h |   28 ++++++
- qt4/src/poppler-page-transition.cc	   |   95 +++++++++++++++++++
- qt4/src/poppler-page-transition.h	   |  146
- +++++++++++++++++++++++++++++
+ qt4/src/CMakeLists.txt			   |   4 +-
+ qt4/src/Makefile.am			   |   4 +-
+ qt4/src/poppler-page-transition-private.h |  28 ++++++
+ qt4/src/poppler-page-transition.cc	   |  95 +++++++++++++++++++
+ qt4/src/poppler-page-transition.h	   | 146
+ ++++++++++++++++++++++++++++++
  5 files changed, 273 insertions(+), 4 deletions(-)
 
 commit b5312785063235cef7584ab6a5d198fb72de0988
@@ -31773,8 +34947,8 @@ Date:	Wed Mar 26 23:56:49 2008 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- glib/demo/annots.c |  314
- +++++++++++++++++++++++++++++++++++++++++++++++-----
+ glib/demo/annots.c | 314
+ ++++++++++++++++++++++++++++++++++++++++++++++++-----
  1 file changed, 289 insertions(+), 25 deletions(-)
 
 commit 7cc8fd70f68d2cdab7ab83a0ecf6c8896c971d62
@@ -31806,8 +34980,8 @@ Date:	Wed Mar 26 20:59:21 2008 +0100
 
     [Qt4] Read the document-level JavaScript scripts.
 
- qt4/src/poppler-document.cc |	 15 +++++++++++++++
- qt4/src/poppler-qt4.h	     |	  8 ++++++++
+ qt4/src/poppler-document.cc | 15 +++++++++++++++
+ qt4/src/poppler-qt4.h	     |	8 ++++++++
  2 files changed, 23 insertions(+)
 
 commit b8a471e55b998836c09c65ff736afdef8ac55189
@@ -31816,8 +34990,8 @@ Date:	Wed Mar 26 20:56:01 2008 +0100
 
     Add support for JavaScript actions, and read them when found.
 
- poppler/Link.cc |   33 +++++++++++++++++++++++++++++++++
- poppler/Link.h  |   23 +++++++++++++++++++++++
+ poppler/Link.cc | 33 +++++++++++++++++++++++++++++++++
+ poppler/Link.h  | 23 +++++++++++++++++++++++
  2 files changed, 56 insertions(+)
 
 commit 2fd85dc1b8b2ababadfc60e285c08a844737e4bb
@@ -31826,8 +35000,8 @@ Date:	Wed Mar 26 20:53:42 2008 +0100
 
     Read the JavaScript codes in the NameTree of the Catalog.
 
- poppler/Catalog.cc |	39 +++++++++++++++++++++++++++++++++++++++
- poppler/Catalog.h  |	 7 +++++++
+ poppler/Catalog.cc | 39 +++++++++++++++++++++++++++++++++++++++
+ poppler/Catalog.h  |  7 +++++++
  2 files changed, 46 insertions(+)
 
 commit 312f14f5b7be1f0d62620477222919423c3869e0
@@ -31836,7 +35010,7 @@ Date:	Wed Mar 26 20:05:31 2008 +0100
 
     compile++
 
- fofi/FoFiBase.cc |    2 +-
+ fofi/FoFiBase.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5bd750062e1fb136f77a55d1f35b2d6fabaad1b3
@@ -31845,10 +35019,10 @@ Date:	Wed Mar 26 19:42:43 2008 +0100
 
     update version
 
- CMakeLists.txt   |    2 +-
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ msvc/config.h	  | 6 +++---
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 10d4a8b9aed51902157c04d9deea0e99d829c4f6
@@ -31857,7 +35031,7 @@ Date:	Wed Mar 26 19:42:36 2008 +0100
 
     fill news
 
- NEWS |   10 ++++++++++
+ NEWS | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 2069826d61ebd527768b6455689276c0a8288085
@@ -31866,7 +35040,7 @@ Date:	Wed Mar 26 16:05:06 2008 +0100
 
     missing break
 
- qt4/src/poppler-page.cc |    1 +
+ qt4/src/poppler-page.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit d6a0c6a6803a03f402c2dcde41c6195e951470ba
@@ -31875,7 +35049,7 @@ Date:	Wed Mar 26 15:50:39 2008 +0100
 
     initialize posterStream to avoid crashing later
 
- poppler/Movie.cc |    1 +
+ poppler/Movie.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 0be811b3ad86b1cb14be94a017e70c65b8e64730
@@ -31885,7 +35059,7 @@ Date:	Tue Mar 25 22:59:22 2008 +0100
     Don't end up in an infinite recursive loop in case resObj dict is
     the same we are already in
 
- poppler/FontInfo.cc |	  2 +-
+ poppler/FontInfo.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0222c6ceb0fcf1d7c4422691a68a035a558ad614
@@ -31895,12 +35069,12 @@ Date:	Mon Mar 24 17:14:07 2008 +0100
     fix build when using cmake, not sure it's completely ok, but at
     least i can compile
 
- CMakeLists.txt		     |	  1 +
- cmake/modules/FindGTK.cmake |	 23 ++++++++++++++++-------
- config.h.cmake		     |	  3 +++
- glib/CMakeLists.txt	     |	 17 +++++++++++------
- glib/poppler-page.cc	     |	  2 +-
- glib/test-poppler-glib.cc   |	  2 +-
+ CMakeLists.txt		     |	1 +
+ cmake/modules/FindGTK.cmake | 23 ++++++++++++++++-------
+ config.h.cmake		     |	3 +++
+ glib/CMakeLists.txt	     | 17 +++++++++++------
+ glib/poppler-page.cc	     |	2 +-
+ glib/test-poppler-glib.cc   |	2 +-
  6 files changed, 33 insertions(+), 15 deletions(-)
 
 commit 3e4164f2db69358adf07596195842dd00458b621
@@ -31909,7 +35083,7 @@ Date:	Mon Mar 24 15:10:31 2008 +0100
 
     fix some cmake HAVE_foo
 
- CMakeLists.txt |    6 +++---
+ CMakeLists.txt | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit 22f615aee488cc363a078330861e80f389f47061
@@ -31920,7 +35094,7 @@ Date:	Sun Mar 23 13:22:07 2008 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- glib/poppler-annot.cc |    4 ++--
+ glib/poppler-annot.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit cccfe42ed9c53d27cf6a1403ae55bf34a053012d
@@ -31929,8 +35103,8 @@ Date:	Sat Mar 22 19:12:05 2008 +0100
 
     Fix rm line not to error when no *moc file is present
 
- qt4/src/Makefile.am   |    2 +-
- qt4/tests/Makefile.am |    2 +-
+ qt4/src/Makefile.am   | 2 +-
+ qt4/tests/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit e60d39ba0e8b9742106a0c9b1385b1c907729c3f
@@ -31939,7 +35113,7 @@ Date:	Sat Mar 22 19:11:17 2008 +0100
 
     Fix rm line not to error if no *moc file is present
 
- qt4/demos/Makefile.am |    2 +-
+ qt4/demos/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit d9d52e622c6b28a9941168bb73839ec335ca7232
@@ -31948,7 +35122,7 @@ Date:	Sat Mar 22 19:10:40 2008 +0100
 
     Fix configure to not require gdk when we are on try mode
 
- configure.ac |    5 +++--
+ configure.ac | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 9b8809298dd16cdbffcc12b6db8e274578934063
@@ -31957,7 +35131,7 @@ Date:	Sat Mar 22 15:49:02 2008 +0100
 
     It's really only an error if < 0
 
- poppler/PDFDoc.cc |	2 +-
+ poppler/PDFDoc.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0fb1e697cc4100ce23298141c8b5829273872423
@@ -31966,7 +35140,7 @@ Date:	Sat Mar 22 15:46:44 2008 +0100
 
     remove unneeded variable
 
- poppler/PDFDoc.cc |	1 -
+ poppler/PDFDoc.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 3404cb626ee9b4520d6fe601e07560745a4cb42a
@@ -31977,10 +35151,10 @@ Date:	Sat Mar 22 15:44:50 2008 +0100
 
     This way we have a fseek less to care about if worked or not
 
- poppler/Stream.cc			      |    5 -----
- poppler/Stream.h			      |    5 -----
- qt4/src/poppler-qiodeviceoutstream-private.h |    1 -
- qt4/src/poppler-qiodeviceoutstream.cc	      |    5 -----
+ poppler/Stream.cc			      | 5 -----
+ poppler/Stream.h			      | 5 -----
+ qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
+ qt4/src/poppler-qiodeviceoutstream.cc	      | 5 -----
  4 files changed, 16 deletions(-)
 
 commit 066595dd06c930997d5ec65a06c822616af9baa0
@@ -31991,7 +35165,7 @@ Date:	Sat Mar 22 15:43:07 2008 +0100
 
     Fixes bug 14126
 
- poppler/PDFDoc.cc |	7 +++++++
+ poppler/PDFDoc.cc | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 23b6475463f8973b5ac83bb21a6b7b6000cc435b
@@ -32000,8 +35174,8 @@ Date:	Sat Mar 22 13:55:59 2008 +0100
 
     Check for fseek return values
 
- fofi/FoFiBase.cc   |	14 ++++++++++++--
- poppler/GfxFont.cc |	12 ++++++++++--
+ fofi/FoFiBase.cc   | 14 ++++++++++++--
+ poppler/GfxFont.cc | 12 ++++++++++--
  2 files changed, 22 insertions(+), 4 deletions(-)
 
 commit b33bb282e45cf1a083cfbb13603ac465d386c28d
@@ -32012,8 +35186,8 @@ Date:	Fri Mar 21 13:53:21 2008 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- glib/poppler-annot.cc |    4 ++--
- glib/poppler-annot.h  |    2 +-
+ glib/poppler-annot.cc | 4 ++--
+ glib/poppler-annot.h  | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 371932f413d570d7784c668f30834d3d92d7aa80
@@ -32022,7 +35196,7 @@ Date:	Thu Mar 20 11:44:32 2008 +0100
 
     [glib] Remove unused variable.
 
- glib/poppler-document.cc |    1 -
+ glib/poppler-document.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit 21fa476ac384256c15a954b708e009f2b336b06f
@@ -32033,10 +35207,10 @@ Date:	Thu Mar 20 11:42:32 2008 +0100
 
     Thanks to Kouhei Sutou who caught the problem.
 
- glib/poppler-page.cc	   |   60
- ++++++++++++++++++++++++++-------------------
- glib/poppler-private.h    |	3 ---
- glib/test-poppler-glib.cc |	9 ++++++-
+ glib/poppler-page.cc	   | 60
+ +++++++++++++++++++++++++++--------------------
+ glib/poppler-private.h    |  3 ---
+ glib/test-poppler-glib.cc |  9 ++++++-
  3 files changed, 43 insertions(+), 29 deletions(-)
 
 commit 22cd70d8fc308fb8b19d36d0172014ba532230fb
@@ -32045,7 +35219,7 @@ Date:	Wed Mar 19 21:52:14 2008 +0100
 
     poppler_annot_markup_get_opacity returns a double so use %f
 
- glib/demo/annots.c |	 2 +-
+ glib/demo/annots.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b9a5fd4671638caa91f8a389be278d993391f499
@@ -32054,8 +35228,8 @@ Date:	Wed Mar 19 21:28:49 2008 +0100
 
     updated by gtk-doc
 
- glib/reference/tmpl/poppler-action.sgml |    1 +
- glib/reference/tmpl/poppler.sgml	 |    3 +++
+ glib/reference/tmpl/poppler-action.sgml | 1 +
+ glib/reference/tmpl/poppler.sgml	 | 3 +++
  2 files changed, 4 insertions(+)
 
 commit b7e0b740578ea1e84ac0ef850b5a03c66b2863e3
@@ -32064,7 +35238,7 @@ Date:	Wed Mar 19 21:28:01 2008 +0100
 
     Fill 0.7.3 news
 
- NEWS |    7 +++++++
+ NEWS | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 3adaff1dad8127fdd06653cf49196027ad414a08
@@ -32073,10 +35247,10 @@ Date:	Wed Mar 19 21:27:46 2008 +0100
 
     Bump version to 0.7.3
 
- CMakeLists.txt   |    2 +-
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ msvc/config.h	  | 6 +++---
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 52dd710b63911be2d8c960de0232c497c35ecac8
@@ -32085,7 +35259,7 @@ Date:	Wed Mar 19 18:35:35 2008 +0100
 
     [glib] Update outline and links demos to the new POPPLER_ACTION_NONE
 
- glib/demo/utils.c |	3 +++
+ glib/demo/utils.c | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 6a22f0a20df38156c06e8ba10649e0828a1da102
@@ -32094,8 +35268,8 @@ Date:	Wed Mar 19 18:32:48 2008 +0100
 
     [glib] Consider no action as an action of type None instead of Unknown
 
- glib/poppler-action.cc |    2 +-
- glib/poppler-action.h	|    1 +
+ glib/poppler-action.cc | 2 +-
+ glib/poppler-action.h	| 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 185d5818fd546f85934b041d5b0cdcdf1849b1dc
@@ -32104,8 +35278,8 @@ Date:	Tue Mar 18 20:08:21 2008 +0100
 
     Improve error handling when creating a document
 
- glib/poppler-document.cc |   40 ++++++++++++++++++++++++++++------------
- glib/poppler.h		  |    5 ++++-
+ glib/poppler-document.cc | 40 ++++++++++++++++++++++++++++------------
+ glib/poppler.h		  |  5 ++++-
  2 files changed, 32 insertions(+), 13 deletions(-)
 
 commit 9bba2748985049515bfd9c9b44f26b92fa704078
@@ -32114,7 +35288,7 @@ Date:	Sat Mar 15 01:11:39 2008 +0100
 
     Some more free
 
- poppler/OptionalContent.cc |	 5 +++++
+ poppler/OptionalContent.cc | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit bfc308935fa138e27c4d2ad0e1c1cad20eba8e8a
@@ -32123,7 +35297,7 @@ Date:	Sat Mar 15 01:05:32 2008 +0100
 
     Use error instead of printf
 
- poppler/OptionalContent.cc |	15 ++++++++-------
+ poppler/OptionalContent.cc | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)
 
 commit 998b1523ee653c1585f03b4a580e0d95ba694aca
@@ -32132,7 +35306,7 @@ Date:	Sat Mar 15 01:02:31 2008 +0100
 
     Some free
 
- poppler/OptionalContent.cc |	 3 +++
+ poppler/OptionalContent.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit c65a66a82259f547927cbb918611bcf4a8e264b2
@@ -32143,7 +35317,7 @@ Date:	Fri Mar 14 20:29:53 2008 +0100
 
     Fixes several warnings about writes on bad places
 
- splash/SplashXPathScanner.cc |    5 +++--
+ splash/SplashXPathScanner.cc | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit bd2272f3079319d1c05ca93f7fb6eb0a5370b938
@@ -32155,7 +35329,7 @@ Date:	Fri Mar 14 19:52:04 2008 +0100
 
     Fixes bug 15009
 
- splash/Splash.cc |   12 ++++++++----
+ splash/Splash.cc | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 commit 5bf8d864e68854f0855e07fb67aa124e06c739cd
@@ -32164,7 +35338,7 @@ Date:	Wed Mar 12 22:48:07 2008 +0100
 
     fix build
 
- glib/reference/Makefile.am |	 1 +
+ glib/reference/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit d0be5c86dcd3310062d820b3515c31e4720af2ca
@@ -32173,11 +35347,11 @@ Date:	Wed Mar 12 22:40:59 2008 +0100
 
     Update version to 0.7.2 and fill NEWS
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   20 ++++++++++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 20 ++++++++++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 +++---
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 26 insertions(+), 6 deletions(-)
 
 commit 0b2ecf39572821a99374e6acec7c1bd438911bbc
@@ -32186,7 +35360,7 @@ Date:	Wed Mar 12 22:38:57 2008 +0100
 
     update soname here too
 
- glib/CMakeLists.txt |	  2 +-
+ glib/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f5065016b168e4896e2fe774cd22bbd900849b52
@@ -32197,20 +35371,20 @@ Date:	Wed Mar 12 22:06:53 2008 +0100
 
     Fixes bug #13719.
 
- configure.ac		    |	45 ++-
- glib/Makefile.am	    |	 7 +-
- glib/demo/page.c	    |	88 +++++-
- glib/demo/render.c	    |	 4 +
- glib/poppler-action.h	    |	 1 -
- glib/poppler-annot.cc	    |	26 +-
- glib/poppler-annot.h	    |	 2 +-
- glib/poppler-document.h    |	 2 -
- glib/poppler-features.h.in |	 1 +
- glib/poppler-page.cc	    |  695
- ++++++++++++++++++++++++++------------------
- glib/poppler-page.h	    |	76 +++--
- glib/poppler.h		    |	 2 +-
- glib/test-poppler-glib.cc  |	 2 +-
+ configure.ac		    |  45 ++-
+ glib/Makefile.am	    |	7 +-
+ glib/demo/page.c	    |  88 +++++-
+ glib/demo/render.c	    |	4 +
+ glib/poppler-action.h	    |	1 -
+ glib/poppler-annot.cc	    |  26 +-
+ glib/poppler-annot.h	    |	2 +-
+ glib/poppler-document.h    |	2 -
+ glib/poppler-features.h.in |	1 +
+ glib/poppler-page.cc	    | 695
+ ++++++++++++++++++++++++++-------------------
+ glib/poppler-page.h	    |  76 +++--
+ glib/poppler.h		    |	2 +-
+ glib/test-poppler-glib.cc  |	2 +-
  13 files changed, 610 insertions(+), 341 deletions(-)
 
 commit 46d4fab82332e71d0b68c0a8deeac78f2201ed14
@@ -32219,10 +35393,10 @@ Date:	Wed Mar 12 20:35:33 2008 +0100
 
     Increment version of libpoppler and libpoppler-qt4
 
- CMakeLists.txt		|    2 +-
- poppler/Makefile.am	|    2 +-
- qt4/src/CMakeLists.txt |    2 +-
- qt4/src/Makefile.am	|    2 +-
+ CMakeLists.txt		| 2 +-
+ poppler/Makefile.am	| 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Makefile.am	| 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 550c1fc73a6d2af65728751fd0b59ccc7110fa8b
@@ -32231,7 +35405,7 @@ Date:	Wed Mar 12 20:34:48 2008 +0100
 
     Init to false updated field of XRefEntries plus indenting fixes
 
- poppler/XRef.cc |   11 ++++++-----
+ poppler/XRef.cc | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 commit 6a671686c6265ecdb4c48f04392de9c56d4e0936
@@ -32249,7 +35423,7 @@ Date:	Wed Mar 12 21:43:12 2008 +1030
     the matrix. Instead, make a copy of the matrix before testing if it is
     invertable.
 
- poppler/CairoOutputDev.cc |	7 ++++---
+ poppler/CairoOutputDev.cc | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 commit 0b2c3bb25c908b07e760d824dbfe93c6051812aa
@@ -32268,7 +35442,7 @@ Date:	Wed Mar 12 00:07:12 2008 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9c472f76d2462d0e775c851fdbac6ca2bc9812ea
@@ -32277,7 +35451,7 @@ Date:	Wed Mar 12 00:00:20 2008 +0100
 
     cmake build
 
- glib/demo/CMakeLists.txt |    1 +
+ glib/demo/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 821858f5c36786955d9475044bfee57f5060ad2f
@@ -32287,10 +35461,10 @@ Date:	Tue Mar 11 23:58:05 2008 +0100
     Return char bounding box instead of edge, it's much more useful for
     character positioning
 
- qt4/src/poppler-page.cc    |	 8 ++++++--
- qt4/src/poppler-private.h  |	 3 +--
- qt4/src/poppler-qt4.h	    |	 6 ++----
- qt4/src/poppler-textbox.cc |	 4 ++--
+ qt4/src/poppler-page.cc    | 8 ++++++--
+ qt4/src/poppler-private.h  | 3 +--
+ qt4/src/poppler-qt4.h	    | 6 ++----
+ qt4/src/poppler-textbox.cc | 4 ++--
  4 files changed, 11 insertions(+), 10 deletions(-)
 
 commit d7e642732ced592362d9787bddadb7a110dcc5a5
@@ -32309,11 +35483,11 @@ Date:	Tue Mar 11 23:13:33 2008 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- glib/demo/Makefile.am |    2 +
- glib/demo/annots.c    |  468
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/annots.h    |   31 ++++
- glib/demo/main.c      |    4 +-
+ glib/demo/Makefile.am |   2 +
+ glib/demo/annots.c    | 468
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/annots.h    |  31 ++++
+ glib/demo/main.c      |   4 +-
  4 files changed, 504 insertions(+), 1 deletion(-)
 
 commit 2d6c60537317bd3ac9e0582e0da09e7365729097
@@ -32322,9 +35496,9 @@ Date:	Tue Mar 11 22:54:44 2008 +0100
 
     For now we cannot handle MovieLink's, so comment them out.
 
- qt4/src/poppler-annotation.cc |    2 ++
- qt4/src/poppler-link.cc       |    4 ++++
- qt4/src/poppler-link.h        |    2 ++
+ qt4/src/poppler-annotation.cc | 2 ++
+ qt4/src/poppler-link.cc       | 4 ++++
+ qt4/src/poppler-link.h        | 2 ++
  3 files changed, 8 insertions(+)
 
 commit a354f7198c493990613a1db131c662ec27948863
@@ -32335,9 +35509,9 @@ Date:	Tue Mar 11 22:49:00 2008 +0100
 
     Now with the forgotten files
 
- poppler/Movie.cc |  443
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Movie.h  |  177 ++++++++++++++++++++++
+ poppler/Movie.cc | 443
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Movie.h  | 177 ++++++++++++++++++++++
  2 files changed, 620 insertions(+)
 
 commit 43e5dd941d4bc35c4eebbad66c13235639e0c1a0
@@ -32354,7 +35528,7 @@ Date:	Tue Mar 11 22:31:00 2008 +0100
 
     Fix build
 
- glib/poppler-page.cc |    6 +++---
+ glib/poppler-page.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit aab17684dc3f21ff2b1ee6eacdc0c565d368df78
@@ -32363,13 +35537,13 @@ Date:	Tue Mar 11 22:28:28 2008 +0100
 
     Initial Movie support
 
- CMakeLists.txt      |	  2 +
- poppler/Annot.cc    |	316
- ++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h     |	125 ++++++++++++++++++++
- poppler/Link.cc     |	108 +++++++++++++++---
- poppler/Link.h      |	 64 ++++++++++-
- poppler/Makefile.am |	  2 +
+ CMakeLists.txt      |	 2 +
+ poppler/Annot.cc    | 316
+ +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h     | 125 +++++++++++++++++++++
+ poppler/Link.cc     | 108 +++++++++++++++---
+ poppler/Link.h      |	64 ++++++++++-
+ poppler/Makefile.am |	 2 +
  6 files changed, 591 insertions(+), 26 deletions(-)
 
 commit 13a0d2390b9e4684af070c213f385485715353df
@@ -32378,7 +35552,7 @@ Date:	Tue Mar 11 22:27:38 2008 +0100
 
     Add poppler-annot to the cmake build system
 
- glib/CMakeLists.txt |	  2 ++
+ glib/CMakeLists.txt | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 19f0e3b40bce4d8157d8c8bd04eaf6bacbef38b8
@@ -32387,14 +35561,14 @@ Date:	Tue Mar 11 22:09:04 2008 +0100
 
     Add preliminary annotations support in the glib frontend
 
- glib/Makefile.am	|    2 +
- glib/poppler-annot.cc	|  776
- ++++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-annot.h	|  181 +++++++++++
- glib/poppler-page.cc	|  166 +++++++++++
- glib/poppler-page.h	|   15 +
- glib/poppler-private.h |    5 +-
- glib/poppler.h		|    7 +
+ glib/Makefile.am	|   2 +
+ glib/poppler-annot.cc	| 776
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-annot.h	| 181 ++++++++++++
+ glib/poppler-page.cc	| 166 +++++++++++
+ glib/poppler-page.h	|  15 +
+ glib/poppler-private.h |   5 +-
+ glib/poppler.h		|   7 +
  7 files changed, 1151 insertions(+), 1 deletion(-)
 
 commit 6fa3ab20fee311b4aff92be18870fd0e1730a81f
@@ -32403,8 +35577,8 @@ Date:	Tue Mar 11 18:44:27 2008 +0100
 
     Changed AnnotMarkup inheritance
 
- poppler/Annot.cc |    9 +++++----
- poppler/Annot.h  |   10 +++++-----
+ poppler/Annot.cc |  9 +++++----
+ poppler/Annot.h  | 10 +++++-----
  2 files changed, 10 insertions(+), 9 deletions(-)
 
 commit 3111cfe2ccb32f9680baaad0c3f0678dd5969f8b
@@ -32413,7 +35587,7 @@ Date:	Mon Mar 10 22:12:36 2008 +0100
 
     And free the memory
 
- qt4/tests/test-poppler-qt4.cpp |    2 ++
+ qt4/tests/test-poppler-qt4.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 58f88c23402ac2e678dc655f64d93d89bb1812be
@@ -32423,8 +35597,8 @@ Date:	Mon Mar 10 22:08:43 2008 +0100
     Add the -textRects option to the test app so we can check text rects
     are correct
 
- qt4/tests/test-poppler-qt4.cpp |   45
- +++++++++++++++++++++++++++++++++++-----
+ qt4/tests/test-poppler-qt4.cpp | 45
+ +++++++++++++++++++++++++++++++++++++-----
  1 file changed, 40 insertions(+), 5 deletions(-)
 
 commit 94ceb3cae79dc7786fa59fd889a87160780ed5df
@@ -32444,7 +35618,7 @@ Date:	Sun Mar 9 23:33:11 2008 +0100
 
     Fixes bug 14883
 
- poppler/GlobalParams.cc |   17 +++++++++--------
+ poppler/GlobalParams.cc | 17 +++++++++--------
  1 file changed, 9 insertions(+), 8 deletions(-)
 
 commit 35f34bd44c74eeb76a58b30acfbb0303d7285f06
@@ -32453,7 +35627,7 @@ Date:	Sun Mar 9 17:38:54 2008 +0100
 
     Fix build when compiling without cairo support
 
- glib/demo/images.c |	 4 ++++
+ glib/demo/images.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 32637db19dd80a9b8452f86eb677b10e77290627
@@ -32464,7 +35638,7 @@ Date:	Sun Mar 9 00:57:08 2008 +0100
 
     Fixes bug 14583
 
- m4/qt.m4 |   15 ++++++++++++---
+ m4/qt.m4 | 15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
 
 commit 65a88a95a5c54c890048e8a986df361585d601dd
@@ -32475,9 +35649,9 @@ Date:	Sat Mar 8 03:11:36 2008 +0100
 
     Adapt the unit test for that.
 
- qt4/src/poppler-embeddedfile.cc |    5 +++++
- qt4/src/poppler-qt4.h		 |    5 +++++
- qt4/tests/check_attachments.cpp |    7 +++++++
+ qt4/src/poppler-embeddedfile.cc | 5 +++++
+ qt4/src/poppler-qt4.h		 | 5 +++++
+ qt4/tests/check_attachments.cpp | 7 +++++++
  3 files changed, 17 insertions(+)
 
 commit 23da27a229c8b3cc2a0a0dd6354c40723934390c
@@ -32486,8 +35660,8 @@ Date:	Sat Mar 8 03:10:58 2008 +0100
 
     Optionally read the mimetype for the embedded files.
 
- poppler/Catalog.cc |	17 +++++++++--------
- poppler/Catalog.h  |	 7 ++++++-
+ poppler/Catalog.cc | 17 +++++++++--------
+ poppler/Catalog.h  |  7 ++++++-
  2 files changed, 15 insertions(+), 9 deletions(-)
 
 commit 42c254b978c61e2ccfda083dfeffec9fc35a5fe7
@@ -32496,7 +35670,7 @@ Date:	Mon Mar 3 16:56:09 2008 +0100
 
     be safe about out-of-range values
 
- qt4/src/poppler-textbox.cc |	 2 +-
+ qt4/src/poppler-textbox.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5db75df77938eb7620867d0618058be52ed2d3cb
@@ -32505,7 +35679,7 @@ Date:	Mon Mar 3 16:53:39 2008 +0100
 
     initialize nicely
 
- qt4/src/poppler-private.h |	5 +++++
+ qt4/src/poppler-private.h | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 3ad0ab7e4abd37528284269c69be3cdfb8d31d2e
@@ -32514,8 +35688,8 @@ Date:	Mon Mar 3 16:49:23 2008 +0100
 
     apidox
 
- qt4/src/poppler-link.h |   17 +++++++++++++++++
- qt4/src/poppler-qt4.h	|   23 ++++++++++++++++++++++-
+ qt4/src/poppler-link.h | 17 +++++++++++++++++
+ qt4/src/poppler-qt4.h	| 23 ++++++++++++++++++++++-
  2 files changed, 39 insertions(+), 1 deletion(-)
 
 commit ec01926e5a9dc16e200060497c43e79a1623698d
@@ -32527,7 +35701,7 @@ Date:	Sun Mar 2 20:15:20 2008 -0500
     Ignoring singular ctm's gives a better result than having
     our cairo context error and turn off. Related to #14398.
 
- poppler/CairoOutputDev.cc |   14 ++++++++++++++
+ poppler/CairoOutputDev.cc | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 commit 4882d7a118b93fdb5c441d70757e485be7ee25d7
@@ -32536,7 +35710,7 @@ Date:	Thu Feb 28 15:12:23 2008 +0100
 
     printf -> qDebug
 
- qt4/src/poppler-optcontent.cc |    2 +-
+ qt4/src/poppler-optcontent.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 31ce4049bf12c2716be7ec0fb8eda502d989f66e
@@ -32547,10 +35721,10 @@ Date:	Thu Feb 28 22:09:30 2008 +1100
 
     This makes the PDF 1.7 spec open with the embedded files showing.
 
- qt4/demos/embeddedfiles.cpp |	  7 +++++++
- qt4/demos/embeddedfiles.h   |	  1 +
- qt4/demos/optcontent.cpp    |	  8 ++++++++
- qt4/demos/optcontent.h      |	  1 +
+ qt4/demos/embeddedfiles.cpp | 7 +++++++
+ qt4/demos/embeddedfiles.h   | 1 +
+ qt4/demos/optcontent.cpp    | 8 ++++++++
+ qt4/demos/optcontent.h      | 1 +
  4 files changed, 17 insertions(+)
 
 commit ff938c431799d49325c0f46f1e6cbe1033993a83
@@ -32559,7 +35733,7 @@ Date:	Wed Feb 27 23:12:53 2008 +0100
 
     do not forget to distribute GlobalParamsWin.cc next time
 
- poppler/Makefile.am |	  3 ++-
+ poppler/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 277382b8186d137a9f2a62bc2d22e9f0cda7d923
@@ -32568,7 +35742,7 @@ Date:	Wed Feb 27 22:56:33 2008 +0100
 
     fix typo
 
- glib/demo/images.c |	 2 +-
+ glib/demo/images.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5b2f8f21fca63508570a0c77c6f7221a322e6e57
@@ -32591,9 +35765,9 @@ Date:	Wed Feb 27 22:03:17 2008 +0100
     and in the drawing of their associated content [applying the same
     to their children, and so on].
 
- qt4/src/poppler-optcontent-private.h |    8 +++++++-
- qt4/src/poppler-optcontent.cc	      |   37
- +++++++++++++++++++++++++++++-----
+ qt4/src/poppler-optcontent-private.h |  8 +++++++-
+ qt4/src/poppler-optcontent.cc	      | 37
+ +++++++++++++++++++++++++++++++-----
  2 files changed, 39 insertions(+), 6 deletions(-)
 
 commit 4254f1237ebed09b8e1c85f935a20bde3d8f36ff
@@ -32610,8 +35784,8 @@ Date:	Wed Feb 27 20:39:09 2008 +0100
 
     small header cleanup
 
- qt4/src/poppler-optcontent-private.h |    9 +++++++--
- qt4/src/poppler-optcontent.cc	      |    7 ++++---
+ qt4/src/poppler-optcontent-private.h | 9 +++++++--
+ qt4/src/poppler-optcontent.cc	      | 7 ++++---
  2 files changed, 11 insertions(+), 5 deletions(-)
 
 commit ed6c0c260837a0025279765ef7778b83d6ee2209
@@ -32620,9 +35794,9 @@ Date:	Wed Feb 27 20:43:45 2008 +0100
 
     fix build and distcheck with autools
 
- qt4/demos/Makefile.am |    3 +++
- qt4/src/Makefile.am   |    5 ++++-
- qt4/tests/Makefile.am |    3 +++
+ qt4/demos/Makefile.am | 3 +++
+ qt4/src/Makefile.am   | 5 ++++-
+ qt4/tests/Makefile.am | 3 +++
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 344d55539b1b6bcabec609fd828db372a07491b4
@@ -32631,7 +35805,7 @@ Date:	Wed Feb 27 20:43:13 2008 +0100
 
     fill the NEWS for 0.7.1
 
- NEWS |   15 +++++++++++++++
+ NEWS | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 1c47633ba782021978fa34d41a4ab0badf3af9d3
@@ -32640,10 +35814,10 @@ Date:	Wed Feb 27 20:42:55 2008 +0100
 
     Increase version number to 0.7.1
 
- CMakeLists.txt   |    2 +-
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 +++---
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   | 2 +-
+ configure.ac	  | 2 +-
+ msvc/config.h	  | 6 +++---
+ qt4/src/Doxyfile | 2 +-
  4 files changed, 6 insertions(+), 6 deletions(-)
 
 commit 0569ae76b6af1723b4606af189242a23199f387d
@@ -32660,7 +35834,7 @@ Date:	Wed Feb 27 19:07:46 2008 +0100
 
     export the OptContentModel
 
- qt4/src/poppler-optcontent.h |    4 +++-
+ qt4/src/poppler-optcontent.h | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit 0445e64a4124af7c1b84673f237022e133eb8542
@@ -32669,7 +35843,7 @@ Date:	Wed Feb 27 19:04:03 2008 +0100
 
     make only the Document able to create OptContentsModel's
 
- qt4/src/poppler-optcontent.h |    6 +++++-
+ qt4/src/poppler-optcontent.h | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit c965437b67a4f97ee8365a217bd10406fba3767a
@@ -32678,9 +35852,9 @@ Date:	Wed Feb 27 18:58:31 2008 +0100
 
     setRootNode() is private (and unused) API
 
- qt4/src/poppler-optcontent-private.h |    2 ++
- qt4/src/poppler-optcontent.cc	      |    8 ++++----
- qt4/src/poppler-optcontent.h	      |    4 ----
+ qt4/src/poppler-optcontent-private.h | 2 ++
+ qt4/src/poppler-optcontent.cc	      | 8 ++++----
+ qt4/src/poppler-optcontent.h	      | 4 ----
  3 files changed, 6 insertions(+), 8 deletions(-)
 
 commit e293bfc384e2dfc4ef04582053ce18d8c0bcb7b3
@@ -32689,7 +35863,7 @@ Date:	Wed Feb 27 18:50:35 2008 +0100
 
     small cleanup
 
- qt4/src/poppler-optcontent.cc |   11 ++++-------
+ qt4/src/poppler-optcontent.cc | 11 ++++-------
  1 file changed, 4 insertions(+), 7 deletions(-)
 
 commit f11aa0008585e845ce509172d76f72f941be497d
@@ -32698,8 +35872,8 @@ Date:	Wed Feb 27 18:44:09 2008 +0100
 
     adapt the tests to the new layout of the contents model
 
- qt4/tests/check_optcontent.cpp |   66
- ++++++++++++++--------------------------
+ qt4/tests/check_optcontent.cpp | 66
+ +++++++++++++++---------------------------
  1 file changed, 23 insertions(+), 43 deletions(-)
 
 commit 4a324484b5c77ddc348746e7bcf6051ade28e389
@@ -32708,8 +35882,8 @@ Date:	Wed Feb 27 18:04:52 2008 +0100
 
     free some objects (thus leak less)
 
- poppler/Gfx.cc		    |	 2 ++
- poppler/OptionalContent.cc |	 2 ++
+ poppler/Gfx.cc		    | 2 ++
+ poppler/OptionalContent.cc | 2 ++
  2 files changed, 4 insertions(+)
 
 commit 0f4e7791ab6884072a1aee56e9cec212d8cea263
@@ -32718,7 +35892,7 @@ Date:	Wed Feb 27 15:58:21 2008 +0100
 
     ignore any generated .moc here
 
- qt4/src/.gitignore |	 2 +-
+ qt4/src/.gitignore | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 136ae44f155b17d9e8b041b67f75531d8544337c
@@ -32728,9 +35902,9 @@ Date:	Wed Feb 27 15:56:09 2008 +0100
     keep track of the items changed when toggling an item, so we can
     update them properly
 
- qt4/src/poppler-optcontent-private.h |    4 ++--
- qt4/src/poppler-optcontent.cc	      |   38
- +++++++++++++++++++++++++++-------
+ qt4/src/poppler-optcontent-private.h |  4 ++--
+ qt4/src/poppler-optcontent.cc	      | 38
+ ++++++++++++++++++++++++++++--------
  2 files changed, 32 insertions(+), 10 deletions(-)
 
 commit b73e2afef7e5e1b68d82a10c94bca3c201c5f8b3
@@ -32740,8 +35914,8 @@ Date:	Wed Feb 27 15:52:06 2008 +0100
     fix indexFromItem once again, and make parent() call it with the
     right node
 
- qt4/src/poppler-optcontent-private.h |    2 +-
- qt4/src/poppler-optcontent.cc	      |   19 +++++++++----------
+ qt4/src/poppler-optcontent-private.h |  2 +-
+ qt4/src/poppler-optcontent.cc	      | 19 +++++++++----------
  2 files changed, 10 insertions(+), 11 deletions(-)
 
 commit 803787f763578320aa5f405ed49c64e6b924bad3
@@ -32752,7 +35926,7 @@ Date:	Wed Feb 27 15:30:18 2008 +0100
 
     (second patch I forgot to apply with the first)
 
- qt4/src/Makefile.am |	  9 ++++++---
+ qt4/src/Makefile.am | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 commit 0b527a8ed62677bb09df4587f072a310c2959750
@@ -32761,8 +35935,8 @@ Date:	Wed Feb 27 14:34:13 2008 +0100
 
     Extract the OptContentItem -> QModelIndex creation in an own function.
 
- qt4/src/poppler-optcontent-private.h |    1 +
- qt4/src/poppler-optcontent.cc	      |    7 ++++++-
+ qt4/src/poppler-optcontent-private.h | 1 +
+ qt4/src/poppler-optcontent.cc	      | 7 ++++++-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit c94d6cc95c6838f31e27832cb3090389bf4d8227
@@ -32773,8 +35947,8 @@ Date:	Wed Feb 27 14:30:26 2008 +0100
 
     Errors spotted using ModelTest.
 
- qt4/src/poppler-optcontent-private.h |    2 +-
- qt4/src/poppler-optcontent.cc	      |   15 +++++++++------
+ qt4/src/poppler-optcontent-private.h |  2 +-
+ qt4/src/poppler-optcontent.cc	      | 15 +++++++++------
  2 files changed, 10 insertions(+), 7 deletions(-)
 
 commit b8e833733d84eaa93d6bae522710feb3075ca329
@@ -32783,7 +35957,7 @@ Date:	Wed Feb 27 14:05:19 2008 +0100
 
     fix build with the autotools
 
- qt4/src/Makefile.am |	  4 +++-
+ qt4/src/Makefile.am | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit f89ba474bae281f1cdeddb72ac8425dee1087e35
@@ -32797,8 +35971,8 @@ Date:	Wed Feb 27 13:28:50 2008 +0100
     column.
     Cleanup data()/setData() so they can be extended easily.
 
- qt4/src/poppler-optcontent.cc |   74
- +++++++++++++++++++++--------------------
+ qt4/src/poppler-optcontent.cc | 74
+ ++++++++++++++++++++++---------------------
  1 file changed, 38 insertions(+), 36 deletions(-)
 
 commit defa0ecb2790402a4069fea3b3c285a50675682d
@@ -32809,8 +35983,8 @@ Date:	Wed Feb 27 12:24:16 2008 +0100
 
     It does nothing yet, but we can add stuff later on w/o breaking BC.
 
- qt4/src/poppler-optcontent.cc |    5 +++++
- qt4/src/poppler-optcontent.h  |    2 ++
+ qt4/src/poppler-optcontent.cc | 5 +++++
+ qt4/src/poppler-optcontent.h  | 2 ++
  2 files changed, 7 insertions(+)
 
 commit f395531a3e8f71a46b3c942f8f437ade1d9fdb57
@@ -32819,7 +35993,7 @@ Date:	Wed Feb 27 22:22:51 2008 +1100
 
     Minor cleanup.
 
- qt4/src/poppler-optcontent.cc |    7 +++----
+ qt4/src/poppler-optcontent.cc | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 commit 0a19486cb4de57c0c987cc4ce2434a96bbd18338
@@ -32828,8 +36002,8 @@ Date:	Wed Feb 27 12:15:44 2008 +0100
 
     refresh the current page when the data of the content model change
 
- qt4/demos/optcontent.cpp |    8 ++++++++
- qt4/demos/optcontent.h   |    3 +++
+ qt4/demos/optcontent.cpp | 8 ++++++++
+ qt4/demos/optcontent.h   | 3 +++
  2 files changed, 11 insertions(+)
 
 commit 09b7cc2efb7d21fa4dabd23d2d2de877cc7d86ee
@@ -32838,8 +36012,8 @@ Date:	Wed Feb 27 12:15:18 2008 +0100
 
     optional method to reload the current page
 
- qt4/demos/documentobserver.cpp |    5 +++++
- qt4/demos/documentobserver.h	|    1 +
+ qt4/demos/documentobserver.cpp | 5 +++++
+ qt4/demos/documentobserver.h	| 1 +
  2 files changed, 6 insertions(+)
 
 commit 39fe905be8f2ae79d9c26cd87547f3ea2608411e
@@ -32848,12 +36022,12 @@ Date:	Wed Feb 27 12:00:29 2008 +0100
 
     Add a dock for showing the optional content tree.
 
- qt4/demos/CMakeLists.txt |    1 +
- qt4/demos/Makefile.am	  |    3 +++
- qt4/demos/optcontent.cpp |   55
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/optcontent.h   |   43 ++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp	  |    7 ++++++
+ qt4/demos/CMakeLists.txt |  1 +
+ qt4/demos/Makefile.am	  |  3 +++
+ qt4/demos/optcontent.cpp | 55
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/optcontent.h   | 43 +++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	  |  7 ++++++
  5 files changed, 109 insertions(+)
 
 commit f17dd5539501a996479b903ac9b8aceb3c4cfafe
@@ -32862,8 +36036,8 @@ Date:	Wed Feb 27 11:53:32 2008 +0100
 
     cleanup
 
- qt4/src/poppler-optcontent-private.h |    3 ++-
- qt4/src/poppler-optcontent.h	      |    4 +---
+ qt4/src/poppler-optcontent-private.h | 3 ++-
+ qt4/src/poppler-optcontent.h	      | 4 +---
  2 files changed, 3 insertions(+), 4 deletions(-)
 
 commit f3cc894559f10dbd4277fa9f30de9931ed69dfd4
@@ -32874,11 +36048,11 @@ Date:	Wed Feb 27 11:43:34 2008 +0100
 
     Hide them in the implementation.
 
- qt4/src/poppler-optcontent-private.h |   43
- ++++++++++++++++++++++++++++++++++
- qt4/src/poppler-optcontent.cc	      |    8 +++----
- qt4/src/poppler-optcontent.h	      |   42
- ---------------------------------
+ qt4/src/poppler-optcontent-private.h | 43
+ ++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-optcontent.cc	      |  8 +++----
+ qt4/src/poppler-optcontent.h	      | 42
+ -----------------------------------
  3 files changed, 47 insertions(+), 46 deletions(-)
 
 commit 48e8b2105cf8f177ca655b969470e45e2407db82
@@ -32887,9 +36061,9 @@ Date:	Wed Feb 27 11:28:16 2008 +0100
 
     move all the private stuff of OptContentModel into its d-pointer
 
- qt4/src/poppler-optcontent-private.h |    9 +++++++--
- qt4/src/poppler-optcontent.cc	      |   29 +++++++++++++++--------------
- qt4/src/poppler-optcontent.h	      |    4 ----
+ qt4/src/poppler-optcontent-private.h |  9 +++++++--
+ qt4/src/poppler-optcontent.cc	      | 29 +++++++++++++++--------------
+ qt4/src/poppler-optcontent.h	      |  4 ----
  3 files changed, 22 insertions(+), 20 deletions(-)
 
 commit b78a7f7a0e8d5a9c22014d34754090d863030e0d
@@ -32899,8 +36073,8 @@ Date:	Wed Feb 27 11:06:57 2008 +0100
     use a QPointer for the OptContentModel, so we are safe about
     ownership.
 
- qt4/src/poppler-document.cc |	  4 ++--
- qt4/src/poppler-private.h   |	  6 +++---
+ qt4/src/poppler-document.cc | 4 ++--
+ qt4/src/poppler-private.h   | 6 +++---
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 commit 48557da71adb0fe6bd4da2fb32433796a96c3576
@@ -32909,7 +36083,7 @@ Date:	Wed Feb 27 19:39:18 2008 +1100
 
     We need to install the optional content header.
 
- qt4/src/CMakeLists.txt |    1 +
+ qt4/src/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 6e2bb03b5ef256c03a8da1cbf9bbc87c593942ad
@@ -32918,10 +36092,10 @@ Date:	Wed Feb 27 19:23:49 2008 +1100
 
     Partial d-pointer implementation.
 
- qt4/src/poppler-optcontent-private.h |   57
- ++++++++++++++++++++++++++++++++++
- qt4/src/poppler-optcontent.cc	      |   49 +++++++++++++++++------------
- qt4/src/poppler-optcontent.h	      |   24 +++-----------
+ qt4/src/poppler-optcontent-private.h | 57
+ ++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-optcontent.cc	      | 49 +++++++++++++++++++------------
+ qt4/src/poppler-optcontent.h	      | 24 ++++-----------
  3 files changed, 92 insertions(+), 38 deletions(-)
 
 commit c627b7aa10ae9cdceb78b751a7e826170f402af0
@@ -32930,8 +36104,8 @@ Date:	Wed Feb 27 16:12:38 2008 +1100
 
     A couple of cleanups suggested by Pino.
 
- qt4/src/poppler-document.cc |	  6 +++---
- qt4/src/poppler-qt4.h	     |	  8 +++++---
+ qt4/src/poppler-document.cc | 6 +++---
+ qt4/src/poppler-qt4.h	     | 8 +++++---
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 commit 81891667e18fcf164af02f5f366de07f78d67c8f
@@ -32949,30 +36123,30 @@ Date:	Wed Feb 27 15:47:03 2008 +1100
     quite invasive in Gfx, and I'm not confident enough
     to do it this late in the process.
 
- CMakeLists.txt			|    1 +
- poppler/Catalog.cc		|    9 +
- poppler/Catalog.h		|    4 +
- poppler/Gfx.cc			|   65 +++++-
- poppler/Gfx.h			|   12 +-
- poppler/Makefile.am		|    2 +
- poppler/OptionalContent.cc	|  322 ++++++++++++++++++++++++++
- poppler/OptionalContent.h	|   85 +++++++
- poppler/PDFDoc.h		|    5 +
- poppler/PSOutputDev.cc		|    6 +-
- poppler/Page.cc		|    2 +-
- qt4/src/.gitignore		|    1 +
- qt4/src/CMakeLists.txt		|    3 +
- qt4/src/Makefile.am		|    6 +
- qt4/src/poppler-document.cc	|   13 ++
- qt4/src/poppler-optcontent.cc	|  354 ++++++++++++++++++++++++++++
- qt4/src/poppler-optcontent.h	|  122 ++++++++++
- qt4/src/poppler-private.h	|    4 +
- qt4/src/poppler-qt4.h		|   18 ++
- qt4/tests/.gitignore		|    1 +
- qt4/tests/CMakeLists.txt	|    1 +
- qt4/tests/Makefile.am		|    5 +
- qt4/tests/check_optcontent.cpp |  499
- ++++++++++++++++++++++++++++++++++++++++
+ CMakeLists.txt			|   1 +
+ poppler/Catalog.cc		|   9 +
+ poppler/Catalog.h		|   4 +
+ poppler/Gfx.cc			|  65 +++++-
+ poppler/Gfx.h			|  12 +-
+ poppler/Makefile.am		|   2 +
+ poppler/OptionalContent.cc	| 322 ++++++++++++++++++++++++++
+ poppler/OptionalContent.h	|  85 +++++++
+ poppler/PDFDoc.h		|   5 +
+ poppler/PSOutputDev.cc		|   6 +-
+ poppler/Page.cc		|   2 +-
+ qt4/src/.gitignore		|   1 +
+ qt4/src/CMakeLists.txt		|   3 +
+ qt4/src/Makefile.am		|   6 +
+ qt4/src/poppler-document.cc	|  13 ++
+ qt4/src/poppler-optcontent.cc	| 354 +++++++++++++++++++++++++++++
+ qt4/src/poppler-optcontent.h	| 122 ++++++++++
+ qt4/src/poppler-private.h	|   4 +
+ qt4/src/poppler-qt4.h		|  18 ++
+ qt4/tests/.gitignore		|   1 +
+ qt4/tests/CMakeLists.txt	|   1 +
+ qt4/tests/Makefile.am		|   5 +
+ qt4/tests/check_optcontent.cpp | 499
+ +++++++++++++++++++++++++++++++++++++++++
  23 files changed, 1532 insertions(+), 8 deletions(-)
 
 commit 11b70bcda905e618c199a067db6b0246612e101d
@@ -32982,7 +36156,7 @@ Date:	Tue Feb 26 23:01:27 2008 +0100
     fixup the default export macro name (added by cmake); _WIN32 is
     defined only on win32 (remove a plethora of warnings)
 
- qt4/src/poppler-export.h |    4 ++--
+ qt4/src/poppler-export.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit d4d6c14cd83d04c61daa6618c3148a0bb47dc292
@@ -32991,8 +36165,8 @@ Date:	Tue Feb 26 22:57:02 2008 +0100
 
     install the export header
 
- qt4/src/CMakeLists.txt |    1 +
- qt4/src/Makefile.am	|    1 +
+ qt4/src/CMakeLists.txt | 1 +
+ qt4/src/Makefile.am	| 1 +
  2 files changed, 2 insertions(+)
 
 commit 4ba2e2d21710135656adbf93c5994cfb46502308
@@ -33001,13 +36175,13 @@ Date:	Tue Feb 26 22:55:30 2008 +0100
 
     no need to include the export header in private headers
 
- qt4/src/poppler-annotation-helper.h	      |    1 -
- qt4/src/poppler-annotation-private.h	      |    1 -
- qt4/src/poppler-converter-private.h	      |    1 -
- qt4/src/poppler-link-extractor-private.h     |    1 -
- qt4/src/poppler-page-private.h		      |    1 -
- qt4/src/poppler-private.h		      |    1 -
- qt4/src/poppler-qiodeviceoutstream-private.h |    1 -
+ qt4/src/poppler-annotation-helper.h	      | 1 -
+ qt4/src/poppler-annotation-private.h	      | 1 -
+ qt4/src/poppler-converter-private.h	      | 1 -
+ qt4/src/poppler-link-extractor-private.h     | 1 -
+ qt4/src/poppler-page-private.h		      | 1 -
+ qt4/src/poppler-private.h		      | 1 -
+ qt4/src/poppler-qiodeviceoutstream-private.h | 1 -
  7 files changed, 7 deletions(-)
 
 commit 0a466c09fb70b92f39df19bc315b6575e419ad5b
@@ -33016,7 +36190,7 @@ Date:	Tue Feb 26 22:47:31 2008 +0100
 
     We also need to distribute poppler-export.h
 
- qt4/src/Makefile.am |	  1 +
+ qt4/src/Makefile.am | 1 +
  1 file changed, 1 insertion(+)
 
 commit 2034d57c700049bc9a6565bbb818e1c9f4467784
@@ -33027,21 +36201,21 @@ Date:	Tue Feb 26 22:46:29 2008 +0100
     also add Export markers to qt4 classes, although symbol visibility
     is only used on MSVC at the moment
 
- CMakeLists.txt				      |    5 +++++
- qt4/src/CMakeLists.txt			      |    3 +++
- qt4/src/poppler-annotation-helper.h	      |    1 +
- qt4/src/poppler-annotation-private.h	      |    1 +
- qt4/src/poppler-annotation.h		      |   19 ++++++++++---------
- qt4/src/poppler-converter-private.h	      |    1 +
- qt4/src/poppler-export.h		      |    6 +++---
- qt4/src/poppler-form.h			      |    9 +++++----
- qt4/src/poppler-link-extractor-private.h     |    1 +
- qt4/src/poppler-link.h			      |   17 +++++++++--------
- qt4/src/poppler-page-private.h		      |    1 +
- qt4/src/poppler-private.h		      |    1 +
- qt4/src/poppler-qiodeviceoutstream-private.h |    1 +
- qt4/src/poppler-qt4.h			      |   21 +++++++++++----------
- qt4/tests/CMakeLists.txt		      |    6 ++++++
+ CMakeLists.txt				      |  5 +++++
+ qt4/src/CMakeLists.txt			      |  3 +++
+ qt4/src/poppler-annotation-helper.h	      |  1 +
+ qt4/src/poppler-annotation-private.h	      |  1 +
+ qt4/src/poppler-annotation.h		      | 19 ++++++++++---------
+ qt4/src/poppler-converter-private.h	      |  1 +
+ qt4/src/poppler-export.h		      |  6 +++---
+ qt4/src/poppler-form.h			      |  9 +++++----
+ qt4/src/poppler-link-extractor-private.h     |  1 +
+ qt4/src/poppler-link.h			      | 17 +++++++++--------
+ qt4/src/poppler-page-private.h		      |  1 +
+ qt4/src/poppler-private.h		      |  1 +
+ qt4/src/poppler-qiodeviceoutstream-private.h |  1 +
+ qt4/src/poppler-qt4.h			      | 21 +++++++++++----------
+ qt4/tests/CMakeLists.txt		      |  6 ++++++
  15 files changed, 59 insertions(+), 34 deletions(-)
 
 commit b931920f63f4276ec355118faa061bafa5ac5244
@@ -33052,7 +36226,7 @@ Date:	Tue Feb 26 22:42:16 2008 +0100
     markers to qt4 classes, although symbol visibility is only used on
     MSVC at the moment
 
- qt4/src/poppler-export.h |   17 +++++++++++++++++
+ qt4/src/poppler-export.h | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 commit 1778fddb36d6cb2c7f7848bee06189158f69f16e
@@ -33062,7 +36236,7 @@ Date:	Sun Feb 24 23:02:08 2008 +0100
     Add the cmake files to EXTRA_DIST so they get added when i do make
     dist to get the release tarball
 
- Makefile.am |	 39 +++++++++++++++++++++++++++++++++++++++
+ Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)
 
 commit 51f171e10a42d492c8c32a5e2578d05b73d89238
@@ -33071,7 +36245,7 @@ Date:	Sun Feb 24 22:47:46 2008 +0100
 
     ignore more
 
- qt4/demos/.gitignore |    2 ++
+ qt4/demos/.gitignore | 2 ++
  1 file changed, 2 insertions(+)
 
 commit adb1ccdb9265f0583cb348c456a39efac610aff1
@@ -33080,7 +36254,7 @@ Date:	Sun Feb 24 22:46:33 2008 +0100
 
     ignore
 
- qt4/demos/.gitignore |    2 ++
+ qt4/demos/.gitignore | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 101e526c63175ffc1a75e1b68da7bb4fff9cd530
@@ -33089,7 +36263,7 @@ Date:	Sun Feb 24 20:52:41 2008 +0100
 
     define snprintf to _snprintf if we are building on MSVC
 
- config.h.cmake |    4 ++++
+ config.h.cmake | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit f7f8ab488257c3979d20e5c0690ec5d7c2cd831b
@@ -33098,7 +36272,7 @@ Date:	Sun Feb 24 20:43:11 2008 +0100
 
     define M_PI in case it is not defined
 
- poppler/Function.cc |	  4 ++++
+ poppler/Function.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit f00436b63bf9a42dcb2728a07db9c20f1f23d0bc
@@ -33107,8 +36281,8 @@ Date:	Sun Feb 24 20:39:42 2008 +0100
 
     Add proper dirent.h guards
 
- utils/pdftoabw.cc  |	 2 ++
- utils/pdftohtml.cc |	 2 ++
+ utils/pdftoabw.cc  | 2 ++
+ utils/pdftohtml.cc | 2 ++
  2 files changed, 4 insertions(+)
 
 commit e1463451c584181f918265438cf6ddcb408bf731
@@ -33118,7 +36292,7 @@ Date:	Thu Feb 21 20:43:56 2008 +0100
     Code uses if USE_EXCEPTIONS, so we need to defined it to 1, not just
     define it
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 88d4bbbcf828e3247454c8ba3c2fb0fb58207b6a
@@ -33127,7 +36301,7 @@ Date:	Thu Feb 21 19:53:03 2008 +0100
 
     If a bitmap's dimensions are invalid, do not try to display it.
 
- poppler/Gfx.cc |    3 +++
+ poppler/Gfx.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 452ae6f5674b00b43955952961f7ca0583f73e27
@@ -33136,8 +36310,8 @@ Date:	Thu Feb 21 19:46:19 2008 +0100
 
     Make sure we don't draw outside the bitmap on Splash::fillGlyph2
 
- splash/Splash.cc |   76
- +++++++++++++++++++++++++++++++++++-------------------
+ splash/Splash.cc | 76
+ ++++++++++++++++++++++++++++++++++++--------------------
  1 file changed, 49 insertions(+), 27 deletions(-)
 
 commit 7f60fa806bd6d3d28917f349a2a19b52f97f593a
@@ -33148,7 +36322,7 @@ Date:	Thu Feb 21 13:00:05 2008 -0500
 
     Signed-off-by: James Cloos <cloos@jhcloos.com>
 
- qt4/demos/Makefile.am |    2 +-
+ qt4/demos/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 053ecae534a4522d152b0139b6aed6da2059d760
@@ -33161,7 +36335,7 @@ Date:	Wed Feb 20 17:21:27 2008 -0800
     time as 'cairo'. In some cases this led to a sequence of ever
     larger matrix scale factors until things just blew up.
 
- poppler/CairoOutputDev.cc |	6 ++++++
+ poppler/CairoOutputDev.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit bf6dd890994150406b4464e45355a4a99870fc60
@@ -33170,12 +36344,12 @@ Date:	Thu Feb 21 01:23:07 2008 +0100
 
     Add a dock for showing the document metadata.
 
- qt4/demos/CMakeLists.txt |    1 +
- qt4/demos/Makefile.am	  |    3 +++
- qt4/demos/metadata.cpp   |   50
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/metadata.h	  |   43 +++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp	  |    7 +++++++
+ qt4/demos/CMakeLists.txt |  1 +
+ qt4/demos/Makefile.am	  |  3 +++
+ qt4/demos/metadata.cpp   | 50
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/metadata.h	  | 43 +++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	  |  7 +++++++
  5 files changed, 104 insertions(+)
 
 commit b6f0c8f83924c08be20b602b128651bf018172a3
@@ -33184,7 +36358,7 @@ Date:	Thu Feb 21 00:54:26 2008 +0100
 
     Do not assign conflicting accelerators.
 
- qt4/demos/viewer.cpp |    2 +-
+ qt4/demos/viewer.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e0c27a968c7e7a0f6a89a050ddbfe328229f431d
@@ -33193,7 +36367,7 @@ Date:	Thu Feb 21 00:53:24 2008 +0100
 
     Apply the antialias settings w/o notify the observers.
 
- qt4/demos/viewer.cpp |    4 ++--
+ qt4/demos/viewer.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 2c6149abcecda15c6f73a1dee537072240ddd545
@@ -33202,8 +36376,8 @@ Date:	Thu Feb 21 00:51:21 2008 +0100
 
     Add a settings menu to choose the render backend.
 
- qt4/demos/viewer.cpp |   28 ++++++++++++++++++++++++++++
- qt4/demos/viewer.h   |    3 +++
+ qt4/demos/viewer.cpp | 28 ++++++++++++++++++++++++++++
+ qt4/demos/viewer.h   |  3 +++
  2 files changed, 31 insertions(+)
 
 commit db2b0778dca364751a1d22294be29f8c7799e2e9
@@ -33214,12 +36388,12 @@ Date:	Thu Feb 21 00:33:23 2008 +0100
 
     TODO: show the checksum in a pretty format.
 
- qt4/demos/CMakeLists.txt    |	  1 +
- qt4/demos/Makefile.am	     |	  3 ++
- qt4/demos/embeddedfiles.cpp |	 75
- +++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/embeddedfiles.h   |	 43 +++++++++++++++++++++++++
- qt4/demos/viewer.cpp	     |	  7 ++++
+ qt4/demos/CMakeLists.txt    |	1 +
+ qt4/demos/Makefile.am	     |	3 ++
+ qt4/demos/embeddedfiles.cpp | 75
+ +++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/embeddedfiles.h   | 43 ++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	     |	7 +++++
  5 files changed, 129 insertions(+)
 
 commit 51fba47ccb12a66282769fc504bac4c9f5123f75
@@ -33228,7 +36402,7 @@ Date:	Sun Feb 17 01:49:59 2008 +0100
 
     clear the page label when the document is closed
 
- qt4/demos/pageview.cpp |    2 ++
+ qt4/demos/pageview.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 commit e964e2b9fbbe9b52b137ecd06729a06530835227
@@ -33250,7 +36424,7 @@ Date:	Tue Feb 19 23:22:55 2008 +0100
     annotation dictionary, so that different checkboxes can be drawn
     differently.
 
- poppler/Annot.cc |    6 ++----
+ poppler/Annot.cc | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 commit 702fdd6c56b5369554c683d8c8e0e2c66e80886c
@@ -33259,8 +36433,8 @@ Date:	Tue Feb 19 00:18:04 2008 +0100
 
     changes from gtk-doc
 
- glib/reference/tmpl/poppler-document.sgml |	1 +
- glib/reference/tmpl/poppler-page.sgml	   |	2 +-
+ glib/reference/tmpl/poppler-document.sgml | 1 +
+ glib/reference/tmpl/poppler-page.sgml	   | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 9e13b91ba38c20989d283588e73490a1601f5bb0
@@ -33269,7 +36443,7 @@ Date:	Tue Feb 19 00:10:24 2008 +0100
 
     distribute the headers too
 
- qt4/demos/Makefile.am |   11 ++++++++++-
+ qt4/demos/Makefile.am | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit 194e0ced7c38514ec3126666531862e3b29b4b77
@@ -33278,12 +36452,12 @@ Date:	Mon Feb 18 23:34:06 2008 +0100
 
     Fill NEWS and increase version number to 0.7
 
- CMakeLists.txt   |    2 +-
- NEWS		  |   96
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac	  |    2 +-
- msvc/config.h	  |    6 ++--
- qt4/src/Doxyfile |    2 +-
+ CMakeLists.txt   |  2 +-
+ NEWS		  | 96
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	  |  2 +-
+ msvc/config.h	  |  6 ++--
+ qt4/src/Doxyfile |  2 +-
  5 files changed, 102 insertions(+), 6 deletions(-)
 
 commit 3c407efe9f1f0cc3f6366d3a2b6e9b687656cc95
@@ -33300,7 +36474,7 @@ Date:	Mon Feb 18 21:29:41 2008 +0100
 
     make the poppler_qt4viewer compile with the auto"tools"
 
- qt4/demos/Makefile.am |   16 ++++++++++++----
+ qt4/demos/Makefile.am | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 commit 7f4acb879d300e18dfaff768027c88195d7d8f1b
@@ -33311,8 +36485,8 @@ Date:	Mon Feb 18 20:56:35 2008 +0100
     ImageOutputDev::drawSoftMaskedImage so all images are exported when
     using pdfimages
 
- utils/ImageOutputDev.cc |   19 +++++++++++++++++++
- utils/ImageOutputDev.h  |   11 +++++++++++
+ utils/ImageOutputDev.cc | 19 +++++++++++++++++++
+ utils/ImageOutputDev.h  | 11 +++++++++++
  2 files changed, 30 insertions(+)
 
 commit 064b316648e35416bb49336639da1d8d288d1ecf
@@ -33323,7 +36497,7 @@ Date:	Mon Feb 18 20:17:37 2008 +0100
 
     Fixes bug 14549
 
- poppler/Lexer.cc |    2 +-
+ poppler/Lexer.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit b287b611b1c7b7dd00e12518cee3a6c35044e161
@@ -33332,8 +36506,8 @@ Date:	Sun Feb 17 01:21:07 2008 +0100
 
     Really niptick: help menu with about dialog for us and Qt.
 
- qt4/demos/viewer.cpp |   15 +++++++++++++++
- qt4/demos/viewer.h   |    2 ++
+ qt4/demos/viewer.cpp | 15 +++++++++++++++
+ qt4/demos/viewer.h   |  2 ++
  2 files changed, 17 insertions(+)
 
 commit 6400254fdabf3d0d32f27ebd00faa6958be62019
@@ -33342,7 +36516,7 @@ Date:	Sun Feb 17 01:12:27 2008 +0100
 
     Add a title to the viewer :)
 
- qt4/demos/viewer.cpp |    2 ++
+ qt4/demos/viewer.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 commit b363c0568c9c61e7ee8ed86d808f0eed0b93b525
@@ -33351,8 +36525,8 @@ Date:	Sun Feb 17 01:09:57 2008 +0100
 
     Add the possibility to save a copy of the file.
 
- qt4/demos/viewer.cpp |   29 +++++++++++++++++++++++++++++
- qt4/demos/viewer.h   |    2 ++
+ qt4/demos/viewer.cpp | 29 +++++++++++++++++++++++++++++
+ qt4/demos/viewer.h   |  2 ++
  2 files changed, 31 insertions(+)
 
 commit 42987dcdd8d7432145f78cfc550f0c099e6e7311
@@ -33361,12 +36535,12 @@ Date:	Sun Feb 17 00:33:01 2008 +0100
 
     Add a Permissions dock.
 
- qt4/demos/CMakeLists.txt  |	1 +
- qt4/demos/Makefile.am	   |	1 +
- qt4/demos/permissions.cpp |   77
- +++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/permissions.h   |   43 +++++++++++++++++++++++++
- qt4/demos/viewer.cpp	   |	7 +++++
+ qt4/demos/CMakeLists.txt  |  1 +
+ qt4/demos/Makefile.am	   |  1 +
+ qt4/demos/permissions.cpp | 77
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/permissions.h   | 43 ++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	   |  7 +++++
  5 files changed, 129 insertions(+)
 
 commit 9d1dda64de1d9e3f6fc81e40a0c2246a6270dfa8
@@ -33375,8 +36549,8 @@ Date:	Sat Feb 16 23:56:17 2008 +0100
 
     Add settings for antialias.
 
- qt4/demos/viewer.cpp |   41 +++++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.h   |    4 ++++
+ qt4/demos/viewer.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.h   |  4 ++++
  2 files changed, 45 insertions(+)
 
 commit 3abb8703d7d8b7a5fbcbb3c19d8e84d640abe88c
@@ -33385,12 +36559,12 @@ Date:	Sat Feb 16 22:25:11 2008 +0100
 
     Add a TOC info dock.
 
- qt4/demos/CMakeLists.txt |    1 +
- qt4/demos/Makefile.am	  |    1 +
- qt4/demos/toc.cpp	  |   90
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/toc.h	  |   43 ++++++++++++++++++++++
- qt4/demos/viewer.cpp	  |    7 ++++
+ qt4/demos/CMakeLists.txt |  1 +
+ qt4/demos/Makefile.am	  |  1 +
+ qt4/demos/toc.cpp	  | 90
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/toc.h	  | 43 +++++++++++++++++++++++
+ qt4/demos/viewer.cpp	  |  7 ++++
  5 files changed, 142 insertions(+)
 
 commit 80925f06d125ebfc9909e36bdbe5d37fd0e48bdc
@@ -33399,10 +36573,10 @@ Date:	Sat Feb 16 21:51:10 2008 +0100
 
     Adapt the Fonts and Info docks to the new abstract info dock.
 
- qt4/demos/fonts.cpp |	 10 +++-------
- qt4/demos/fonts.h   |	 11 +++++------
- qt4/demos/info.cpp  |	 10 +++-------
- qt4/demos/info.h    |	 11 +++++------
+ qt4/demos/fonts.cpp | 10 +++-------
+ qt4/demos/fonts.h   | 11 +++++------
+ qt4/demos/info.cpp  | 10 +++-------
+ qt4/demos/info.h    | 11 +++++------
  4 files changed, 16 insertions(+), 26 deletions(-)
 
 commit c03531d691e56aba2b4c6538cf9e2463e1e0aa29
@@ -33411,11 +36585,11 @@ Date:	Sat Feb 16 21:43:19 2008 +0100
 
     Introduce a base info dock for handling the "dirty" work.
 
- qt4/demos/CMakeLists.txt	|    1 +
- qt4/demos/Makefile.am		|    1 +
- qt4/demos/abstractinfodock.cpp |   57
- ++++++++++++++++++++++++++++++++++++++++
- qt4/demos/abstractinfodock.h	|   48 +++++++++++++++++++++++++++++++++
+ qt4/demos/CMakeLists.txt	|  1 +
+ qt4/demos/Makefile.am		|  1 +
+ qt4/demos/abstractinfodock.cpp | 57
+ ++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/abstractinfodock.h	| 48 +++++++++++++++++++++++++++++++++++
  4 files changed, 107 insertions(+)
 
 commit 0f7d51c7fc2439ee9392c166576c341238f00f36
@@ -33424,7 +36598,7 @@ Date:	Sat Feb 16 18:49:52 2008 +0100
 
     Delete the poppler page after usage.
 
- qt4/demos/pageview.cpp |    1 +
+ qt4/demos/pageview.cpp | 1 +
  1 file changed, 1 insertion(+)
 
 commit b41d069cdd1435ddb14b3de2986875069523c814
@@ -33433,7 +36607,7 @@ Date:	Sat Feb 16 18:48:57 2008 +0100
 
     Initialize the current page number correctly.
 
- qt4/demos/viewer.cpp |    2 +-
+ qt4/demos/viewer.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 75e516af0e72a2e3041660300e522ad00869372b
@@ -33442,12 +36616,12 @@ Date:	Sat Feb 16 18:43:56 2008 +0100
 
     Add a side dock for showing the fonts of the document.
 
- qt4/demos/CMakeLists.txt |    1 +
- qt4/demos/Makefile.am	  |    1 +
- qt4/demos/fonts.cpp	  |   78
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/fonts.h	  |   44 ++++++++++++++++++++++++++
- qt4/demos/viewer.cpp	  |    7 +++++
+ qt4/demos/CMakeLists.txt |  1 +
+ qt4/demos/Makefile.am	  |  1 +
+ qt4/demos/fonts.cpp	  | 78
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/fonts.h	  | 44 +++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	  |  7 +++++
  5 files changed, 131 insertions(+)
 
 commit 8e642d1cbd48d4790a6769287cbfd90c3bc9fc34
@@ -33458,7 +36632,7 @@ Date:	Sat Feb 16 17:21:30 2008 +0100
 
     As start, put the Info dock there.
 
- qt4/demos/viewer.cpp |    4 ++++
+ qt4/demos/viewer.cpp | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit c1feb7c2b5008cc04edb3c028f888072920ce4dc
@@ -33467,12 +36641,12 @@ Date:	Sat Feb 16 17:14:00 2008 +0100
 
     Add a side dock for showing the info keys.
 
- qt4/demos/CMakeLists.txt |    1 +
- qt4/demos/Makefile.am	  |    1 +
- qt4/demos/info.cpp	  |   78
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/info.h	  |   44 ++++++++++++++++++++++++++
- qt4/demos/viewer.cpp	  |    5 +++
+ qt4/demos/CMakeLists.txt |  1 +
+ qt4/demos/Makefile.am	  |  1 +
+ qt4/demos/info.cpp	  | 78
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/info.h	  | 44 +++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	  |  5 ++++
  5 files changed, 129 insertions(+)
 
 commit abc9b00c6470f9f6b66c280455f544ad0ee3aa8c
@@ -33487,18 +36661,18 @@ Date:	Sat Feb 16 16:09:52 2008 +0100
     Both the navigation toolbar and the page view are implemented as
     observers.
 
- qt4/demos/CMakeLists.txt	 |    3 ++
- qt4/demos/Makefile.am		 |    3 ++
- qt4/demos/documentobserver.cpp  |   45 ++++++++++++++++++
- qt4/demos/documentobserver.h	 |   49 ++++++++++++++++++++
- qt4/demos/navigationtoolbar.cpp |   98
- +++++++++++++++++++++++++++++++++++++++
- qt4/demos/navigationtoolbar.h	 |   56 ++++++++++++++++++++++
- qt4/demos/pageview.cpp		 |   60 ++++++++++++++++++++++++
- qt4/demos/pageview.h		 |   44 ++++++++++++++++++
- qt4/demos/viewer.cpp		 |   98
- +++++++++++++++++++++++++++++++++++++--
- qt4/demos/viewer.h		 |   17 +++++++
+ qt4/demos/CMakeLists.txt	 |  3 ++
+ qt4/demos/Makefile.am		 |  3 ++
+ qt4/demos/documentobserver.cpp  | 45 +++++++++++++++++++
+ qt4/demos/documentobserver.h	 | 49 +++++++++++++++++++++
+ qt4/demos/navigationtoolbar.cpp | 98
+ +++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/navigationtoolbar.h	 | 56 +++++++++++++++++++++++
+ qt4/demos/pageview.cpp		 | 60 +++++++++++++++++++++++++
+ qt4/demos/pageview.h		 | 44 ++++++++++++++++++
+ qt4/demos/viewer.cpp		 | 98
+ +++++++++++++++++++++++++++++++++++++++--
+ qt4/demos/viewer.h		 | 17 +++++++
  10 files changed, 470 insertions(+), 3 deletions(-)
 
 commit 14c88853a5675f40efb72f3ef01f49eb06ab846c
@@ -33507,8 +36681,8 @@ Date:	Sat Feb 16 00:32:30 2008 +0100
 
     Compile the poppler_qt4viewer.
 
- qt4/demos/CMakeLists.txt |    7 +++++++
- qt4/demos/Makefile.am	  |   12 ++++++++++--
+ qt4/demos/CMakeLists.txt |  7 +++++++
+ qt4/demos/Makefile.am	  | 12 ++++++++++--
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 commit aeb591f015d5e7a2643ed75d872358d2b1256b99
@@ -33519,11 +36693,11 @@ Date:	Sat Feb 16 00:31:46 2008 +0100
 
     So minimal that it does nothing at the moment...
 
- qt4/demos/main_viewer.cpp |   29 ++++++++++++++++++++++++++++
- qt4/demos/viewer.cpp	   |   46
+ qt4/demos/main_viewer.cpp | 29 +++++++++++++++++++++++++++++
+ qt4/demos/viewer.cpp	   | 46
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/demos/viewer.h	   | 45
  +++++++++++++++++++++++++++++++++++++++++++++
- qt4/demos/viewer.h	   |   45
- ++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 120 insertions(+)
 
 commit 8da490b090487c4c37290b63bdc9abcfaf6d6940
@@ -33532,11 +36706,11 @@ Date:	Fri Feb 15 23:59:39 2008 +0100
 
     Add a skeleton of directory where PopplerQt4 demos will be.
 
- configure.ac		  |    1 +
- qt4/CMakeLists.txt	  |    1 +
- qt4/Makefile.am	  |    2 +-
- qt4/demos/CMakeLists.txt |   10 ++++++++++
- qt4/demos/Makefile.am	  |   20 ++++++++++++++++++++
+ configure.ac		  |  1 +
+ qt4/CMakeLists.txt	  |  1 +
+ qt4/Makefile.am	  |  2 +-
+ qt4/demos/CMakeLists.txt | 10 ++++++++++
+ qt4/demos/Makefile.am	  | 20 ++++++++++++++++++++
  5 files changed, 33 insertions(+), 1 deletion(-)
 
 commit e24b49d52a5c1716641695ee731dd49848a114d9
@@ -33545,7 +36719,7 @@ Date:	Thu Feb 14 22:21:54 2008 +0100
 
     do not print it as string
 
- qt4/src/poppler-private.cc |	 2 +-
+ qt4/src/poppler-private.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2316455864e9c900c08d051c59b9508eddcb7c34
@@ -33554,8 +36728,8 @@ Date:	Thu Feb 14 21:02:20 2008 +0100
 
     Pipe the poppler error messages through the Qt debug system.
 
- qt4/src/poppler-private.cc |	21 +++++++++++++++++++++
- qt4/src/poppler-private.h  |	 8 +++++++-
+ qt4/src/poppler-private.cc | 21 +++++++++++++++++++++
+ qt4/src/poppler-private.h  |  8 +++++++-
  2 files changed, 28 insertions(+), 1 deletion(-)
 
 commit d985d3b0cdc57370137865add2a5f3a7802109c7
@@ -33564,7 +36738,7 @@ Date:	Thu Feb 14 14:56:18 2008 +0100
 
     Use what FormWidgetText give us.
 
- qt4/src/poppler-form.cc |   13 +++----------
+ qt4/src/poppler-form.cc | 13 +++----------
  1 file changed, 3 insertions(+), 10 deletions(-)
 
 commit a69bd442e52f4495f8d6bfd3bb58b3ebd1be1a63
@@ -33587,7 +36761,7 @@ Date:	Thu Feb 14 12:52:22 2008 +0100
     null-terminated
     UTF-8).
 
- poppler/PDFDocEncoding.cc |   23 +++++++++++++++++------
+ poppler/PDFDocEncoding.cc | 23 +++++++++++++++++------
  1 file changed, 17 insertions(+), 6 deletions(-)
 
 commit ce17383e0ed21770b471e88f25046a64a23e7e45
@@ -33599,7 +36773,7 @@ Date:	Wed Feb 13 20:56:39 2008 +0100
 
     Fixes http://bugs.kde.org/show_bug.cgi?id=157777
 
- splash/SplashFont.cc |   48
+ splash/SplashFont.cc | 48
  ++++++++++++++++++++++++++++--------------------
  1 file changed, 28 insertions(+), 20 deletions(-)
 
@@ -33609,7 +36783,7 @@ Date:	Wed Feb 13 20:55:18 2008 +0100
 
     add images.c
 
- glib/demo/CMakeLists.txt |    1 +
+ glib/demo/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 9cfe10ab7f51d329647e102e446baaef043d8cc6
@@ -33626,11 +36800,11 @@ Date:	Wed Feb 13 20:32:43 2008 +0100
 
     Add images demo
 
- glib/demo/Makefile.am |    2 +
- glib/demo/images.c    |  338
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/images.h    |   31 +++++
- glib/demo/main.c      |    4 +-
+ glib/demo/Makefile.am |   2 +
+ glib/demo/images.c    | 338
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/images.h    |  31 +++++
+ glib/demo/main.c      |   4 +-
  4 files changed, 374 insertions(+), 1 deletion(-)
 
 commit e9187292701e72db1020f7701d0725d83eee4b00
@@ -33639,7 +36813,7 @@ Date:	Wed Feb 13 19:41:57 2008 +0100
 
     Do the one-time initialisation in initTestCase().
 
- qt4/tests/check_dateConversion.cpp |	 8 ++++++--
+ qt4/tests/check_dateConversion.cpp | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit fb996c46e3c6b56a2c67819620000bcd804aacd6
@@ -33678,9 +36852,9 @@ Date:	Wed Feb 13 18:44:41 2008 +0100
     of comb
     fields; characters are now centered in the comb cells.
 
- poppler/Annot.cc |  507
- ++++++++++++++++++++++++++++++++++--------------------
- poppler/Annot.h  |    9 +-
+ poppler/Annot.cc | 507
+ +++++++++++++++++++++++++++++++++++--------------------
+ poppler/Annot.h  |   9 +-
  2 files changed, 327 insertions(+), 189 deletions(-)
 
 commit 88c780aed4c9855f879e3c7a9f82500a859635a2
@@ -33697,8 +36871,8 @@ Date:	Wed Feb 13 18:42:49 2008 +0100
       codepoints
 	above 255.
 
- poppler/CharCodeToUnicode.cc |    4 ++--
- poppler/Form.cc	      |    4 ++--
+ poppler/CharCodeToUnicode.cc | 4 ++--
+ poppler/Form.cc	      | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 commit 7574cb71f24ce5b32427f243c39b6029fb58ec81
@@ -33716,7 +36890,7 @@ Date:	Tue Feb 12 21:41:26 2008 +0100
     Do the right thing with CDECL, that is, undefine it if it is defined
     so we can redefine it later
 
- poppler-config.h.cmake |    2 +-
+ poppler-config.h.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e798802f00bff0a24ee6d1312d6c62624395865a
@@ -33725,7 +36899,7 @@ Date:	Tue Feb 12 20:57:56 2008 +0100
 
     Apidox fix: state which checksum is returned (if available).
 
- qt4/src/poppler-qt4.h |    2 +-
+ qt4/src/poppler-qt4.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4e2ba70a88c40fef6775053b1cc5fa30e622cea7
@@ -33734,7 +36908,7 @@ Date:	Tue Feb 12 11:25:34 2008 +0100
 
     Free the Object after you use it.
 
- poppler/Annot.cc |    1 +
+ poppler/Annot.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 039545fcd2c12631c7b8aea89c35f36cb387a17a
@@ -33743,7 +36917,7 @@ Date:	Tue Feb 12 11:13:27 2008 +0100
 
     Return the siblings even for checkboxes.
 
- qt4/src/poppler-form.cc |    2 +-
+ qt4/src/poppler-form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit fe5ee75cdf3e11e314318af12edf9d5bc8986250
@@ -33752,7 +36926,7 @@ Date:	Tue Feb 12 11:12:01 2008 +0100
 
     Initialize correctly; free your memory.
 
- poppler/Form.cc |    2 ++
+ poppler/Form.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit e0eff92c7067d43faa8e93baed1f061863111251
@@ -33768,8 +36942,8 @@ Date:	Mon Feb 11 20:32:41 2008 +0100
     In these cases the form field is not correctly updated and if the
     document is saved it will be wrong.
 
- poppler/Form.cc |   44 +++++++++++++++++++++++++++++++-------------
- poppler/Form.h  |    2 ++
+ poppler/Form.cc | 44 +++++++++++++++++++++++++++++++-------------
+ poppler/Form.h  |  2 ++
  2 files changed, 33 insertions(+), 13 deletions(-)
 
 commit 905e6da9795fee94329022c0cafbc229055fd4f6
@@ -33800,9 +36974,9 @@ Date:	Sun Feb 10 17:12:59 2008 +0100
        'acroForm' has been added instead with a getObj() method to get it.
      - createFieldFromDict() method is now static
 
- poppler/Form.cc |  128
- ++++++++++++++++++++++++++++---------------------------
- poppler/Form.h  |   41 +++++++++---------
+ poppler/Form.cc | 128
+ ++++++++++++++++++++++++++++----------------------------
+ poppler/Form.h  |  41 +++++++++---------
  2 files changed, 84 insertions(+), 85 deletions(-)
 
 commit 5f8e2f9140ee2ede841700726b974768ec863672
@@ -33811,7 +36985,7 @@ Date:	Mon Feb 11 20:16:44 2008 +0100
 
     Use QVarLengthArray instead of relying on gcc-ism.
 
- qt4/src/poppler-page.cc |    3 ++-
+ qt4/src/poppler-page.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 7499764d382366823519aa13a38e1e44781c78af
@@ -33822,8 +36996,8 @@ Date:	Mon Feb 11 11:57:50 2008 +0100
 
     This is needed for grouping together the radio buttons.
 
- qt4/src/poppler-form.cc |   14 ++++++++++++++
- qt4/src/poppler-form.h  |    8 ++++++++
+ qt4/src/poppler-form.cc | 14 ++++++++++++++
+ qt4/src/poppler-form.h  |  8 ++++++++
  2 files changed, 22 insertions(+)
 
 commit 85bfa4f499a90d45b13df4d0a8760a7da6fc1532
@@ -33832,7 +37006,7 @@ Date:	Mon Feb 11 02:40:37 2008 +0100
 
     Small apidox fix.
 
- qt4/src/poppler-form.h |   11 ++---------
+ qt4/src/poppler-form.h | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 commit ada05055c91e967dc3e2af32a2176dd12cb7fe70
@@ -33842,11 +37016,11 @@ Date:	Mon Feb 11 02:27:19 2008 +0100
     Preliminary support for "button" form fields (ie, push buttons,
     check boxes, and radio buttons).
 
- qt4/src/poppler-form.cc |   55
- +++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-form.h  |   54
- ++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc |    6 ++++++
+ qt4/src/poppler-form.cc | 55
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-form.h  | 54
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc |  6 ++++++
  3 files changed, 115 insertions(+)
 
 commit 278b33f25df418ef12798100002845a3e2ceebd3
@@ -33869,9 +37043,9 @@ Date:	Sun Feb 10 18:47:40 2008 -0500
     images. This way
     cairo gets the full resolution image for use in the printed output.
 
- glib/poppler-page.cc	   |	1 +
- poppler/CairoOutputDev.cc |	3 ++-
- poppler/CairoOutputDev.h  |	2 ++
+ glib/poppler-page.cc	   | 1 +
+ poppler/CairoOutputDev.cc | 3 ++-
+ poppler/CairoOutputDev.h  | 2 ++
  3 files changed, 5 insertions(+), 1 deletion(-)
 
 commit c730b33f1ec2032c4b8c2660738448d954eb0f7d
@@ -33880,8 +37054,8 @@ Date:	Mon Feb 11 00:46:20 2008 +0100
 
     Keep the EmbFile object, and use this for getting the data.
 
- qt4/src/poppler-embeddedfile.cc |   33 +++++++++++----------------------
- qt4/src/poppler-private.h	 |    1 -
+ qt4/src/poppler-embeddedfile.cc | 33 +++++++++++----------------------
+ qt4/src/poppler-private.h	 |  1 -
  2 files changed, 11 insertions(+), 23 deletions(-)
 
 commit 5915e57e7785370ce305cbbb3c2fedf36886689f
@@ -33890,11 +37064,11 @@ Date:	Sun Feb 10 03:19:18 2008 +0100
 
     const & in foreach
 
- qt4/tests/poppler-fonts.cpp	  |    2 +-
- qt4/tests/stress-poppler-dir.cpp |    2 +-
- qt4/tests/stress-poppler-qt4.cpp |    2 +-
- qt4/tests/test-password-qt4.cpp  |    2 +-
- qt4/tests/test-poppler-qt4.cpp   |    2 +-
+ qt4/tests/poppler-fonts.cpp	  | 2 +-
+ qt4/tests/stress-poppler-dir.cpp | 2 +-
+ qt4/tests/stress-poppler-qt4.cpp | 2 +-
+ qt4/tests/test-password-qt4.cpp  | 2 +-
+ qt4/tests/test-poppler-qt4.cpp   | 2 +-
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 commit d8374e0c2eb3ba05be101687e20c5fcbc42c1ad0
@@ -33903,12 +37077,12 @@ Date:	Sun Feb 10 01:32:24 2008 +0100
 
     Include only what needed; remove extra includes.
 
- qt4/tests/poppler-attachments.cpp |	4 +++-
- qt4/tests/poppler-fonts.cpp	   |	4 +++-
- qt4/tests/stress-poppler-dir.cpp  |	9 ++++++---
- qt4/tests/stress-poppler-qt4.cpp  |	9 ++++++---
- qt4/tests/test-password-qt4.cpp   |   10 ++++++----
- qt4/tests/test-poppler-qt4.cpp    |   12 ++++++++----
+ qt4/tests/poppler-attachments.cpp |  4 +++-
+ qt4/tests/poppler-fonts.cpp	   |  4 +++-
+ qt4/tests/stress-poppler-dir.cpp  |  9 ++++++---
+ qt4/tests/stress-poppler-qt4.cpp  |  9 ++++++---
+ qt4/tests/test-password-qt4.cpp   | 10 ++++++----
+ qt4/tests/test-poppler-qt4.cpp    | 12 ++++++++----
  6 files changed, 32 insertions(+), 16 deletions(-)
 
 commit fa01a1115c4554b18c3462b568d76860d2fbe17b
@@ -33917,7 +37091,7 @@ Date:	Sun Feb 10 01:09:57 2008 +0100
 
     Comment out unused vars.
 
- utils/pdftoabw.cc |	6 +++---
+ utils/pdftoabw.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit d3275e4263372b534c276f81d0c997ecb6675487
@@ -33937,7 +37111,7 @@ Date:	Sat Feb 9 23:56:32 2008 +0100
 
     Found by Michael Vrable
 
- poppler/Lexer.cc |    2 +-
+ poppler/Lexer.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 5347a97e39388ae38cf2ab9c67f953b0f7a02a13
@@ -33946,7 +37120,7 @@ Date:	Sat Feb 9 18:26:41 2008 +0100
 
     Add the operators for the flags we have.
 
- qt4/src/poppler-qt4.h |    3 +++
+ qt4/src/poppler-qt4.h | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 329ade4f936bf063539cdc887aaf9a1722a5b8e0
@@ -33956,8 +37130,8 @@ Date:	Sat Feb 9 18:23:59 2008 +0100
     Add options for the PDF export; add the WithChanges flag for saving
     the changes to the document as well.
 
- qt4/src/poppler-pdf-converter.cc |   25 +++++++++++++++++++++++--
- qt4/src/poppler-qt4.h		  |   14 ++++++++++++++
+ qt4/src/poppler-pdf-converter.cc | 25 +++++++++++++++++++++++--
+ qt4/src/poppler-qt4.h		  | 14 ++++++++++++++
  2 files changed, 37 insertions(+), 2 deletions(-)
 
 commit afb255366d56551bdc307766199bef9c5021d3ac
@@ -33974,7 +37148,7 @@ Date:	Sat Feb 9 17:57:57 2008 +0100
 
     Do not rely on GNU extensions, but at least use Qt.
 
- qt4/src/poppler-qiodeviceoutstream.cc |   11 ++++-------
+ qt4/src/poppler-qiodeviceoutstream.cc | 11 ++++-------
  1 file changed, 4 insertions(+), 7 deletions(-)
 
 commit 8cb0e75203daa01439413d1a775482b48e784baa
@@ -33984,7 +37158,7 @@ Date:	Sat Feb 9 17:56:13 2008 +0100
     Domain order is x_min x_max y_min y_max and not x_min y_min x_max
     y_max
 
- poppler/GfxState.cc |	  4 ++--
+ poppler/GfxState.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit c8f734ba4258059fa4521a4d364f62ca1632840b
@@ -33994,7 +37168,7 @@ Date:	Sat Feb 9 13:37:04 2008 +0100
     PS cos and sin input values are degrees so convert to radians so we
     can use the cos and sin cmath functions
 
- poppler/Function.cc |	  4 ++--
+ poppler/Function.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 5fb0c9d31c1abf2e6ad306c112fbd2a7c33d8772
@@ -34012,10 +37186,10 @@ Date:	Sat Feb 9 13:14:41 2008 +0100
     Add saveWithoutChangesAs method to be able to save the document
     ignoring changes made in forms or annots
 
- glib/poppler-document.cc |   41 ++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h  |    3 +++
- poppler/PDFDoc.cc	  |   38 ++++++++++++++++++++++++++++++++------
- poppler/PDFDoc.h	  |    4 ++++
+ glib/poppler-document.cc | 41 ++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h  |  3 +++
+ poppler/PDFDoc.cc	  | 38 ++++++++++++++++++++++++++++++++------
+ poppler/PDFDoc.h	  |  4 ++++
  4 files changed, 79 insertions(+), 7 deletions(-)
 
 commit 2255c85e4939a0752083dca21984ff4398baf8d2
@@ -34032,8 +37206,8 @@ Date:	Sat Feb 9 12:48:04 2008 +0100
 
     Fix placeholders in printf-like functions.
 
- glib/demo/page.c	   |	2 +-
- glib/test-poppler-glib.cc |	2 +-
+ glib/demo/page.c	   | 2 +-
+ glib/test-poppler-glib.cc | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 commit 56c924609223196c5c41b9e6d9102bc248bad947
@@ -34044,7 +37218,7 @@ Date:	Sat Feb 9 12:26:06 2008 +0100
 
     See testcase at http://bugs.kde.org/show_bug.cgi?id=157497
 
- poppler/Function.cc |	  6 ++++--
+ poppler/Function.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit 2a39932ae35a2716842bd2a1c3d4f9ce6b1e3dd8
@@ -34058,7 +37232,7 @@ Date:	Sat Feb 9 01:31:20 2008 +0100
     - QVERIFY(!foo) instead of QCOMPARE(foo, false)
     - QVERIFY() also the return value of unlock()
 
- qt4/tests/check_password.cpp |   31 ++++++++++++++++---------------
+ qt4/tests/check_password.cpp | 31 ++++++++++++++++---------------
  1 file changed, 16 insertions(+), 15 deletions(-)
 
 commit cc9c124d4d859b845eebf4ca1e4397870a35fd4e
@@ -34067,7 +37241,7 @@ Date:	Sat Feb 9 01:09:02 2008 +0100
 
     Add an unit test case for few invalid dates.
 
- qt4/tests/check_dateConversion.cpp |	34
+ qt4/tests/check_dateConversion.cpp | 34
  ++++++++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
 
@@ -34077,7 +37251,7 @@ Date:	Fri Feb 8 18:42:14 2008 +0100
 
     Remove unneeded headers.
 
- qt4/src/poppler-page.cc |    4 ++--
+ qt4/src/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 899627505a4645fb1cc7d3599adbeec449c57041
@@ -34086,7 +37260,7 @@ Date:	Fri Feb 8 18:41:13 2008 +0100
 
     The return value is QString, so return QString's...
 
- qt4/src/poppler-document.cc |	  6 +++---
+ qt4/src/poppler-document.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 commit a1606fa4ff438983e3a7f55dd2d10a66f72e6711
@@ -34095,9 +37269,9 @@ Date:	Fri Feb 8 17:31:32 2008 +0100
 
     Move checkDocument() inside the private class.
 
- qt4/src/poppler-document.cc |	  6 +++---
- qt4/src/poppler-private.h   |	  2 ++
- qt4/src/poppler-qt4.h	     |	  2 +-
+ qt4/src/poppler-document.cc | 6 +++---
+ qt4/src/poppler-private.h   | 2 ++
+ qt4/src/poppler-qt4.h	     | 2 +-
  3 files changed, 6 insertions(+), 4 deletions(-)
 
 commit f1ec70a83f807493dab5118761df31c0f67decad
@@ -34106,7 +37280,7 @@ Date:	Fri Feb 8 17:26:41 2008 +0100
 
     Remove C-ism.
 
- qt4/src/poppler-document.cc |	  4 ++--
+ qt4/src/poppler-document.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3e994e8586fa1c87ef7e7f82af1cdacf2cd36310
@@ -34115,7 +37289,7 @@ Date:	Fri Feb 8 12:21:56 2008 +0100
 
     Add the missing font types.
 
- qt4/src/poppler-fontinfo.cc |	 11 +++++++++--
+ qt4/src/poppler-fontinfo.cc | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 commit ba07963f85d777a441349e23d4c2f510e45c73be
@@ -34124,7 +37298,7 @@ Date:	Fri Feb 8 12:19:04 2008 +0100
 
     Be safe against self-assignment.
 
- qt4/src/poppler-fontinfo.cc |	  3 +++
+ qt4/src/poppler-fontinfo.cc | 3 +++
  1 file changed, 3 insertions(+)
 
 commit 834b86548e09f4b24cdb2f194299d053b9b55022
@@ -34133,7 +37307,7 @@ Date:	Fri Feb 8 12:15:16 2008 +0100
 
     Small apidox fix.
 
- qt4/src/poppler-qt4.h |    2 +-
+ qt4/src/poppler-qt4.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 11a61eac5b8cde04bf762bbbe0deab5c0bd52951
@@ -34142,9 +37316,9 @@ Date:	Fri Feb 8 02:21:32 2008 +0100
 
     Pack few bools together.
 
- qt4/src/poppler-annotation.cc |    8 ++++----
- qt4/src/poppler-link.cc       |   10 +++++-----
- qt4/src/poppler-private.h     |    4 ++--
+ qt4/src/poppler-annotation.cc |  8 ++++----
+ qt4/src/poppler-link.cc       | 10 +++++-----
+ qt4/src/poppler-private.h     |  4 ++--
  3 files changed, 11 insertions(+), 11 deletions(-)
 
 commit 1aeba15b5eb9b30943259824678ebc9e4f56e870
@@ -34162,10 +37336,10 @@ Date:	Fri Feb 8 01:36:56 2008 +0100
     Move QStringToUnicodeGooString() and QStringToGooString() to the
     private module.
 
- qt4/src/poppler-document.cc |	 10 ----------
- qt4/src/poppler-form.cc     |	 15 ---------------
- qt4/src/poppler-private.cc  |	 25 +++++++++++++++++++++++++
- qt4/src/poppler-private.h   |	  4 ++++
+ qt4/src/poppler-document.cc | 10 ----------
+ qt4/src/poppler-form.cc     | 15 ---------------
+ qt4/src/poppler-private.cc  | 25 +++++++++++++++++++++++++
+ qt4/src/poppler-private.h   |	4 ++++
  4 files changed, 29 insertions(+), 25 deletions(-)
 
 commit 5e44241c4976b819f7be6badd2d183fbfb8ee6de
@@ -34174,11 +37348,11 @@ Date:	Fri Feb 8 01:30:07 2008 +0100
 
     Move the string functions implementation in a .cc file.
 
- qt4/src/CMakeLists.txt     |	 1 +
- qt4/src/Makefile.am	    |	 1 +
- qt4/src/poppler-private.cc |	70
- ++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-private.h  |	46 +++--------------------------
+ qt4/src/CMakeLists.txt     |  1 +
+ qt4/src/Makefile.am	    |  1 +
+ qt4/src/poppler-private.cc | 70
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-private.h  | 46 +++---------------------------
  4 files changed, 76 insertions(+), 42 deletions(-)
 
 commit 124d92139241ad95da559d22af48254b45ac4a2e
@@ -34187,15 +37361,15 @@ Date:	Fri Feb 8 01:07:43 2008 +0100
 
     Include own header first, remove extra includes.
 
- qt4/src/poppler-document.cc		  |    1 -
- qt4/src/poppler-embeddedfile.cc	  |    3 ++-
- qt4/src/poppler-form.cc		  |    4 +++-
- qt4/src/poppler-link-extractor-private.h |    2 ++
- qt4/src/poppler-link-extractor.cc	  |    7 +++++--
- qt4/src/poppler-page-private.h		  |    6 +++++-
- qt4/src/poppler-private.h		  |    4 +++-
- qt4/src/poppler-qt4.h			  |    2 --
- qt4/src/poppler-sound.cc		  |    4 ++--
+ qt4/src/poppler-document.cc		  | 1 -
+ qt4/src/poppler-embeddedfile.cc	  | 3 ++-
+ qt4/src/poppler-form.cc		  | 4 +++-
+ qt4/src/poppler-link-extractor-private.h | 2 ++
+ qt4/src/poppler-link-extractor.cc	  | 7 +++++--
+ qt4/src/poppler-page-private.h		  | 6 +++++-
+ qt4/src/poppler-private.h		  | 4 +++-
+ qt4/src/poppler-qt4.h			  | 2 --
+ qt4/src/poppler-sound.cc		  | 4 ++--
  9 files changed, 22 insertions(+), 11 deletions(-)
 
 commit 22d10c19e232dea143bda372c92aa12b999e4921
@@ -34206,7 +37380,7 @@ Date:	Thu Feb 7 23:38:50 2008 +0100
     some docs in the wild with more than that and they work on acroread
     so increase the allowed length to 128+127
 
- poppler/Lexer.cc |   25 +++++++++++++++++++++----
+ poppler/Lexer.cc | 25 +++++++++++++++++++++----
  1 file changed, 21 insertions(+), 4 deletions(-)
 
 commit ee9f85915feb86b54ace1a403baa13bbdd7c3966
@@ -34218,7 +37392,7 @@ Date:	Thu Feb 7 18:07:53 2008 +0100
     Just assert when constructing instead of checking for it in each
     link iteration.
 
- qt4/src/poppler-link-extractor.cc |	3 ++-
+ qt4/src/poppler-link-extractor.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit ad4b1361f6c25359e6ddb38599bfc1e4e3e80408
@@ -34227,8 +37401,8 @@ Date:	Thu Feb 7 18:03:30 2008 +0100
 
     Precalc stuff we don't need to recalc in each link iteration.
 
- qt4/src/poppler-link-extractor-private.h |    3 ++-
- qt4/src/poppler-link-extractor.cc	  |   14 ++++++++------
+ qt4/src/poppler-link-extractor-private.h |  3 ++-
+ qt4/src/poppler-link-extractor.cc	  | 14 ++++++++------
  2 files changed, 10 insertions(+), 7 deletions(-)
 
 commit 82432dbc62a0879f4513640c2e0f594fda9347ad
@@ -34238,9 +37412,8 @@ Date:	Thu Feb 7 17:51:50 2008 +0100
     Store the ::Page internally, so we don't need to get it again
     everytime.
 
- qt4/src/poppler-page-private.h |    3 +++
- qt4/src/poppler-page.cc	|   37
- ++++++++++++++-----------------------
+ qt4/src/poppler-page-private.h |  3 +++
+ qt4/src/poppler-page.cc	| 37 ++++++++++++++-----------------------
  2 files changed, 17 insertions(+), 23 deletions(-)
 
 commit 8ec51f7ca518aa6a4a69f30d373722d05f50cf07
@@ -34249,7 +37422,7 @@ Date:	Thu Feb 7 16:48:16 2008 +0100
 
     Compile the stress-poppler-dir test as well.
 
- qt4/tests/CMakeLists.txt |    1 +
+ qt4/tests/CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 commit 8a946b76ae2e7c2c5238b4e580c1c226eb457dc9
@@ -34258,7 +37431,7 @@ Date:	Thu Feb 7 01:07:28 2008 +0100
 
     Micro-touches to the debug messages.
 
- qt4/src/poppler-page.cc |   26 +++++++++++++-------------
+ qt4/src/poppler-page.cc | 26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
 commit c31990dfe50c7a0e3999e6d967699fce5ccb3339
@@ -34275,9 +37448,8 @@ Date:	Tue Feb 5 00:37:01 2008 +0100
 
     Add a AnnotColor -> QColor conversion method.
 
- qt4/src/poppler-annotation-helper.h |	  6 ++++++
- qt4/src/poppler-annotation.cc	     |	 31
- +++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation-helper.h |	6 ++++++
+ qt4/src/poppler-annotation.cc	     | 31 +++++++++++++++++++++++++++++++
  2 files changed, 37 insertions(+)
 
 commit 6d58cda82b0181f2cca6e9d95b15877793be0812
@@ -34286,7 +37458,7 @@ Date:	Mon Feb 4 23:33:51 2008 +0100
 
     Protect us against weird dateString values
 
- qt4/src/poppler-document.cc |	  5 ++++-
+ qt4/src/poppler-document.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit aa0435f1544fe1adcf10173e34eaeaf2a7a703c7
@@ -34305,11 +37477,11 @@ Date:	Sun Feb 3 22:42:51 2008 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   15 ++++-----------
- poppler/Annot.h  |   12 ++++++++++--
- poppler/Gfx.cc   |    7 ++++---
- poppler/Page.cc  |    9 +++++++++
- poppler/Page.h   |    3 +++
+ poppler/Annot.cc | 15 ++++-----------
+ poppler/Annot.h  | 12 ++++++++++--
+ poppler/Gfx.cc   |  7 ++++---
+ poppler/Page.cc  |  9 +++++++++
+ poppler/Page.h   |  3 +++
  5 files changed, 30 insertions(+), 16 deletions(-)
 
 commit b43f4e9a161a1fd7b827244dc21b1bd2a6df7054
@@ -34318,13 +37490,13 @@ Date:	Sun Feb 3 20:32:15 2008 +0100
 
     Pass the DocumentData to the Page (simplify a bit some code).
 
- qt4/src/poppler-document.cc		  |    2 +-
- qt4/src/poppler-link-extractor-private.h |    4 +-
- qt4/src/poppler-link-extractor.cc	  |    8 ++--
- qt4/src/poppler-page-private.h		  |    4 +-
- qt4/src/poppler-page.cc		  |   64
- +++++++++++++++---------------
- qt4/src/poppler-qt4.h			  |    5 +--
+ qt4/src/poppler-document.cc		  |  2 +-
+ qt4/src/poppler-link-extractor-private.h |  4 +-
+ qt4/src/poppler-link-extractor.cc	  |  8 ++--
+ qt4/src/poppler-page-private.h		  |  4 +-
+ qt4/src/poppler-page.cc		  | 64
+ ++++++++++++++++----------------
+ qt4/src/poppler-qt4.h			  |  5 +--
  6 files changed, 42 insertions(+), 45 deletions(-)
 
 commit 4e0bb0307fccefc21f74a4c5a3a0d7e8e687b550
@@ -34333,7 +37505,7 @@ Date:	Sat Feb 2 12:57:25 2008 +0100
 
     Fix include guard.
 
- poppler/ArthurOutputDev.h |	4 ++--
+ poppler/ArthurOutputDev.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 6f11ef660540fd13aad1350385beb90758ca86af
@@ -34342,7 +37514,7 @@ Date:	Fri Feb 1 23:55:37 2008 +0100
 
     Fix for end condition, init ucode to 0
 
- poppler/GfxFont.cc |	 4 ++--
+ poppler/GfxFont.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 1da2091807ae7f7d4d3f446953c41b4c440d4b1b
@@ -34354,7 +37526,7 @@ Date:	Thu Jan 31 23:52:20 2008 +0100
 
     Fixes crash on http://bugs.kde.org/show_bug.cgi?id=157000
 
- poppler/SplashOutputDev.cc |	 8 ++++++--
+ poppler/SplashOutputDev.cc | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 commit ecabc9469b137e8251344e5502de1cbf875223b9
@@ -34363,7 +37535,7 @@ Date:	Thu Jan 31 00:20:55 2008 +0100
 
     Set RelWithDebInfo as default build type, if not specified.
 
- cmake/modules/PopplerMacros.cmake |	4 ++++
+ cmake/modules/PopplerMacros.cmake | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 19da87a20b3906523a330e3c956903a58a3ede7f
@@ -34377,8 +37549,8 @@ Date:	Thu Jan 31 00:11:58 2008 +0100
     The supported build types are: None (as in no type is specified on
     command line), RelWithDebInfo, Release, Debug, DebugFull, Profile.
 
- CMakeLists.txt			   |	7 -------
- cmake/modules/PopplerMacros.cmake |   29 +++++++++++++++++++++++++++++
+ CMakeLists.txt			   |  7 -------
+ cmake/modules/PopplerMacros.cmake | 29 +++++++++++++++++++++++++++++
  2 files changed, 29 insertions(+), 7 deletions(-)
 
 commit 37d2055137c310ceb217164a76814b188be3b1b2
@@ -34434,7 +37606,7 @@ Date:	Wed Jan 30 22:17:38 2008 +0100
 
     Preprocessor #warning is GCC-specific.
 
- poppler/ArthurOutputDev.cc |	 4 ++++
+ poppler/ArthurOutputDev.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 4c738cc6bd51f9d9e23ba83949c490c5c8691345
@@ -34445,13 +37617,13 @@ Date:	Tue Jan 29 23:45:52 2008 +0100
 
     Fixes bug 12304
 
- poppler/SplashOutputDev.cc |	37 +++++++++++++++++++++++++++++
- splash/SplashFTFont.cc     |	55
- +++++++++++++++++++++++++++++++++++++++++++-
- splash/SplashFTFont.h	    |	 4 ++++
- splash/SplashFont.h	    |	 4 ++++
- splash/SplashFontFile.cc   |	 1 +
- splash/SplashFontFile.h    |	 2 ++
+ poppler/SplashOutputDev.cc | 37 +++++++++++++++++++++++++++++++
+ splash/SplashFTFont.cc     | 55
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ splash/SplashFTFont.h	    |  4 ++++
+ splash/SplashFont.h	    |  4 ++++
+ splash/SplashFontFile.cc   |  1 +
+ splash/SplashFontFile.h    |  2 ++
  6 files changed, 102 insertions(+), 1 deletion(-)
 
 commit 64f16cf6ebf2870852fe8d937b25be58869ad40a
@@ -34460,7 +37632,7 @@ Date:	Tue Jan 29 23:41:15 2008 +0100
 
     Enable antialias by default on the test tool
 
- qt4/tests/test-poppler-qt4.cpp |    2 ++
+ qt4/tests/test-poppler-qt4.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 90f0e6bc1e96d9f1666cb8476a92e127f5b927d4
@@ -34469,10 +37641,10 @@ Date:	Tue Jan 29 20:23:08 2008 +0100
 
     Provide gstrndup as a portable substitue of strndup
 
- configure.ac	    |	 1 -
- goo/gmem.cc	    |	 7 +++++++
- goo/gmem.h	    |	 5 +++++
- poppler/GfxFont.cc |	 8 +-------
+ configure.ac	    | 1 -
+ goo/gmem.cc	    | 7 +++++++
+ goo/gmem.h	    | 5 +++++
+ poppler/GfxFont.cc | 8 +-------
  4 files changed, 13 insertions(+), 8 deletions(-)
 
 commit 77b91c852ad3d5554afc03aee92a1d928f233401
@@ -34489,8 +37661,8 @@ Date:	Mon Jan 28 20:42:44 2008 +0100
 
     Introduce a check for strndup and alternative for systems without it
 
- configure.ac	    |	 1 +
- poppler/GfxFont.cc |	 6 ++++++
+ configure.ac	    | 1 +
+ poppler/GfxFont.cc | 6 ++++++
  2 files changed, 7 insertions(+)
 
 commit 053369678963206a4afa88a614de1994872c7c5a
@@ -34499,9 +37671,9 @@ Date:	Sun Jan 27 19:36:28 2008 +0100
 
     Add ok_to_fill_form permission flag
 
- glib/poppler-document.cc  |	2 ++
- glib/poppler-document.h   |	3 ++-
- glib/test-poppler-glib.cc |   21 +++++++++++++++++++--
+ glib/poppler-document.cc  |  2 ++
+ glib/poppler-document.h   |  3 ++-
+ glib/test-poppler-glib.cc | 21 +++++++++++++++++++--
  3 files changed, 23 insertions(+), 3 deletions(-)
 
 commit 3085a9495ad87a54758da0024372610fdaf88d57
@@ -34510,7 +37682,7 @@ Date:	Sun Jan 27 19:15:34 2008 +0100
 
     Fix slice rendering in poppler glib demo
 
- glib/demo/render.c |	41 ++++++++++++++++++++++++-----------------
+ glib/demo/render.c | 41 ++++++++++++++++++++++++-----------------
  1 file changed, 24 insertions(+), 17 deletions(-)
 
 commit 7ad6c4ba110b970516d5380444a03ae217496ddf
@@ -34519,7 +37691,7 @@ Date:	Thu Jan 24 21:14:44 2008 +0100
 
     Incrementing the iterator would be a good idea
 
- qt4/src/poppler-annotation.cc |    1 +
+ qt4/src/poppler-annotation.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit 7c99ec4635a4971321bbead7d1bc723da59b755e
@@ -34528,8 +37700,8 @@ Date:	Thu Jan 24 19:18:15 2008 +0100
 
     Revert unwanted change on Dict, fix leak on writeTrailer
 
- poppler/Dict.cc   |	2 +-
- poppler/PDFDoc.cc |	4 ++--
+ poppler/Dict.cc   | 2 +-
+ poppler/PDFDoc.cc | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit 2335fb6034d2e9ec304abba400119b88302b3160
@@ -34540,7 +37712,7 @@ Date:	Wed Jan 23 23:26:20 2008 +0100
 
     See http://bugs.kde.org/show_bug.cgi?id=151359 for an example
 
- poppler/Gfx.cc |    8 ++++----
+ poppler/Gfx.cc | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 96c532ea4b56a147de1deb965126e31f87df588b
@@ -34549,7 +37721,7 @@ Date:	Wed Jan 23 13:30:12 2008 +0100
 
     Fix memory leak
 
- poppler/Form.cc |    4 ++++
+ poppler/Form.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 6bca64407c675ca837f83a12c0f655f975f14407
@@ -34559,8 +37731,8 @@ Date:	Wed Jan 23 13:27:45 2008 +0100
     Make sure default values are not loaded more than once for the
     same widget.
 
- poppler/Form.cc |   18 +++++++++++++++++-
- poppler/Form.h  |    1 +
+ poppler/Form.cc | 18 +++++++++++++++++-
+ poppler/Form.h  |  1 +
  2 files changed, 18 insertions(+), 1 deletion(-)
 
 commit eccf84b51a1cf5d478c0ec84be3fc9be8e458f4f
@@ -34577,16 +37749,16 @@ Date:	Tue Jan 22 23:28:16 2008 +0100
     making use of the new QIODeviceOutStream.
     The BaseConverter now handles automatically file or QIODevice output.
 
- qt4/src/Makefile.am			      |    5 +
- qt4/src/poppler-base-converter.cc	      |   99 ++++++++++++++++
- qt4/src/poppler-converter-private.h	      |   48 ++++++++
- qt4/src/poppler-document.cc		      |    5 +
- qt4/src/poppler-pdf-converter.cc	      |   68 +++++++++++
- qt4/src/poppler-ps-converter.cc	      |  162
- +++++++++++---------------
- qt4/src/poppler-qiodeviceoutstream-private.h |   47 ++++++++
- qt4/src/poppler-qiodeviceoutstream.cc	      |   71 +++++++++++
- qt4/src/poppler-qt4.h			      |   85 +++++++++++---
+ qt4/src/Makefile.am			      |   5 +
+ qt4/src/poppler-base-converter.cc	      |  99 ++++++++++++++++
+ qt4/src/poppler-converter-private.h	      |  48 ++++++++
+ qt4/src/poppler-document.cc		      |   5 +
+ qt4/src/poppler-pdf-converter.cc	      |  68 +++++++++++
+ qt4/src/poppler-ps-converter.cc	      | 162
+ ++++++++++++---------------
+ qt4/src/poppler-qiodeviceoutstream-private.h |  47 ++++++++
+ qt4/src/poppler-qiodeviceoutstream.cc	      |  71 ++++++++++++
+ qt4/src/poppler-qt4.h			      |  85 +++++++++++---
  9 files changed, 483 insertions(+), 107 deletions(-)
 
 commit 547db8be1ab0b2987f0f06d8529eaaed2414028c
@@ -34595,7 +37767,7 @@ Date:	Tue Jan 22 13:22:20 2008 +0100
 
     Fix a crash when createAnnot returns NULL due to invalid annot dict.
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 0d558841142587d66bd3b2025e5a9ca39f7a6159
@@ -34604,7 +37776,7 @@ Date:	Mon Jan 21 21:43:39 2008 +0100
 
     Fix another reversed comparison due to cmp
 
- poppler/Annot.cc |    2 +-
+ poppler/Annot.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cb6a87e39336e2e3893f3e5f577e4d176d237a9f
@@ -34615,7 +37787,7 @@ Date:	Mon Jan 21 10:07:35 2008 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   24 ++++++++++++------------
+ poppler/Annot.cc | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
 commit 7cf85dc8d7c895a211684c7d36757063ed4f469b
@@ -34624,7 +37796,7 @@ Date:	Mon Jan 21 21:27:49 2008 +0100
 
     The glade file needs to be distributed
 
- test/Makefile.am |    3 ++-
+ test/Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 46e93d31dd9b5909ecd8f7a8f8de23329444a7bc
@@ -34633,7 +37805,7 @@ Date:	Sun Jan 20 19:56:51 2008 +0100
 
     we need time.h if we use time()
 
- poppler/PDFDoc.cc |	1 +
+ poppler/PDFDoc.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit a0adb006c38ea07f010a01d9c0bb07ca0f48939d
@@ -34642,8 +37814,8 @@ Date:	Sun Jan 20 19:55:55 2008 +0100
 
     Added a saveAs() overload which takes a plain OutStream
 
- poppler/PDFDoc.cc |	9 +++++++--
- poppler/PDFDoc.h  |	2 ++
+ poppler/PDFDoc.cc | 9 +++++++--
+ poppler/PDFDoc.h  | 2 ++
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit fcdd5c51f370d040ae57aa64801c9bd4dbe88752
@@ -34653,11 +37825,11 @@ Date:	Sat Jan 19 18:00:10 2008 +0100
     Do not render images when getting the image mapping, it can be done
     later on demand.
 
- glib/poppler-page.cc	   |   81 +++++++++++++++-------------
- glib/poppler-page.h	   |	6 ++-
- poppler/CairoOutputDev.cc |  131
- ++++++++++++++++++++++++++-------------------
- poppler/CairoOutputDev.h  |   12 ++++-
+ glib/poppler-page.cc	   |  81 +++++++++++++++-------------
+ glib/poppler-page.h	   |   6 ++-
+ poppler/CairoOutputDev.cc | 131
+ ++++++++++++++++++++++++++--------------------
+ poppler/CairoOutputDev.h  |  12 ++++-
  4 files changed, 135 insertions(+), 95 deletions(-)
 
 commit 37ae465775d9a53e7c06cf51aa215439214fd79c
@@ -34666,7 +37838,7 @@ Date:	Sat Jan 19 14:00:31 2008 +0100
 
     ignore pdf-fullrewrite binary
 
- test/.gitignore |    1 +
+ test/.gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 1d160935ea4c1116b745c584ed7f1fd03fbbfb46
@@ -34675,9 +37847,9 @@ Date:	Sat Jan 19 13:59:46 2008 +0100
 
     AnnotWidget support and few fixes
 
- poppler/Annot.cc |  243
- +++++++++++++++++++++++++++++++++++++++++++++++++++---
- poppler/Annot.h  |  142 ++++++++++++++++++++++++++++---
+ poppler/Annot.cc | 243
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ poppler/Annot.h  | 142 +++++++++++++++++++++++++++++---
  2 files changed, 365 insertions(+), 20 deletions(-)
 
 commit 0e91a3973e525d65236d15930a8ea0e5bbb6a6cc
@@ -34686,9 +37858,9 @@ Date:	Sat Jan 19 13:59:25 2008 +0100
 
     AnnotTextMarkup support and improved AnnotQuadrilaterals
 
- poppler/Annot.cc |  356
- +++++++++++++++++++++++++++++++++++++++++++-----------
- poppler/Annot.h  |  130 +++++++++++++++++---
+ poppler/Annot.cc | 356
+ ++++++++++++++++++++++++++++++++++++++++++++-----------
+ poppler/Annot.h  | 130 +++++++++++++++++---
  2 files changed, 400 insertions(+), 86 deletions(-)
 
 commit c13952cd56a40bad14a1bf28699b137f65162f10
@@ -34697,9 +37869,9 @@ Date:	Sat Jan 19 13:59:02 2008 +0100
 
     Changed AnnotQuadrilateral parsing inside AnnotLink
 
- poppler/Annot.cc |  246
- +++++++++++++++++++++++++++++-------------------------
- poppler/Annot.h  |   19 +++--
+ poppler/Annot.cc | 246
+ ++++++++++++++++++++++++++++++-------------------------
+ poppler/Annot.h  |  19 +++--
  2 files changed, 144 insertions(+), 121 deletions(-)
 
 commit 2f821f10fbbba9363405201c86494cd861cec2b2
@@ -34708,8 +37880,8 @@ Date:	Sat Jan 19 13:49:43 2008 +0100
 
     Add AnnotQuadPoints class
 
- poppler/Annot.cc |   16 ++++++++++++++++
- poppler/Annot.h  |   23 +++++++++++++++++++++++
+ poppler/Annot.cc | 16 ++++++++++++++++
+ poppler/Annot.h  | 23 +++++++++++++++++++++++
  2 files changed, 39 insertions(+)
 
 commit de4c8fa6607e55c199bede1dc731227692ef4f53
@@ -34720,9 +37892,9 @@ Date:	Sun Dec 30 21:21:56 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |  232
- +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h  |  127 ++++++++++++++++++++++++++++++
+ poppler/Annot.cc | 232
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h  | 127 ++++++++++++++++++++++++++++++
  2 files changed, 358 insertions(+), 1 deletion(-)
 
 commit c3504a87933ae1516b1ef05e527fd1c039091235
@@ -34733,9 +37905,9 @@ Date:	Sun Dec 30 19:37:18 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |  116
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |   51 ++++++++++++++++++++++++
+ poppler/Annot.cc | 116
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  51 ++++++++++++++++++++++++
  2 files changed, 167 insertions(+)
 
 commit a20468cc38bb590124b2b028a08f364f90f2487f
@@ -34744,9 +37916,8 @@ Date:	Sat Jan 19 13:02:17 2008 +0100
 
     Adds a test application to test full rewrite functionnality.
 
- test/Makefile.am	 |   11 ++++++++++-
- test/pdf-fullrewrite.cc |   44
- ++++++++++++++++++++++++++++++++++++++++++++
+ test/Makefile.am	 | 11 ++++++++++-
+ test/pdf-fullrewrite.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 54 insertions(+), 1 deletion(-)
 
 commit 246294714c6011651fd0e5b3649bd65919058c72
@@ -34760,7 +37931,7 @@ Date:	Sat Jan 19 12:59:03 2008 +0100
     if they had been updated.
     It is now the case for the other type of FormWidgets.
 
- poppler/Form.cc |    7 ++++++-
+ poppler/Form.cc | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 commit 6e0f297b8b17afb95779724b8618ca39016e664a
@@ -34769,8 +37940,8 @@ Date:	Sat Jan 19 12:54:09 2008 +0100
 
     Annot will save their generated appearance in their AP dict.
 
- poppler/Annot.cc |   42 ++++++++++++++++++++++++++++++++++++++----
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 42 ++++++++++++++++++++++++++++++++++++++----
+ poppler/Annot.h  |  1 +
  2 files changed, 39 insertions(+), 4 deletions(-)
 
 commit e20f6a8e9ac3936b4bc03710a71fe390dfc4c094
@@ -34779,8 +37950,8 @@ Date:	Sat Jan 19 12:52:02 2008 +0100
 
     Add deep copy constructor to Dict.
 
- poppler/Dict.cc |   14 +++++++++++++-
- poppler/Dict.h  |    1 +
+ poppler/Dict.cc | 14 +++++++++++++-
+ poppler/Dict.h  |  1 +
  2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit e8d46cab77c7167edb0896296118daafc0f13b6d
@@ -34790,11 +37961,11 @@ Date:	Sat Jan 19 12:51:44 2008 +0100
     Adds the ability to save PDF using either incremental update or by
     rewriting completly the PDF.
 
- poppler/PDFDoc.cc |  379
- ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/PDFDoc.h  |   18 ++-
- poppler/XRef.cc   |   12 +-
- poppler/XRef.h    |	3 +-
+ poppler/PDFDoc.cc | 379
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/PDFDoc.h  |  18 ++-
+ poppler/XRef.cc   |  12 +-
+ poppler/XRef.h    |   3 +-
  4 files changed, 402 insertions(+), 10 deletions(-)
 
 commit 742b0c3dec01d8672b84f56d5bb0e2890b178594
@@ -34804,8 +37975,8 @@ Date:	Sat Jan 19 12:51:27 2008 +0100
     Make the md5 method of Decrypt public so it can be used by other
     files.
 
- poppler/Decrypt.cc |	 5 ++---
- poppler/Decrypt.h  |	 1 +
+ poppler/Decrypt.cc | 5 ++---
+ poppler/Decrypt.h  | 1 +
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 commit bb7867976740dea259d4110c072552fc5953910f
@@ -34815,8 +37986,8 @@ Date:	Sat Jan 19 12:51:07 2008 +0100
     Modify the writeToFile method of XRef so it uses OutStream instead
     of a C file descriptor.
 
- poppler/XRef.cc |   10 +++++-----
- poppler/XRef.h  |    2 +-
+ poppler/XRef.cc | 10 +++++-----
+ poppler/XRef.h  |  2 +-
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 commit d80736587fdbc0e163077f27bfd21c5e3a7fa4c7
@@ -34826,8 +37997,8 @@ Date:	Sat Jan 19 12:50:49 2008 +0100
     Adds addIndirectObject method to XRef. This method allow the creation
     of new indirect objects.
 
- poppler/XRef.cc |   39 +++++++++++++++++++++++++++++++++++++++
- poppler/XRef.h  |    1 +
+ poppler/XRef.cc | 39 +++++++++++++++++++++++++++++++++++++++
+ poppler/XRef.h  |  1 +
  2 files changed, 40 insertions(+)
 
 commit 8bd00dd0872191b8806e9411d9a1adc441f08a47
@@ -34839,8 +38010,8 @@ Date:	Sat Jan 19 12:50:16 2008 +0100
     With these methods, it is possible to read the raw content from the
     stream, without any filtering (even not the headers).
 
- poppler/Stream.cc |   41 ++++++++++++++++++++++++++++-------------
- poppler/Stream.h  |   26 ++++++++++++++++++++++++++
+ poppler/Stream.cc | 41 ++++++++++++++++++++++++++++-------------
+ poppler/Stream.h  | 26 ++++++++++++++++++++++++++
  2 files changed, 54 insertions(+), 13 deletions(-)
 
 commit 8bcda287ddd316f90b3e47a3a307fbe63a5c21f7
@@ -34850,7 +38021,7 @@ Date:	Sat Jan 19 12:46:53 2008 +0100
     Add setNeedFree method to MemStream so it is possible to choose if
     the stream should take care of deleting the buffer.
 
- poppler/Stream.h |    4 ++++
+ poppler/Stream.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 4fbd143de7e3a8ab386dd14b057e62b3b9fe04e4
@@ -34860,9 +38031,9 @@ Date:	Sat Jan 19 12:45:54 2008 +0100
     Add Outstream, a base class for output streams and FileOutStream,
     which implements OutStream for output to a file.
 
- poppler/Stream.cc |   55 +++++++++++++++++++++++++++++++++++++++++++++
- poppler/Stream.h  |   64
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Stream.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Stream.h  | 64
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 119 insertions(+)
 
 commit 696eaa47169fb063b7e6998c876926c578b6fbfa
@@ -34871,7 +38042,7 @@ Date:	Thu Jan 17 15:56:59 2008 +0100
 
     Fix a crash when editing text form fields
 
- poppler/Annot.cc |    4 ++--
+ poppler/Annot.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 9ec1b28dcdade12498b94b650c26483581294ee6
@@ -34881,7 +38052,7 @@ Date:	Thu Jan 17 14:54:34 2008 +0100
     Fix a crash when a form field contains reference to non existant
     children
 
- poppler/Form.cc |    4 ++++
+ poppler/Form.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit f7ed40c465033bad26dfda008c5984954baa0607
@@ -34890,7 +38061,7 @@ Date:	Wed Jan 16 21:01:50 2008 +0100
 
     Add a cast to fix build
 
- glib/demo/info.cc |	3 ++-
+ glib/demo/info.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 1c0aa21e598b879ec49d96700e6438ccb8ac2283
@@ -34899,11 +38070,11 @@ Date:	Fri Jan 11 20:28:49 2008 +0100
 
     rename info.c to info.cc to fix bug 14024
 
- glib/demo/Makefile.am |    2 +-
- glib/demo/info.c      |  243
- -------------------------------------------------
- glib/demo/info.cc     |  243
- +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/Makefile.am |   2 +-
+ glib/demo/info.c      | 243
+ --------------------------------------------------
+ glib/demo/info.cc     | 243
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 244 insertions(+), 244 deletions(-)
 
 commit 88f8bf850b6c41d25b9576597b5fc5bd75a122f4
@@ -34912,7 +38083,7 @@ Date:	Thu Jan 10 23:51:54 2008 +0100
 
     Fix two use after free bugs in HtmlOutputDev.cc
 
- utils/HtmlOutputDev.cc |    4 ++--
+ utils/HtmlOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 348f4f9d9d5b0f91da6f46e0fcefec80255d4179
@@ -34929,7 +38100,7 @@ Date:	Sat Jan 5 23:02:22 2008 +0100
 
     Make Document::renderHints return the correct render hints
 
- qt4/src/poppler-document.cc |	  2 +-
+ qt4/src/poppler-document.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4eca2e041c93349e0c4666e83ad1ca3caff91dee
@@ -34938,11 +38109,11 @@ Date:	Tue Jan 1 14:34:00 2008 +0100
 
     Add page transitions demo
 
- glib/demo/Makefile.am	 |    2 +
- glib/demo/main.c	 |   16 +--
- glib/demo/transitions.c |  321
- +++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/transitions.h |   31 +++++
+ glib/demo/Makefile.am	 |   2 +
+ glib/demo/main.c	 |  16 +--
+ glib/demo/transitions.c | 321
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/transitions.h |  31 +++++
  4 files changed, 363 insertions(+), 7 deletions(-)
 
 commit e92b50bbd3dfc8657b611e3c33129d7c5bae2319
@@ -34952,7 +38123,7 @@ Date:	Wed Dec 26 18:56:01 2007 +0100
     Use getEmbeddedFontID instead of getEmbeddedFontName to check if a
     font is embedded or not
 
- poppler/GfxFont.cc |	 3 ++-
+ poppler/GfxFont.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 30e9bae97e3742913015f7ea46636b2b80937612
@@ -34961,8 +38132,8 @@ Date:	Sat Dec 22 22:54:51 2007 +0100
 
     Fixlets for Adobe Glyph Naming convention implementation
 
- poppler/GfxFont.cc |	94
- +++++++++++++++++++++++++++-------------------------
+ poppler/GfxFont.cc | 94
+ ++++++++++++++++++++++++++++--------------------------
  1 file changed, 48 insertions(+), 46 deletions(-)
 
 commit 40551e616b007ceb15c9d6e3d77c24538ffec924
@@ -34971,7 +38142,7 @@ Date:	Sat Dec 22 14:31:50 2007 +0100
 
     Check the destination page of the link does exist
 
- qt4/src/poppler-link.cc |   20 ++++++++++++--------
+ qt4/src/poppler-link.cc | 20 ++++++++++++--------
  1 file changed, 12 insertions(+), 8 deletions(-)
 
 commit c06d6f2236d854f05e7621be280109ff27dc73b9
@@ -34980,7 +38151,7 @@ Date:	Thu Dec 20 20:13:08 2007 +0100
 
     Use UnicodeParsedString that does exactly what this code does
 
- qt4/src/poppler-document.cc |	 28 +---------------------------
+ qt4/src/poppler-document.cc | 28 +---------------------------
  1 file changed, 1 insertion(+), 27 deletions(-)
 
 commit 5f9f06a10fdb72a9d809ee1f779e1a8f549840e7
@@ -34993,7 +38164,7 @@ Date:	Thu Dec 20 19:59:26 2007 +0100
     http://lists.freedesktop.org/archives/poppler/2007-December/003244.html
     for more information
 
- poppler/GfxFont.cc |	14 ++++++++++----
+ poppler/GfxFont.cc | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 commit bb49e1e3909fc7392c197dc67d9b7f5312fd0dad
@@ -35002,8 +38173,8 @@ Date:	Tue Dec 18 20:20:11 2007 +0100
 
     Implement Adobe Glyph Naming convention
 
- poppler/GfxFont.cc |  183
- +++++++++++++++++++++++++++++++++++++++++++---------
+ poppler/GfxFont.cc | 183
+ ++++++++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 154 insertions(+), 29 deletions(-)
 
 commit 5634d63abdd64d371f2e8687a1c172f55b052008
@@ -35013,8 +38184,8 @@ Date:	Mon Dec 17 20:43:41 2007 +0100
     Allow seting some more Graphics States (Font, LW, LC, LJ, ML, D,
     RI, FL) by operator 'gs'
 
- poppler/Gfx.cc |   67
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Gfx.cc | 67
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 67 insertions(+)
 
 commit 7a9e7fc96b47b9d833300233ac38bbd60097f425
@@ -35029,8 +38200,8 @@ Date:	Sun Dec 16 21:21:08 2007 +0100
     whether the
     annot is a Link and it's always false.
 
- poppler/Annot.cc |   12 +++++++++++-
- poppler/Annot.h  |   10 ++++++++++
+ poppler/Annot.cc | 12 +++++++++++-
+ poppler/Annot.h  | 10 ++++++++++
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 commit 796d9cb9b188a8af69d7fbf9bccbb408cbf6a71a
@@ -35039,9 +38210,9 @@ Date:	Sat Dec 15 15:21:49 2007 +0100
 
     Fix a crash when trying to create a temp annot with catalog = NULL
 
- poppler/Annot.cc |    7 +++++++
- poppler/Annot.h  |    1 +
- poppler/Form.cc  |    6 ++----
+ poppler/Annot.cc | 7 +++++++
+ poppler/Annot.h  | 1 +
+ poppler/Form.cc  | 6 ++----
  3 files changed, 10 insertions(+), 4 deletions(-)
 
 commit 99f049f0dfbfd9c22bea56ae96253837ae421e23
@@ -35050,7 +38221,7 @@ Date:	Fri Dec 14 15:26:24 2007 +0100
 
     Use the default dash array when it's not correct in AnnotBorderBS
 
- poppler/Annot.cc |    4 +++-
+ poppler/Annot.cc | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 commit cb2a997aa6f9dd5508ca8b04e63815da893497ef
@@ -35059,8 +38230,8 @@ Date:	Fri Dec 14 14:12:14 2007 +0100
 
     Fix another crash due to uninitialized variables
 
- poppler/Annot.cc |   18 ++++++++----------
- poppler/Annot.h  |    1 +
+ poppler/Annot.cc | 18 ++++++++----------
+ poppler/Annot.h  |  1 +
  2 files changed, 9 insertions(+), 10 deletions(-)
 
 commit f704e86d8c72bacbd9443c4d828cd284d3a11753
@@ -35069,7 +38240,7 @@ Date:	Fri Dec 14 12:58:12 2007 +0100
 
     Fix several crashes due to uninitialized variables in Annots.
 
- poppler/Annot.cc |   11 +++++++----
+ poppler/Annot.cc | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 commit 0820a93ba1c0e893681024feb9f9bd120a9eeb4d
@@ -35083,7 +38254,7 @@ Date:	Fri Dec 14 12:38:58 2007 +0100
     parameter in such
     destinations, the parameter should be retained unchanged.
 
- poppler/Link.cc |   36 ++++++++++++++++++++++++++++--------
+ poppler/Link.cc | 36 ++++++++++++++++++++++++++++--------
  1 file changed, 28 insertions(+), 8 deletions(-)
 
 commit 0fb42a2f557d5ec83b42326eb6b0be41622ca328
@@ -35094,9 +38265,9 @@ Date:	Wed Dec 12 01:02:31 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   28 ++++++++++-----------
- poppler/Annot.h  |   72
- +++++++++++++++++++++++++++---------------------------
+ poppler/Annot.cc | 28 +++++++++++-----------
+ poppler/Annot.h  | 72
+ ++++++++++++++++++++++++++++----------------------------
  2 files changed, 50 insertions(+), 50 deletions(-)
 
 commit 29d39a8ae120e6045a16a7aa0944c36560b42508
@@ -35107,9 +38278,9 @@ Date:	Mon Dec 10 17:56:44 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |  123
- +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/Annot.h  |   65 ++++++++++++++++++++++++-----
+ poppler/Annot.cc | 123
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Annot.h  |  65 ++++++++++++++++++++++++-----
  2 files changed, 177 insertions(+), 11 deletions(-)
 
 commit 2acecde458122bd67487cc302478befa78bf6fbe
@@ -35120,9 +38291,9 @@ Date:	Mon Dec 10 16:45:46 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |  115
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |   51 ++++++++++++++++++++++++
+ poppler/Annot.cc | 115
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  |  51 ++++++++++++++++++++++++
  2 files changed, 166 insertions(+)
 
 commit 1f8c1fe34e04688d2ba200f1166cfdd1ffe563f0
@@ -35133,8 +38304,8 @@ Date:	Mon Dec 10 16:34:01 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |   34 ++++++++++++++++++++++++++++++++++
- poppler/Annot.h  |   21 +++++++++++++++++++++
+ poppler/Annot.cc | 34 ++++++++++++++++++++++++++++++++++
+ poppler/Annot.h  | 21 +++++++++++++++++++++
  2 files changed, 55 insertions(+)
 
 commit 6c83e06fb2eb77d0dbefd1ebfbcac3e5f0cbb622
@@ -35145,11 +38316,11 @@ Date:	Mon Dec 10 16:24:38 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- glib/poppler-page.cc |   11 +---
- poppler/Annot.cc     |  160
- ++++++++++++++++++++++++++++++++++++--------------
- poppler/Annot.h      |   54 ++++++++++++++---
- poppler/Form.cc      |    6 +-
+ glib/poppler-page.cc |  11 +---
+ poppler/Annot.cc     | 160
+ ++++++++++++++++++++++++++++++++++++---------------
+ poppler/Annot.h      |  54 ++++++++++++++---
+ poppler/Form.cc      |   6 +-
  4 files changed, 167 insertions(+), 64 deletions(-)
 
 commit fa0bb5bbea5bf2769c8b3084f78770b7781002eb
@@ -35160,11 +38331,11 @@ Date:	Mon Dec 10 15:41:38 2007 +0100
 
     Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com>
 
- poppler/Annot.cc |  613
- +++++++++++++++++++++++++++++++++++-------------------
- poppler/Annot.h  |  140 +++++++++++--
- poppler/Gfx.cc   |   21 +-
- poppler/Gfx.h	  |    5 +-
+ poppler/Annot.cc | 613
+ ++++++++++++++++++++++++++++++++++++-------------------
+ poppler/Annot.h  | 140 +++++++++++--
+ poppler/Gfx.cc   |  21 +-
+ poppler/Gfx.h	  |   5 +-
  4 files changed, 543 insertions(+), 236 deletions(-)
 
 commit e0f49fd5aef3c798798ad7e7dba55857bde1b4c0
@@ -35174,7 +38345,7 @@ Date:	Thu Dec 13 23:40:46 2007 +0100
     Some CJK charecters are displayed vertical glyphs incorrectly when
     horizontal mode
 
- poppler/GfxFont.cc |	46 +++++++++++++++++++++++++---------------------
+ poppler/GfxFont.cc | 46 +++++++++++++++++++++++++---------------------
  1 file changed, 25 insertions(+), 21 deletions(-)
 
 commit 85901922bf354a1268037d0b6ec5cbf14da979a1
@@ -35185,7 +38356,7 @@ Date:	Thu Dec 13 23:30:59 2007 +0100
 
     Fixes http://bugs.kde.org/show_bug.cgi?id=153949
 
- poppler/SplashOutputDev.cc |	23 ++++++++++++++++-------
+ poppler/SplashOutputDev.cc | 23 ++++++++++++++++-------
  1 file changed, 16 insertions(+), 7 deletions(-)
 
 commit f24259cddb9c5e02cf9d2071bfa0106f3e88bd59
@@ -35194,12 +38365,12 @@ Date:	Mon Dec 10 23:24:14 2007 +0100
 
     Display characters outside of unicode BMP with TT font
 
- fofi/FoFiTrueType.cc |   33 +++++++++++++++++++---
- fofi/FoFiTrueType.h  |    2 +-
- poppler/CMap.cc      |   34 +++++++++++++++++++++++
- poppler/CMap.h       |    4 +++
- poppler/GfxFont.cc   |   75
- +++++++++++++++++++++++++++++++-------------------
+ fofi/FoFiTrueType.cc | 33 ++++++++++++++++++++---
+ fofi/FoFiTrueType.h  |  2 +-
+ poppler/CMap.cc      | 34 ++++++++++++++++++++++++
+ poppler/CMap.h       |  4 +++
+ poppler/GfxFont.cc   | 75
+ ++++++++++++++++++++++++++++++++--------------------
  5 files changed, 115 insertions(+), 33 deletions(-)
 
 commit 7cbabbf378cf5a9c0411558ff02b44dec2040ea1
@@ -35208,7 +38379,7 @@ Date:	Mon Dec 10 22:00:30 2007 +0100
 
     Fix a crash when marked content properties operator is not a dict.
 
- poppler/Gfx.cc |    2 +-
+ poppler/Gfx.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e807f9c72c7f0c5cc0655918f676f4af54739442
@@ -35228,14 +38399,14 @@ Date:	Sun Dec 9 18:07:00 2007 +0100
     Patch by Adrian Johnson with two minor changes by me (one fordward
     declaration and a leak fix)
 
- poppler/Form.cc	  |    2 +-
- poppler/Gfx.cc		  |    2 +-
- poppler/OutputDev.cc	  |    2 +-
- poppler/OutputDev.h	  |    2 +-
- poppler/PDFDocEncoding.h |    4 ++
- poppler/TextOutputDev.cc |   98
- +++++++++++++++++++++++++++++++++++++++++++++-
- poppler/TextOutputDev.h  |   11 ++++++
+ poppler/Form.cc	  |  2 +-
+ poppler/Gfx.cc		  |  2 +-
+ poppler/OutputDev.cc	  |  2 +-
+ poppler/OutputDev.h	  |  2 +-
+ poppler/PDFDocEncoding.h |  4 ++
+ poppler/TextOutputDev.cc | 98
+ +++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/TextOutputDev.h  | 11 ++++++
  7 files changed, 116 insertions(+), 5 deletions(-)
 
 commit e2ea7430e7d6db50cbfdac34713915e5b0942a89
@@ -35247,7 +38418,7 @@ Date:	Sat Dec 8 23:21:34 2007 +0100
     We have them all over the place and we are not going to fix it as
     that'll be too much overhead when re-merging xpdf changes
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit acf70c666d4f534cd97de64d4378bf6399e31fd4
@@ -35256,7 +38427,7 @@ Date:	Thu Dec 6 23:58:26 2007 +0100
 
     Disable gtk tests if the user disabled glib frontend
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit bb0ec68f21d355081ff75aad641bc3809141e398
@@ -35273,7 +38444,7 @@ Date:	Tue Dec 4 19:11:13 2007 +1100
 
     Remove redundant check.
 
- poppler/PSOutputDev.cc |    2 +-
+ poppler/PSOutputDev.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 275afca4ef24020273df652ccfdf76c6994e9294
@@ -35284,9 +38455,9 @@ Date:	Sun Dec 2 19:45:16 2007 +1100
 
     Resolves bug 13338.
 
- poppler/PSOutputDev.cc |   81
- +++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/PSOutputDev.h	|    2 ++
+ poppler/PSOutputDev.cc | 81
+ +++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/PSOutputDev.h	|  2 ++
  2 files changed, 82 insertions(+), 1 deletion(-)
 
 commit 641edb83a457083c13f3e374f6ac6c570dd54d7f
@@ -35295,8 +38466,8 @@ Date:	Wed Nov 28 19:42:53 2007 +1100
 
     Minor API documentation update
 
- qt4/src/poppler-annotation.h |   81
- ++++++++++++++++++++++++++++++++++++++++--
+ qt4/src/poppler-annotation.h | 81
+ ++++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 79 insertions(+), 2 deletions(-)
 
 commit 3635ec6fcbc89daf633c03efb644df9031b80f59
@@ -35305,8 +38476,8 @@ Date:	Wed Nov 28 19:42:22 2007 +1100
 
     Update doxygen configuration file to version 1.5.3
 
- qt4/src/Doxyfile |  185
- +++++++++++++++++++++++++++++++++++++++++-------------
+ qt4/src/Doxyfile | 185
+ ++++++++++++++++++++++++++++++++++++++++++-------------
  1 file changed, 141 insertions(+), 44 deletions(-)
 
 commit 02c7ea6e1fd3e225de1eda231813f4db0ffb9fdb
@@ -35315,7 +38486,7 @@ Date:	Wed Nov 28 19:41:54 2007 +1100
 
     Fix off-by-one in printCommands path.
 
- poppler/Gfx.cc |    4 ++--
+ poppler/Gfx.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 74af7c1209f47ed39addf7fde3ea106a7c77a408
@@ -35324,7 +38495,7 @@ Date:	Sat Nov 24 18:12:00 2007 +0100
 
     Convert passwords from utf-8 to latin-1 when needed. Fixes bug #4557
 
- glib/poppler-document.cc |   16 ++++++++++++++--
+ glib/poppler-document.cc | 16 ++++++++++++++--
  1 file changed, 14 insertions(+), 2 deletions(-)
 
 commit 5a34cddf043cb484549cb411e034786a7d8688a3
@@ -35333,7 +38504,7 @@ Date:	Fri Nov 23 23:13:57 2007 +0100
 
     add a ignore
 
- glib/demo/.gitignore |    1 +
+ glib/demo/.gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 21a58562cc1e575ec3d81b6e34bfcb21306eb67f
@@ -35342,7 +38513,7 @@ Date:	Fri Nov 23 23:12:06 2007 +0100
 
     sscanf does not like null strings, so don't call it on empty qstrings
 
- qt/poppler-document.cc |    2 +-
+ qt/poppler-document.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 6f8451cf9d19f57f658d1568643ecb0f953e1075
@@ -35357,9 +38528,9 @@ Date:	Sun Nov 11 21:29:40 2007 -0500
     it should be
     closer than previously.
 
- poppler/CairoOutputDev.cc |  309
- +++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoOutputDev.h  |	8 +-
+ poppler/CairoOutputDev.cc | 309
+ ++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.h  |   8 +-
  2 files changed, 303 insertions(+), 14 deletions(-)
 
 commit b0fbfb0ac366434d7e4c0350a9be83ddda7b03cf
@@ -35370,9 +38541,9 @@ Date:	Sun Nov 11 16:06:16 2007 -0500
 
     Parse, store and notify the OutputDevices about these entries.
 
- poppler/Gfx.cc      |	 14 ++++++++++++++
- poppler/GfxState.h  |	  6 ++++++
- poppler/OutputDev.h |	  2 ++
+ poppler/Gfx.cc      | 14 ++++++++++++++
+ poppler/GfxState.h  |	6 ++++++
+ poppler/OutputDev.h |	2 ++
  3 files changed, 22 insertions(+)
 
 commit f6429b13a972f2deb25b3d3a9948dca024a54841
@@ -35381,7 +38552,9 @@ Date:	Sat Nov 10 14:08:09 2007 -0500
 
     Fix accidental mode change.
 
- 0 files changed
+ poppler/CairoFontEngine.cc | 0
+ poppler/CairoOutputDev.cc  | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
 
 commit 5797f50a99d1494767edc5928f9c3e9d927b946d
 Author: Jeff Muizelaar <jeff@infidigm.net>
@@ -35396,10 +38569,10 @@ Date:	Sat Nov 10 01:52:00 2007 -0500
     #12304 with the cairo backend. The problem persists with the splash
     backend.
 
- poppler/CairoFontEngine.cc |	56
- +++++++++++++++++++++++++++++++++++++++++---
- poppler/CairoFontEngine.h  |	 7 +++++-
- poppler/CairoOutputDev.cc  |	 8 +++++--
+ poppler/CairoFontEngine.cc | 56
+ +++++++++++++++++++++++++++++++++++++++++++---
+ poppler/CairoFontEngine.h  |  7 +++++-
+ poppler/CairoOutputDev.cc  |  8 +++++--
  3 files changed, 65 insertions(+), 6 deletions(-)
 
 commit 551212e55127c7e46d9aff3318015fd9b5385687
@@ -35410,7 +38583,7 @@ Date:	Sat Nov 10 11:56:15 2007 +0100
 
     Supported by Derek B. Noonburg
 
- poppler/GfxState.cc |	  4 ++--
+ poppler/GfxState.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 934a5ae45eb17bd0e2010be89f55510e8a69816b
@@ -35421,7 +38594,7 @@ Date:	Sat Nov 3 13:08:51 2007 -0400
 
     The code now also does proper rounding instead of just truncating.
 
- poppler/CairoOutputDev.cc |	3 ++-
+ poppler/CairoOutputDev.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 1b3f045a25e5d172357bc87c15ba591c8e1511a7
@@ -35431,7 +38604,7 @@ Date:	Thu Nov 8 23:34:07 2007 +0100
     Move another gmallocn to gmallocn_checkoverflow. Fixes crashes on
     incorrect pdf sent by Red Hat
 
- poppler/Stream.cc |   21 +++++++++++++++------
+ poppler/Stream.cc | 21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
 
 commit 944d327fd7036332a33b4ad6476ceca7a650ef6e
@@ -35448,9 +38621,9 @@ Date:	Wed Nov 7 23:51:58 2007 +0100
 
     merge ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch
 
- poppler/Stream.cc |  417
- ++++++++++++++++++++++++++++++-----------------------
- poppler/Stream.h  |   10 +-
+ poppler/Stream.cc | 417
+ +++++++++++++++++++++++++++++++-----------------------
+ poppler/Stream.h  |  10 +-
  2 files changed, 245 insertions(+), 182 deletions(-)
 
 commit c340255f46bc95b5f850abcd3d9bcdc8594199bb
@@ -35461,9 +38634,9 @@ Date:	Mon Nov 5 20:36:23 2007 +1100
 
     Suppress the noise a bit.
 
- qt4/.gitignore       |    1 +
- qt4/tests/.gitignore |    3 +++
- test/.gitignore      |    2 ++
+ qt4/.gitignore       | 1 +
+ qt4/tests/.gitignore | 3 +++
+ test/.gitignore      | 2 ++
  3 files changed, 6 insertions(+)
 
 commit cebf770379e7d71166e729aebf771a4ca291d48b
@@ -35478,9 +38651,8 @@ Date:	Mon Nov 5 20:31:18 2007 +1100
     characters as long as they are properly encoded (which the
     Qt4 front end does).
 
- qt4/tests/Makefile.am	    |	 7 ++++++-
- qt4/tests/check_search.cpp |	40
- ++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/Makefile.am	    |  7 ++++++-
+ qt4/tests/check_search.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
  2 files changed, 46 insertions(+), 1 deletion(-)
 
 commit 570fe464a2aae4f22d0b47cce73b8bc36b116e9f
@@ -35500,7 +38672,7 @@ Date:	Mon Nov 5 15:54:36 2007 +1100
     we could probably go interactive, and ask the user for
     a password.
 
- qt4/tests/test-poppler-qt4.cpp |    6 ++++++
+ qt4/tests/test-poppler-qt4.cpp | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 1c7b7a0c581b542945cac257202bbb819d33694c
@@ -35511,7 +38683,7 @@ Date:	Mon Nov 5 15:49:45 2007 +1100
 
     Also, this is a test of my git newbie-ness.
 
- qt4/src/poppler-form.h |    8 ++++----
+ qt4/src/poppler-form.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit b86fc565d175835cf27e9c8632da47a5e0b50237
@@ -35520,69 +38692,69 @@ Date:	Mon Nov 5 00:14:55 2007 +0100
 
     Fix FSF address
 
- glib/demo/fonts.c			  |    2 +-
- glib/demo/fonts.h			  |    2 +-
- glib/demo/forms.c			  |    2 +-
- glib/demo/forms.h			  |    2 +-
- glib/demo/info.c			  |    2 +-
- glib/demo/info.h			  |    2 +-
- glib/demo/links.c			  |    2 +-
- glib/demo/links.h			  |    2 +-
- glib/demo/main.c			  |    2 +-
- glib/demo/outline.c			  |    2 +-
- glib/demo/outline.h			  |    2 +-
- glib/demo/page.c			  |    2 +-
- glib/demo/page.h			  |    2 +-
- glib/demo/render.c			  |    2 +-
- glib/demo/render.h			  |    2 +-
- glib/demo/utils.c			  |    2 +-
- glib/demo/utils.h			  |    2 +-
- glib/poppler-action.cc			  |    2 +-
- glib/poppler-action.h			  |    2 +-
- glib/poppler-attachment.cc		  |    2 +-
- glib/poppler-attachment.h		  |    2 +-
- glib/poppler-document.cc		  |    2 +-
- glib/poppler-document.h		  |    2 +-
- glib/poppler-features.h.in		  |    2 +-
- glib/poppler-form-field.cc		  |    2 +-
- glib/poppler-form-field.h		  |    2 +-
- glib/poppler-page.cc			  |    2 +-
- glib/poppler-page.h			  |    2 +-
- glib/poppler.cc			  |    2 +-
- glib/poppler.h				  |    2 +-
- poppler/PageTransition.cc		  |    2 +-
- poppler/Sound.cc			  |    2 +-
- poppler/Sound.h			  |    2 +-
- qt/poppler-document.cc			  |    2 +-
- qt/poppler-fontinfo.cc			  |    2 +-
- qt/poppler-link-qt3.h			  |    2 +-
- qt/poppler-link.cc			  |    2 +-
- qt/poppler-page-transition-private.h	  |    2 +-
- qt/poppler-page-transition.cc		  |    2 +-
- qt/poppler-page-transition.h		  |    2 +-
- qt/poppler-page.cc			  |    2 +-
- qt/poppler-private.h			  |    2 +-
- qt/poppler-qt.h			  |    2 +-
- qt4/src/poppler-annotation-helper.h	  |    2 +-
- qt4/src/poppler-annotation-private.h	  |    2 +-
- qt4/src/poppler-annotation.cc		  |    2 +-
- qt4/src/poppler-annotation.h		  |    2 +-
- qt4/src/poppler-document.cc		  |    2 +-
- qt4/src/poppler-embeddedfile.cc	  |    2 +-
- qt4/src/poppler-fontinfo.cc		  |    2 +-
- qt4/src/poppler-form.cc		  |    2 +-
- qt4/src/poppler-form.h			  |    2 +-
- qt4/src/poppler-link-extractor-private.h |    2 +-
- qt4/src/poppler-link-extractor.cc	  |    2 +-
- qt4/src/poppler-link.cc		  |    2 +-
- qt4/src/poppler-link.h			  |    2 +-
- qt4/src/poppler-page-private.h		  |    2 +-
- qt4/src/poppler-page.cc		  |    2 +-
- qt4/src/poppler-private.h		  |    2 +-
- qt4/src/poppler-ps-converter.cc	  |    2 +-
- qt4/src/poppler-qt4.h			  |    2 +-
- qt4/src/poppler-sound.cc		  |    2 +-
- qt4/src/poppler-textbox.cc		  |    2 +-
+ glib/demo/fonts.c			  | 2 +-
+ glib/demo/fonts.h			  | 2 +-
+ glib/demo/forms.c			  | 2 +-
+ glib/demo/forms.h			  | 2 +-
+ glib/demo/info.c			  | 2 +-
+ glib/demo/info.h			  | 2 +-
+ glib/demo/links.c			  | 2 +-
+ glib/demo/links.h			  | 2 +-
+ glib/demo/main.c			  | 2 +-
+ glib/demo/outline.c			  | 2 +-
+ glib/demo/outline.h			  | 2 +-
+ glib/demo/page.c			  | 2 +-
+ glib/demo/page.h			  | 2 +-
+ glib/demo/render.c			  | 2 +-
+ glib/demo/render.h			  | 2 +-
+ glib/demo/utils.c			  | 2 +-
+ glib/demo/utils.h			  | 2 +-
+ glib/poppler-action.cc			  | 2 +-
+ glib/poppler-action.h			  | 2 +-
+ glib/poppler-attachment.cc		  | 2 +-
+ glib/poppler-attachment.h		  | 2 +-
+ glib/poppler-document.cc		  | 2 +-
+ glib/poppler-document.h		  | 2 +-
+ glib/poppler-features.h.in		  | 2 +-
+ glib/poppler-form-field.cc		  | 2 +-
+ glib/poppler-form-field.h		  | 2 +-
+ glib/poppler-page.cc			  | 2 +-
+ glib/poppler-page.h			  | 2 +-
+ glib/poppler.cc			  | 2 +-
+ glib/poppler.h				  | 2 +-
+ poppler/PageTransition.cc		  | 2 +-
+ poppler/Sound.cc			  | 2 +-
+ poppler/Sound.h			  | 2 +-
+ qt/poppler-document.cc			  | 2 +-
+ qt/poppler-fontinfo.cc			  | 2 +-
+ qt/poppler-link-qt3.h			  | 2 +-
+ qt/poppler-link.cc			  | 2 +-
+ qt/poppler-page-transition-private.h	  | 2 +-
+ qt/poppler-page-transition.cc		  | 2 +-
+ qt/poppler-page-transition.h		  | 2 +-
+ qt/poppler-page.cc			  | 2 +-
+ qt/poppler-private.h			  | 2 +-
+ qt/poppler-qt.h			  | 2 +-
+ qt4/src/poppler-annotation-helper.h	  | 2 +-
+ qt4/src/poppler-annotation-private.h	  | 2 +-
+ qt4/src/poppler-annotation.cc		  | 2 +-
+ qt4/src/poppler-annotation.h		  | 2 +-
+ qt4/src/poppler-document.cc		  | 2 +-
+ qt4/src/poppler-embeddedfile.cc	  | 2 +-
+ qt4/src/poppler-fontinfo.cc		  | 2 +-
+ qt4/src/poppler-form.cc		  | 2 +-
+ qt4/src/poppler-form.h			  | 2 +-
+ qt4/src/poppler-link-extractor-private.h | 2 +-
+ qt4/src/poppler-link-extractor.cc	  | 2 +-
+ qt4/src/poppler-link.cc		  | 2 +-
+ qt4/src/poppler-link.h			  | 2 +-
+ qt4/src/poppler-page-private.h		  | 2 +-
+ qt4/src/poppler-page.cc		  | 2 +-
+ qt4/src/poppler-private.h		  | 2 +-
+ qt4/src/poppler-ps-converter.cc	  | 2 +-
+ qt4/src/poppler-qt4.h			  | 2 +-
+ qt4/src/poppler-sound.cc		  | 2 +-
+ qt4/src/poppler-textbox.cc		  | 2 +-
  63 files changed, 63 insertions(+), 63 deletions(-)
 
 commit 37776afc6f8a5733b41da6fb0f45e7ace4edf737
@@ -35591,7 +38763,7 @@ Date:	Mon Nov 5 00:03:55 2007 +0100
 
     Update from http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
- COPYING |   27 +++++++++++++--------------
+ COPYING | 27 +++++++++++++--------------
  1 file changed, 13 insertions(+), 14 deletions(-)
 
 commit 34a90b35998b65539cf1e8f09194d45db71064a1
@@ -35600,7 +38772,7 @@ Date:	Sun Nov 4 14:03:35 2007 +0100
 
     Remove duplicate checking
 
- poppler/JBIG2Stream.cc |    8 --------
+ poppler/JBIG2Stream.cc | 8 --------
  1 file changed, 8 deletions(-)
 
 commit d694e1dd042fb97fbc62046b69cafe30d6f9ea58
@@ -35617,7 +38789,7 @@ Date:	Sun Nov 4 13:25:12 2007 +0100
 
     Require fontconfig >= 2.0 Fixes bug 9020
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 432e657a49cb097638a79e38c141088039572816
@@ -35639,7 +38811,7 @@ Date:	Mon Sep 17 19:15:21 2007 -0400
       n--;
     }
 
- goo/GooString.cc |   30 +++++++++++++++++-------------
+ goo/GooString.cc | 30 +++++++++++++++++-------------
  1 file changed, 17 insertions(+), 13 deletions(-)
 
 commit cb80112afed2c5b9642c3c43f1cc001ed88d08cb
@@ -35649,7 +38821,7 @@ Date:	Thu Nov 1 20:53:05 2007 +0100
     Do not try to parse directories when processing nameToUnicode
     dir. Fixes ugly warnings on mingw32
 
- poppler/GlobalParams.cc |    6 ++++--
+ poppler/GlobalParams.cc | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 commit ad6b888edff7b30be72df948c4052b9934a37705
@@ -35658,7 +38830,7 @@ Date:	Thu Nov 1 20:48:21 2007 +0100
 
     Add some castings to make it compile
 
- glib/test-poppler-glib.cc |	4 ++--
+ glib/test-poppler-glib.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit a968dcc759379f48265c91bea63ca4cf987d94a9
@@ -35667,11 +38839,11 @@ Date:	Wed Oct 31 23:53:39 2007 +0100
 
     Tests for passwords
 
- qt4/tests/Makefile.am		  |   13 +++++-
- qt4/tests/check_password.cpp	  |   87
- ++++++++++++++++++++++++++++++++++++++
- qt4/tests/stress-poppler-dir.cpp |   63 +++++++++++++++++++++++++++
- qt4/tests/test-poppler-qt4.cpp   |   15 ++++++-
+ qt4/tests/Makefile.am		  | 13 +++++-
+ qt4/tests/check_password.cpp	  | 87
+ ++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/stress-poppler-dir.cpp | 63 +++++++++++++++++++++++++++++
+ qt4/tests/test-poppler-qt4.cpp   | 15 ++++++-
  4 files changed, 175 insertions(+), 3 deletions(-)
 
 commit 7b7a08863a8278dee7aa1fe7789cf72223c26b35
@@ -35680,8 +38852,8 @@ Date:	Wed Oct 31 23:53:27 2007 +0100
 
     Improve documentation
 
- qt4/src/poppler-qt4.h |   64
- ++++++++++++++++++++++++++++++++++++++++++-------
+ qt4/src/poppler-qt4.h | 64
+ ++++++++++++++++++++++++++++++++++++++++++++-------
  1 file changed, 56 insertions(+), 8 deletions(-)
 
 commit 96493c9409186a7e964e894c7f730962b6995fd7
@@ -35690,8 +38862,8 @@ Date:	Wed Oct 31 23:51:25 2007 +0100
 
     remove old file
 
- glib/test-poppler-glib.c |  514
- ----------------------------------------------
+ glib/test-poppler-glib.c | 514
+ -----------------------------------------------
  1 file changed, 514 deletions(-)
 
 commit 951a05f7a11af4a44e4cb85a015939d6a3e513f5
@@ -35700,7 +38872,7 @@ Date:	Sat Oct 27 12:33:22 2007 +0200
 
     Remove fordward declaration of a non-existant class
 
- poppler/Form.h |    1 -
+ poppler/Form.h | 1 -
  1 file changed, 1 deletion(-)
 
 commit 289679405ab143bc2106cf269227c514a1602e56
@@ -35713,7 +38885,7 @@ Date:	Thu Oct 25 22:16:10 2007 -0400
     expect it to. Special case that behaviour so that we do the
     same thing.
 
- poppler/Annot.cc |   15 ++++++++++++---
+ poppler/Annot.cc | 15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
 
 commit ab0a6c37faf9916edcd70e128d9f2654eb795ace
@@ -35726,10 +38898,10 @@ Date:	Thu Oct 25 20:56:58 2007 +0200
     Moved test-poppler-glib.c to test-poppler-glib.cc to get the correct
     compiler
 
- configure.ac		   |	1 +
- glib/Makefile.am	   |	2 +-
- glib/test-poppler-glib.cc |  520
- +++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac		   |   1 +
+ glib/Makefile.am	   |   2 +-
+ glib/test-poppler-glib.cc | 520
+ ++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 522 insertions(+), 1 deletion(-)
 
 commit 6bd637dc135045b20abf024d394538d7a3160795
@@ -35747,9 +38919,9 @@ Date:	Tue Oct 23 23:26:21 2007 +0200
     Provide setters for some methods that only had getters. Fixes
     bug 12894
 
- poppler/GlobalParams.cc |   49
- +++++++++++++++++++++++++++++++++++++++++++++++
- poppler/GlobalParams.h  |    7 +++++++
+ poppler/GlobalParams.cc | 49
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/GlobalParams.h  |  7 +++++++
  2 files changed, 56 insertions(+)
 
 commit 25b273db677815c8df11e52fe9df29fe857a8a88
@@ -35765,8 +38937,8 @@ Date:	Mon Oct 22 23:01:37 2007 -0400
     to match. Now, instead, we draw nothing which matches the behaviour of
     acroread.
 
- poppler/Gfx.cc     |	 4 ++++
- poppler/GfxFont.cc |	 4 ++++
+ poppler/Gfx.cc     | 4 ++++
+ poppler/GfxFont.cc | 4 ++++
  2 files changed, 8 insertions(+)
 
 commit 57331767ed5306eba1f9bf60e48fc88debdc2198
@@ -35775,8 +38947,8 @@ Date:	Mon Oct 22 23:33:59 2007 +0200
 
     builddir != srcdir fixes by Christian Persch <chpe gnome org>
 
- autogen.sh	       |    7 ++++---
- glib/demo/Makefile.am |    1 +
+ autogen.sh	       | 7 ++++---
+ glib/demo/Makefile.am | 1 +
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 commit 2a333e5a618b5c92f3c703816b950321f25d3aab
@@ -35792,15 +38964,15 @@ Date:	Mon Oct 22 22:14:43 2007 +0200
     That means some clipRes = state->clip->testRect but we win more
     robustness against broken pdf that specify HUGE fonts
 
- splash/Splash.cc	|  207
- ++++++++++++++++++++++++------------------------
- splash/Splash.h	|    4 +-
- splash/SplashFTFont.cc |   23 +++++-
- splash/SplashFTFont.h	|    4 +-
- splash/SplashFont.cc	|   29 +++++--
- splash/SplashFont.h	|    5 +-
- splash/SplashT1Font.cc |   11 ++-
- splash/SplashT1Font.h	|    4 +-
+ splash/Splash.cc	| 207
+ ++++++++++++++++++++++++-------------------------
+ splash/Splash.h	|   4 +-
+ splash/SplashFTFont.cc |  23 +++++-
+ splash/SplashFTFont.h	|   4 +-
+ splash/SplashFont.cc	|  29 +++++--
+ splash/SplashFont.h	|   5 +-
+ splash/SplashT1Font.cc |  11 ++-
+ splash/SplashT1Font.h	|   4 +-
  8 files changed, 162 insertions(+), 125 deletions(-)
 
 commit cf785cd12ae77e8dd778ed043584f8f26efe675f
@@ -35810,8 +38982,8 @@ Date:	Mon Oct 22 21:59:35 2007 +0200
     Add gmallocn_checkoverflow, it's the same as gmallocn but returns
     NULL on overflow instead of doing exit()
 
- goo/gmem.cc |	 18 ++++++++++++++++++
- goo/gmem.h  |	  3 +++
+ goo/gmem.cc | 18 ++++++++++++++++++
+ goo/gmem.h  |	3 +++
  2 files changed, 21 insertions(+)
 
 commit 37e16ac301a35ceca2e3535f8c6100d4cf723c82
@@ -35821,7 +38993,7 @@ Date:	Mon Oct 22 21:54:02 2007 +0200
     exit(1) is bad in library code, use the src.abort method to describe
     failure
 
- poppler/DCTStream.cc |    3 ++-
+ poppler/DCTStream.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit dbe975c129999a3efceb1c86518fa6fda74f685c
@@ -35830,7 +39002,7 @@ Date:	Mon Oct 22 11:25:37 2007 +0200
 
     Fix a crash with invalid TrueType fonts
 
- fofi/FoFiTrueType.cc |   10 ++++++----
+ fofi/FoFiTrueType.cc | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 commit 8bfe30a48fd7021591ab307bd51f86c06ff202b9
@@ -35839,7 +39011,7 @@ Date:	Fri Oct 19 15:46:50 2007 +0200
 
     Do not generate appearance stream for radio button that are not active
 
- poppler/Annot.cc |    3 ++-
+ poppler/Annot.cc | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 commit 1a531dcfee1c6fc79a414c38cbe7327fbf9a59d8
@@ -35848,7 +39020,7 @@ Date:	Fri Oct 19 13:12:24 2007 +0200
 
     Fix a crash with invalid embedded fonts
 
- poppler/CairoFontEngine.cc |	 6 ++++++
+ poppler/CairoFontEngine.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit e1740278457e512676b623bcdf9968193f0a8d7b
@@ -35857,8 +39029,8 @@ Date:	Fri Oct 19 12:21:54 2007 +0200
 
     Do not draw annotations when rendering for printing
 
- glib/poppler-page.cc |   25 ++++++++++++++++++++++---
- poppler/Annot.h      |    2 ++
+ glib/poppler-page.cc | 25 ++++++++++++++++++++++---
+ poppler/Annot.h      |  2 ++
  2 files changed, 24 insertions(+), 3 deletions(-)
 
 commit a4d25f79dfc1a7e4998e2e113ef92312bd4af553
@@ -35871,7 +39043,7 @@ Date:	Tue Oct 16 15:24:08 2007 +0200
     dictionary.
     See evince bug: http://bugzilla.gnome.org/show_bug.cgi?id=486957
 
- poppler/Form.cc |    2 +-
+ poppler/Form.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 03e1da99f7393fb1103643311b0b5af7b875e09c
@@ -35883,8 +39055,8 @@ Date:	Sat Oct 13 19:38:15 2007 -0400
     The implementation initializes fill_pattern and stroke_pattern
     to black matching SplashOutputDev. This fixes #12504.
 
- poppler/CairoOutputDev.cc |	9 +++++++++
- poppler/CairoOutputDev.h  |	2 +-
+ poppler/CairoOutputDev.cc | 9 +++++++++
+ poppler/CairoOutputDev.h  | 2 +-
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 825c942d46e0c3e254028441015c5dd8440cc734
@@ -35893,7 +39065,7 @@ Date:	Fri Oct 12 13:47:09 2007 +0200
 
     Copy the embeddef file description string correctly
 
- poppler/Catalog.cc |	 3 +--
+ poppler/Catalog.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 5e60da78695eff44cc10dbce46ef170727f682b1
@@ -35902,8 +39074,8 @@ Date:	Fri Oct 12 13:46:52 2007 +0200
 
     Correctly delete the embedded file stream
 
- qt4/src/poppler-embeddedfile.cc |    1 +
- qt4/src/poppler-private.h	 |    2 +-
+ qt4/src/poppler-embeddedfile.cc | 1 +
+ qt4/src/poppler-private.h	 | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit 1627fbbde8be01af3bdd2583f3439897a37d5215
@@ -35917,7 +39089,7 @@ Date:	Sat Oct 6 23:27:40 2007 -0400
     and height which is
     wrong when width != maskWidth or heigh != maskHeight. Fixes #12668.
 
- poppler/CairoOutputDev.cc |	4 ++--
+ poppler/CairoOutputDev.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 3156d560c5eaf6970da422d0b09fd2e95bfe6d1d
@@ -35927,7 +39099,7 @@ Date:	Fri Oct 5 11:34:01 2007 +0200
     Fix a crash when Form Fields array contains references
     to non existent objects. Fixes bug #11865
 
- poppler/Form.cc |    9 +++++++++
+ poppler/Form.cc | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit f0b5e6286e94c6153c8247b5fae63a18622c48d3
@@ -35936,7 +39108,7 @@ Date:	Thu Oct 4 15:22:01 2007 +0200
 
     Do not return unknown field type for signature form fields
 
- glib/poppler-form-field.cc |	 2 ++
+ glib/poppler-form-field.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 498fd7fb99b01a879d07e2ad12c0b9462a8fc438
@@ -35952,9 +39124,9 @@ Date:	Thu Oct 4 12:36:39 2007 +0200
     printing=gTrue to
     displaySlice.
 
- glib/poppler-page.cc |  135
- ++++++++++++++++++++++++++++++++++++++++----------
- glib/poppler-page.h  |   10 ++++
+ glib/poppler-page.cc | 135
+ +++++++++++++++++++++++++++++++++++++++++----------
+ glib/poppler-page.h  |  10 ++++
  2 files changed, 119 insertions(+), 26 deletions(-)
 
 commit 56af69787c78c2edbb69266e86a5a5b639ca6d3e
@@ -35967,7 +39139,7 @@ Date:	Wed Oct 3 23:02:25 2007 -0400
     This situation was caused by the fixes for bug #11413. I'm not sure
     it's the best thing to do, but it seems better.
 
- poppler/GfxFont.cc |	19 +++++++++++++++++++
+ poppler/GfxFont.cc | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 commit 3d0df46908379bce1d196b9dc41153b1adb5f725
@@ -35976,7 +39148,7 @@ Date:	Wed Oct 3 19:43:55 2007 +0200
 
     Fix compile warning
 
- glib/test-poppler-glib.c |    2 ++
+ glib/test-poppler-glib.c | 2 ++
  1 file changed, 2 insertions(+)
 
 commit aba29e12528025c2cc71bf46e02e76ac4db2b193
@@ -35985,12 +39157,12 @@ Date:	Fri Sep 28 21:01:50 2007 +0200
 
     Add forms demo to glib poppler demo
 
- glib/demo/Makefile.am |    2 +
- glib/demo/forms.c     |  489
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/forms.h     |   31 ++++
- glib/demo/main.c      |    8 +-
- glib/demo/utils.c     |    1 -
+ glib/demo/Makefile.am |   2 +
+ glib/demo/forms.c     | 489
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/forms.h     |  31 ++++
+ glib/demo/main.c      |   8 +-
+ glib/demo/utils.c     |   1 -
  5 files changed, 527 insertions(+), 4 deletions(-)
 
 commit d0c0f26d2c95232c216e3daa15e98a3aff14ac27
@@ -36007,7 +39179,7 @@ Date:	Tue Sep 25 16:13:51 2007 -0700
 
     Silence deprecation warnings - annoying with msvc 2005.
 
- makefile.vc |	  2 +-
+ makefile.vc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 59d55f7371bee81c9392fa2d4174ceffaacde471
@@ -36016,7 +39188,7 @@ Date:	Tue Sep 25 01:21:19 2007 -0700
 
     Fix misleading comment.
 
- goo/GooTimer.h |    2 +-
+ goo/GooTimer.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c36d8afc984795aca0a12a94ec7668092067db82
@@ -36029,7 +39201,7 @@ Date:	Tue Sep 25 00:32:29 2007 -0700
 
     This reverts commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec.
 
- poppler/XRef.cc |   25 +++++++++++++++++++++----
+ poppler/XRef.cc | 25 +++++++++++++++++++++----
  1 file changed, 21 insertions(+), 4 deletions(-)
 
 commit ff25e83abae1ca17e2e7dd6f20946026fca69fff
@@ -36038,10 +39210,10 @@ Date:	Mon Sep 24 23:57:25 2007 -0700
 
     Make perf-test compile on unix as well.
 
- test/Makefile.am		 |   16 +++++-
- test/perf-test-preview-dummy.cc |    1 +
- test/perf-test.cc		 |  104
- ++++++++++++++++-----------------------
+ test/Makefile.am		 |  16 ++++++-
+ test/perf-test-preview-dummy.cc |   1 +
+ test/perf-test.cc		 | 104
+ +++++++++++++++++-----------------------
  3 files changed, 59 insertions(+), 62 deletions(-)
 
 commit 70f3bf42b3028d9a2e4aefdc2e1a458b3c77b0e7
@@ -36050,7 +39222,7 @@ Date:	Mon Sep 24 21:26:54 2007 -0700
 
     Let perf-test.cc manage lifetime of rendered bitmap.
 
- test/perf-test-preview-win.cc |    7 -------
+ test/perf-test-preview-win.cc | 7 -------
  1 file changed, 7 deletions(-)
 
 commit b622b252cba068a15eae77df5deb261dd98affaf
@@ -36059,7 +39231,7 @@ Date:	Mon Sep 24 21:20:12 2007 -0700
 
     Disable my_error for now - seems to corrupt memory.
 
- test/perf-test.cc |	2 ++
+ test/perf-test.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit bde8c9669ca6b43cb6a664bd14df164a718041ea
@@ -36068,7 +39240,7 @@ Date:	Mon Sep 24 21:08:58 2007 -0700
 
     Con't copy the file unless COPY_FILE is defined.
 
- test/perf-test.cc |   11 ++++++++++-
+ test/perf-test.cc | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 commit bf9b46b012c64624818a2110af7c4b7e3b419728
@@ -36077,7 +39249,7 @@ Date:	Mon Sep 24 20:13:54 2007 -0700
 
     Respect -loadonly cmd-line arg.
 
- test/perf-test.cc |	2 ++
+ test/perf-test.cc | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 2f664b654ca19135f0f8a0fe89872b9e0d526fa2
@@ -36086,8 +39258,8 @@ Date:	Mon Sep 24 19:41:45 2007 -0700
 
     Fix msvc debug build. Fix bitmap leak in perf-test.
 
- makefile.vc	   |	6 ++++--
- test/perf-test.cc |	1 +
+ makefile.vc	   | 6 ++++--
+ test/perf-test.cc | 1 +
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 05d41cd5aec39b4e3c8949445a9986e5ca8b50dd
@@ -36096,8 +39268,8 @@ Date:	Mon Sep 24 08:10:37 2007 -0700
 
     Use GooTimer instead of my own timer.
 
- test/perf-test.cc |   98
- +++++------------------------------------------------
+ test/perf-test.cc | 98
+ +++++--------------------------------------------------
  1 file changed, 8 insertions(+), 90 deletions(-)
 
 commit 05fbce5b6657e883ece9054c79576b25271a05a4
@@ -36106,10 +39278,10 @@ Date:	Mon Sep 24 08:01:11 2007 -0700
 
     Make GooTimer work for Windows/msvc build.
 
- goo/GooTimer.cc |   69
- +++++++++++++++++++++++++++++++++++++------------------
- goo/GooTimer.h  |   28 +++++++++++++---------
- poppler/Gfx.cc  |   11 ++-------
+ goo/GooTimer.cc | 69
+ +++++++++++++++++++++++++++++++++++++++------------------
+ goo/GooTimer.h  | 28 ++++++++++++++---------
+ poppler/Gfx.cc  | 11 ++-------
  3 files changed, 66 insertions(+), 42 deletions(-)
 
 commit 6347915085a487da08d39a859f4261fa812dab09
@@ -36118,8 +39290,8 @@ Date:	Mon Sep 24 01:08:17 2007 -0700
 
     Add Error.cc in msvc build and use setErrorFunction in perf-test.
 
- makefile.vc	   |	3 +--
- test/perf-test.cc |   10 +++++-----
+ makefile.vc	   |  3 +--
+ test/perf-test.cc | 10 +++++-----
  2 files changed, 6 insertions(+), 7 deletions(-)
 
 commit ed01b3965c57ce2a4eabf9c46b5319ea627d3324
@@ -36131,7 +39303,7 @@ Date:	Mon Sep 24 01:03:09 2007 -0700
     Also enable this code for Windows, since CDECL was what
     was throwing msvc off.
 
- poppler/Error.cc |   12 +++---------
+ poppler/Error.cc | 12 +++---------
  1 file changed, 3 insertions(+), 9 deletions(-)
 
 commit 71fb15f8bd131a13d8cf0f394fe601cfbb6e1772
@@ -36140,9 +39312,9 @@ Date:	Mon Sep 24 00:38:29 2007 -0700
 
     Even less compiler warnings.
 
- poppler/CairoOutputDev.cc |	6 +++---
- qt/poppler-page.cc	   |	3 +++
- utils/HtmlOutputDev.cc    |   10 ++++++----
+ poppler/CairoOutputDev.cc |  6 +++---
+ qt/poppler-page.cc	   |  3 +++
+ utils/HtmlOutputDev.cc    | 10 ++++++----
  3 files changed, 12 insertions(+), 7 deletions(-)
 
 commit 7ba3f198a0651d2a7c91b7d9e10a5173dc3de0a3
@@ -36151,11 +39323,11 @@ Date:	Mon Sep 24 00:32:37 2007 -0700
 
     Even less compiler warnings.
 
- qt/poppler-document.cc      |	  8 ++++++++
- qt/poppler-private.h	     |	  8 --------
- qt4/src/poppler-document.cc |	 10 ++++++++++
- qt4/src/poppler-form.cc     |	 15 +++++++++++++++
- qt4/src/poppler-private.h   |	 25 -------------------------
+ qt/poppler-document.cc      |	8 ++++++++
+ qt/poppler-private.h	     |	8 --------
+ qt4/src/poppler-document.cc | 10 ++++++++++
+ qt4/src/poppler-form.cc     | 15 +++++++++++++++
+ qt4/src/poppler-private.h   | 25 -------------------------
  5 files changed, 33 insertions(+), 33 deletions(-)
 
 commit ab1059f594cb9fccd8568ca2a535a363c7521daa
@@ -36164,7 +39336,7 @@ Date:	Mon Sep 24 00:14:01 2007 -0700
 
     Don't break aliasing.
 
- poppler/GlobalParams.cc |   40 ++++++++++++++++++----------------------
+ poppler/GlobalParams.cc | 40 ++++++++++++++++++----------------------
  1 file changed, 18 insertions(+), 22 deletions(-)
 
 commit 71c47b30adf687a0bcece22834933267053360de
@@ -36173,7 +39345,7 @@ Date:	Sun Sep 23 23:49:31 2007 -0700
 
     Reduce compiler warnings.
 
- poppler/JBIG2Stream.cc |   16 ++++++++++++----
+ poppler/JBIG2Stream.cc | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 commit 8466d94929844c976bbad8bb7d1ea7f7f77cc196
@@ -36182,7 +39354,7 @@ Date:	Sun Sep 23 23:34:52 2007 -0700
 
     Reduce compiler warnings. Tabs to spaces.
 
- fofi/FoFiType1C.cc |	30 +++++++++++++++---------------
+ fofi/FoFiType1C.cc | 30 +++++++++++++++---------------
  1 file changed, 15 insertions(+), 15 deletions(-)
 
 commit c53b8ccfba6fa4345086493f9e44212721c11d0a
@@ -36191,9 +39363,9 @@ Date:	Sun Sep 23 23:23:34 2007 -0700
 
     Reduce number of compiler warnings.
 
- poppler/CharCodeToUnicode.cc |    2 +-
- poppler/Gfx.cc		      |    6 ++----
- poppler/PageLabelInfo.cc     |    2 ++
+ poppler/CharCodeToUnicode.cc | 2 +-
+ poppler/Gfx.cc		      | 6 ++----
+ poppler/PageLabelInfo.cc     | 2 ++
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 commit abede2a06c5c9dc97b40479deda49621458f1171
@@ -36202,11 +39374,11 @@ Date:	Sun Sep 23 23:03:36 2007 -0700
 
     Reduce number of compiler warnings.
 
- glib/poppler-action.cc        |    1 -
- glib/poppler-document.cc      |    9 ++-------
- glib/poppler-page.cc	       |    3 +--
- qt/poppler-document.cc        |    1 -
- qt4/src/poppler-annotation.cc |   16 +++++++++++++---
+ glib/poppler-action.cc        |  1 -
+ glib/poppler-document.cc      |  9 ++-------
+ glib/poppler-page.cc	       |  3 +--
+ qt/poppler-document.cc        |  1 -
+ qt4/src/poppler-annotation.cc | 16 +++++++++++++---
  5 files changed, 16 insertions(+), 14 deletions(-)
 
 commit 60f5bcea4a920441e25ae11d677636242aabb2db
@@ -36215,7 +39387,7 @@ Date:	Sun Sep 23 22:48:06 2007 -0700
 
     Remove unused variables.
 
- utils/pdftoppm.cc |	2 +-
+ utils/pdftoppm.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3179eee44eb0afbc642675268b9a4abb16ccdde3
@@ -36224,7 +39396,7 @@ Date:	Sun Sep 23 22:47:21 2007 -0700
 
     Remove unused variables.
 
- utils/HtmlOutputDev.cc |   23 -----------------------
+ utils/HtmlOutputDev.cc | 23 -----------------------
  1 file changed, 23 deletions(-)
 
 commit e9dc379190aa3166870d0b11a05ccc4e9dad2706
@@ -36233,7 +39405,7 @@ Date:	Sun Sep 23 22:41:59 2007 -0700
 
     Remove unused variables.
 
- poppler/ArthurOutputDev.cc |	16 +++++-----------
+ poppler/ArthurOutputDev.cc | 16 +++++-----------
  1 file changed, 5 insertions(+), 11 deletions(-)
 
 commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec
@@ -36244,7 +39416,7 @@ Date:	Sun Sep 23 22:28:16 2007 -0700
     which, due to type promotions, if a is int, is equivalent to a < 0;
     fix problems revealed by the change
 
- poppler/XRef.cc |   25 ++++---------------------
+ poppler/XRef.cc | 25 ++++---------------------
  1 file changed, 4 insertions(+), 21 deletions(-)
 
 commit 5a1f670a4d16affeed86cdf643ab22f481caa3a5
@@ -36253,7 +39425,7 @@ Date:	Sun Sep 23 20:42:59 2007 -0700
 
     ignore *.o files
 
- .gitignore |	 1 +
+ .gitignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit c156aed7234f82dea4cb384c1b8a7acdd34545be
@@ -36262,7 +39434,7 @@ Date:	Sun Sep 23 20:41:19 2007 -0700
 
     remove unused variables
 
- poppler/ABWOutputDev.cc |   10 ++--------
+ poppler/ABWOutputDev.cc | 10 ++--------
  1 file changed, 2 insertions(+), 8 deletions(-)
 
 commit d0bdef4752be5fa609a0766ee87aa54d51611d9a
@@ -36271,7 +39443,23 @@ Date:	Sat Sep 22 13:38:03 2007 -0700
 
     undo accidental changes to file permissions
 
- 0 files changed
+ msvc/poppler/poppler-config.h	 | 0
+ poppler/Annot.cc		 | 0
+ poppler/CairoFontEngine.cc	 | 0
+ poppler/CairoOutputDev.cc	 | 0
+ poppler/Catalog.cc		 | 0
+ poppler/Form.cc		 | 0
+ poppler/GfxFont.cc		 | 0
+ poppler/GfxState.cc		 | 0
+ poppler/Page.cc		 | 0
+ poppler/SplashOutputDev.cc	 | 0
+ poppler/TextOutputDev.cc	 | 0
+ splash/Splash.cc		 | 0
+ splash/SplashFTFontEngine.cc	 | 0
+ test/perf-test-preview-dummy.cc | 0
+ test/perf-test-preview-win.cc	 | 0
+ test/perf-test.cc		 | 0
+ 16 files changed, 0 insertions(+), 0 deletions(-)
 
 commit 6c69473f2f4a49757614ddd249e65bb7a13c63c1
 Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
@@ -36279,7 +39467,8 @@ Date:	Fri Sep 21 08:09:53 2007 -0700
 
     undo accidental mode change
 
- 0 files changed
+ makefile.vc | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
 
 commit e7e386e7ce8cb8eb8a7037ebdaa601524d332ae7
 Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)>
@@ -36287,9 +39476,9 @@ Date:	Fri Sep 21 08:08:53 2007 -0700
 
     more simplification by removing unneded code
 
- makefile.vc	   |	2 +-
- test/perf-test.cc |   60
- ++++++++---------------------------------------------
+ makefile.vc	   |  2 +-
+ test/perf-test.cc | 60
+ +++++++++----------------------------------------------
  2 files changed, 10 insertions(+), 52 deletions(-)
 
 commit 3e10604637ec193269a3155985476d3b83dc7d62
@@ -36298,8 +39487,8 @@ Date:	Fri Sep 21 07:48:38 2007 -0700
 
     for portability use bool/true/false instead of BOOL/TRUE/FALSE
 
- test/perf-test.cc |  176
- ++++++++++++++++++++++++++---------------------------
+ test/perf-test.cc | 176
+ ++++++++++++++++++++++++++----------------------------
  1 file changed, 86 insertions(+), 90 deletions(-)
 
 commit 634718936f2a95fac2a9d12fcea483b3d0ca8fa6
@@ -36308,11 +39497,11 @@ Date:	Fri Sep 21 07:41:14 2007 -0700
 
     simplify perf-test
 
- test/perf-test-pdf-engine.h   |   78
- -----------------------------------------
- test/perf-test-preview-win.cc |    5 ++-
- test/perf-test.cc	       |   75
- +++++++++++++++++++++++++++++++++++++--
+ test/perf-test-pdf-engine.h   | 78
+ -------------------------------------------
+ test/perf-test-preview-win.cc |  5 ++-
+ test/perf-test.cc	       | 75
+ +++++++++++++++++++++++++++++++++++++++--
  3 files changed, 75 insertions(+), 83 deletions(-)
 
 commit 617550199762fab42ca2e202e641e047b3efbac0
@@ -36321,11 +39510,11 @@ Date:	Fri Sep 21 05:20:16 2007 -0700
 
     simplify perf-test code
 
- test/perf-test-pdf-engine.h	 |   67 +++--------------------
- test/perf-test-preview-dummy.cc |    3 +-
- test/perf-test-preview-win.cc	 |   80 +++++++++++++++++++++++----
- test/perf-test.cc		 |  114
- ++++-----------------------------------
+ test/perf-test-pdf-engine.h	 |  67 +++--------------------
+ test/perf-test-preview-dummy.cc |   3 +-
+ test/perf-test-preview-win.cc	 |  80 ++++++++++++++++++++++++----
+ test/perf-test.cc		 | 114
+ ++++------------------------------------
  4 files changed, 86 insertions(+), 178 deletions(-)
 
 commit fb5bf808b88992c1772a10e4ed9fe788fb618417
@@ -36334,8 +39523,8 @@ Date:	Fri Sep 21 03:03:26 2007 -0700
 
     more msvc build fixes
 
- makefile.vc	   |	2 +-
- test/perf-test.cc |	4 ++++
+ makefile.vc	   | 2 +-
+ test/perf-test.cc | 4 ++++
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 60829b08a7440f36014f68ec54bee7a742412738
@@ -36344,8 +39533,8 @@ Date:	Fri Sep 21 03:02:34 2007 -0700
 
     msvc build fixes
 
- msvc/poppler/poppler-config.h |  143
- +++++++++++++++++++++++++++++++++++++++++
+ msvc/poppler/poppler-config.h | 143
+ ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 143 insertions(+)
 
 commit 853c22a174bae81139edc9aeded7f26ae2655cef
@@ -36354,8 +39543,8 @@ Date:	Thu Sep 20 23:21:35 2007 -0700
 
     add pre-made config.h for msvc build
 
- msvc/config.h |   62
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ msvc/config.h | 62
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 62 insertions(+)
 
 commit 31c43b118bd4372134018be6f6693f77d1f6a39b
@@ -36364,9 +39553,9 @@ Date:	Thu Sep 20 22:10:09 2007 -0700
 
     remove unused variables
 
- poppler/CairoFontEngine.cc   |    6 ++----
- poppler/CairoOutputDev.cc    |   14 ++------------
- splash/SplashFTFontEngine.cc |    2 ++
+ poppler/CairoFontEngine.cc   |  6 ++----
+ poppler/CairoOutputDev.cc    | 14 ++------------
+ splash/SplashFTFontEngine.cc |  2 ++
  3 files changed, 6 insertions(+), 16 deletions(-)
 
 commit 01b99f60e36dd955817f23911ef38947360f61f7
@@ -36375,9 +39564,9 @@ Date:	Thu Sep 20 21:14:17 2007 -0700
 
     remove unused variables
 
- poppler/GfxState.cc	    |	11 ++---------
- poppler/SplashOutputDev.cc |	 9 +++------
- poppler/TextOutputDev.cc   |	 3 ---
+ poppler/GfxState.cc	    | 11 ++---------
+ poppler/SplashOutputDev.cc |  9 +++------
+ poppler/TextOutputDev.cc   |  3 ---
  3 files changed, 5 insertions(+), 18 deletions(-)
 
 commit 7c406400532d68524a43cf963d894d3c4b269400
@@ -36386,11 +39575,11 @@ Date:	Thu Sep 20 20:57:44 2007 -0700
 
     remove unused variables
 
- poppler/Catalog.cc |	 1 -
- poppler/Form.cc    |	 5 -----
- poppler/GfxFont.cc |	 6 ++----
- poppler/Page.cc    |	 2 +-
- splash/Splash.cc   |	 5 ++++-
+ poppler/Catalog.cc | 1 -
+ poppler/Form.cc    | 5 -----
+ poppler/GfxFont.cc | 6 ++----
+ poppler/Page.cc    | 2 +-
+ splash/Splash.cc   | 5 ++++-
  5 files changed, 7 insertions(+), 12 deletions(-)
 
 commit 70f23389c97b1870b7311d97322cdd16b580a79d
@@ -36400,7 +39589,7 @@ Date:	Thu Sep 20 20:23:59 2007 -0700
     don't silence warnings about unused variables/functions to keep
     programmers honest
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit cdb6fcf98137473efd993e1374a6f010e9db67db
@@ -36409,7 +39598,7 @@ Date:	Thu Sep 20 20:00:56 2007 -0700
 
     Remove unused variables
 
- poppler/Annot.cc |    5 ++---
+ poppler/Annot.cc | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 commit 0e76b49ac852a5a7ebae4c1f67b153e0b7c9f905
@@ -36418,8 +39607,8 @@ Date:	Tue Sep 18 01:04:50 2007 -0700
 
     Explain how to compile on Windows using msvc makefile.
 
- README.windows |   63
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ README.windows | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 63 insertions(+)
 
 commit c002b4dc75b2688ffe8a734cf3e15f5891797842
@@ -36431,8 +39620,8 @@ Date:	Tue Sep 18 00:04:47 2007 -0700
     Add native msvc windows makefile and pre-made
     config.h for windows in msvc directory.
 
- makefile.vc |	149
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ makefile.vc | 149
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 149 insertions(+)
 
 commit 1f33fc58201c92120c587189d2e0e819f83167da
@@ -36464,7 +39653,7 @@ Date:	Mon Sep 17 20:28:38 2007 -0400
     the 302 merge
     but this code was not updated. Found by Matthew Woehlke.
 
- qt4/src/poppler-document.cc |	  4 +---
+ qt4/src/poppler-document.cc | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 commit 2a495f19d4465e15fd2fa96656d904315c79a443
@@ -36473,9 +39662,9 @@ Date:	Mon Sep 17 16:52:45 2007 -0400
 
     Simplify ChangeLog rule a bit.
 
- ChangeLog.mk |   81
- ----------------------------------------------------------
- Makefile.am  |    7 ++---
+ ChangeLog.mk | 81
+ ------------------------------------------------------------
+ Makefile.am  |  7 +++---
  2 files changed, 4 insertions(+), 84 deletions(-)
 
 commit 7d5abbeec55e4b90b139671d96cfdf58bdab70b8
@@ -36486,10 +39675,10 @@ Date:	Mon Sep 17 15:45:26 2007 -0400
 
     Taken from cairo.  It still need some tweaking.
 
- ChangeLog.mk |   81
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- Makefile.am  |    4 +++
- configure.ac |    2 +-
+ ChangeLog.mk | 81
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ Makefile.am  |  4 +++
+ configure.ac |  2 +-
  3 files changed, 86 insertions(+), 1 deletion(-)
 
 commit 15ad81c64cd8b1cb438d41be402daa19a239db3d
@@ -36498,7 +39687,7 @@ Date:	Mon Sep 17 19:39:29 2007 +0200
 
     Use = instead of == in qt.m4
 
- m4/qt.m4 |    2 +-
+ m4/qt.m4 | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 70fabcb96e207b9b889bb32c0cf5ea3fc0aa08f8
@@ -36543,9 +39732,9 @@ Date:	Fri Sep 14 20:50:07 2007 +0000
 
     Windows implementation for matching fonts that doesn't use fontconfig
 
- ChangeLog		    |	 6 +
- poppler/GlobalParamsWin.cc |  285
- ++++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog		    |	6 +
+ poppler/GlobalParamsWin.cc | 285
+ +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 291 insertions(+)
 
 commit d18b5361a0504458da805ed6be037c9d648f9372
@@ -36554,7 +39743,7 @@ Date:	Fri Sep 14 20:47:11 2007 +0000
 
     Update ChangeLog for previous checkin
 
- ChangeLog |   15 +++++++++++++++
+ ChangeLog | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
 commit 3330763ddca66b30d5ee60aab94d6fe0bbae9c8f
@@ -36563,17 +39752,17 @@ Date:	Fri Sep 14 06:17:35 2007 +0000
 
     windows/msvc compilation fixes
 
- poppler/DCTStream.h	      |    2 +-
- poppler/Error.cc	      |    6 ++++++
- poppler/FlateStream.h	      |    2 +-
- poppler/GlobalParams.cc      |   12 ++++++++++--
- poppler/GlobalParams.h       |   17 +++++++++++++++++
- poppler/Stream.cc	      |    2 +-
- splash/SplashFTFontEngine.cc |    2 ++
- splash/SplashFontEngine.cc   |    2 +-
- splash/SplashFontFile.cc     |    2 ++
- splash/SplashFontFile.h      |    3 ++-
- splash/SplashT1FontEngine.cc |    2 +-
+ poppler/DCTStream.h	      |  2 +-
+ poppler/Error.cc	      |  6 ++++++
+ poppler/FlateStream.h	      |  2 +-
+ poppler/GlobalParams.cc      | 12 ++++++++++--
+ poppler/GlobalParams.h       | 17 +++++++++++++++++
+ poppler/Stream.cc	      |  2 +-
+ splash/SplashFTFontEngine.cc |  2 ++
+ splash/SplashFontEngine.cc   |  2 +-
+ splash/SplashFontFile.cc     |  2 ++
+ splash/SplashFontFile.h      |  3 ++-
+ splash/SplashT1FontEngine.cc |  2 +-
  11 files changed, 44 insertions(+), 8 deletions(-)
 
 commit 6eb159ef34eb7e2fb8adcfc48afd84d5f50efbbd
@@ -36583,8 +39772,8 @@ Date:	Mon Sep 10 17:38:05 2007 +0000
 	    * autogen.sh: Support automake-1.10.
 	    Patch by Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 
- ChangeLog  |	 5 +++++
- autogen.sh |	11 ++++++-----
+ ChangeLog  |  5 +++++
+ autogen.sh | 11 ++++++-----
  2 files changed, 11 insertions(+), 5 deletions(-)
 
 commit 31bbc8c727cfecc79bd8da962ad8d99a0d1d3d33
@@ -36596,10 +39785,10 @@ Date:	Sat Sep 8 10:40:17 2007 +0000
 	Add PSConverter::setOutputDevice() to set a QIODevice where
 	writing the resulting PS.
 
- ChangeLog			 |    7 ++++++
- qt4/src/poppler-ps-converter.cc |   51
- ++++++++++++++++++++++++++++++++++++---
- qt4/src/poppler-qt4.h		 |    5 +++-
+ ChangeLog			 |  7 ++++++
+ qt4/src/poppler-ps-converter.cc | 51
+ +++++++++++++++++++++++++++++++++++++----
+ qt4/src/poppler-qt4.h		 |  5 +++-
  3 files changed, 58 insertions(+), 5 deletions(-)
 
 commit b3d63d03c310f01cc5b23d00ffd2103c6891fef2
@@ -36609,8 +39798,8 @@ Date:	Wed Sep 5 20:22:32 2007 +0000
 	    * qt4/src/poppler-ps-converter.cc: Fix Right<->Left
 	    interchange
 
- ChangeLog			 |    1 +
- qt4/src/poppler-ps-converter.cc |    4 ++--
+ ChangeLog			 | 1 +
+ qt4/src/poppler-ps-converter.cc | 4 ++--
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 commit 64368582d5ca4e28c236f440482c96f1dd3a8897
@@ -36619,8 +39808,8 @@ Date:	Wed Sep 5 18:22:52 2007 +0000
 
 	    * poppler/PSOutputDev.cc: Fix printing of second parameter
 
- ChangeLog		|    4 ++++
- poppler/PSOutputDev.cc |    2 +-
+ ChangeLog		| 4 ++++
+ poppler/PSOutputDev.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit eaf9d06cf0d08ccdc183759e0331dc2439a6f10f
@@ -36631,9 +39820,9 @@ Date:	Wed Sep 5 10:57:09 2007 +0000
 	* glib/poppler-page.cc:
 	* glib/demo/render.c: Fix build with --disable-cairo-output.
 
- ChangeLog	      |    5 +++++
- glib/demo/render.c   |   31 +++++++++++++++++++++++++++----
- glib/poppler-page.cc |   22 ++++++++++++----------
+ ChangeLog	      |  5 +++++
+ glib/demo/render.c   | 31 +++++++++++++++++++++++++++----
+ glib/poppler-page.cc | 22 ++++++++++++----------
  3 files changed, 44 insertions(+), 14 deletions(-)
 
 commit c0f488c2b0e115be3e1b7e4dc7baa38db5837498
@@ -36642,7 +39831,7 @@ Date:	Tue Sep 4 22:04:52 2007 +0000
 
     did not want to commit this
 
- gtk-doc.make |    2 +-
+ gtk-doc.make | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3462851b4ea342651095f1803cd488bc3b3f5749
@@ -36652,9 +39841,9 @@ Date:	Tue Sep 4 22:02:06 2007 +0000
 	    * utils/pdftoppm.cc: Fix build on Sun Studio compiler.
 	    Patch by Brian Cameron <brian.cameron@sun.com>
 
- ChangeLog	   |	5 +++++
- gtk-doc.make	   |	2 +-
- utils/pdftoppm.cc |	2 +-
+ ChangeLog	   | 5 +++++
+ gtk-doc.make	   | 2 +-
+ utils/pdftoppm.cc | 2 +-
  3 files changed, 7 insertions(+), 2 deletions(-)
 
 commit cdf3b9062cc54d558b8dbeefb3211a920ff2cb94
@@ -36664,8 +39853,8 @@ Date:	Mon Sep 3 19:23:11 2007 +0000
     write news
     fix qt4 build
 
- NEWS		     |	 13 +++++++++++++
- qt4/src/Makefile.am |	  3 ++-
+ NEWS		     | 13 +++++++++++++
+ qt4/src/Makefile.am |	3 ++-
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit c82208a44f3b09c27bc33831641e4f746dd4361f
@@ -36678,12 +39867,12 @@ Date:	Mon Sep 3 18:28:44 2007 +0000
 	    * qt/Makefile.am
 	    * qt4/src/Makefile.am: Bump sonames
 
- ChangeLog	     |	  8 ++++++++
- configure.ac	     |	  2 +-
- glib/Makefile.am    |	  2 +-
- poppler/Makefile.am |	  2 +-
- qt/Makefile.am      |	  2 +-
- qt4/src/Makefile.am |	  2 +-
+ ChangeLog	     | 8 ++++++++
+ configure.ac	     | 2 +-
+ glib/Makefile.am    | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt/Makefile.am      | 2 +-
+ qt4/src/Makefile.am | 2 +-
  6 files changed, 13 insertions(+), 5 deletions(-)
 
 commit 2a12409ebbf96ea3ca4556b71231a45ae37cb052
@@ -36695,9 +39884,9 @@ Date:	Mon Sep 3 17:09:01 2007 +0000
 	    <derekn@foolabs.com>
 	    to fix some errors in CCITTFaxStream and JBIG2Stream.cc
 
- ChangeLog		|    6 ++++++
- poppler/JBIG2Stream.cc |    7 ++++---
- poppler/Stream.cc	|    2 +-
+ ChangeLog		| 6 ++++++
+ poppler/JBIG2Stream.cc | 7 ++++---
+ poppler/Stream.cc	| 2 +-
  3 files changed, 11 insertions(+), 4 deletions(-)
 
 commit 0b483e71ef02b4040b665935c1018c8b30b9c1ca
@@ -36722,23 +39911,23 @@ Date:	Mon Sep 3 08:54:01 2007 +0000
 	* glib/reference/tmpl/poppler.sgml: Update glib bindings API
 	documentation.
 
- ChangeLog				     |	 19 ++
- glib/poppler-document.cc		     |	 10 +
- glib/poppler-form-field.cc		     |	205 +++++++++++++++++
- glib/poppler-page.cc			     |	 12 +-
- glib/reference/poppler-docs.sgml	     |	  2 +
- glib/reference/poppler-sections.txt	     |	108 ++++++++-
- glib/reference/poppler.types		     |	  2 +
- glib/reference/tmpl/poppler-action.sgml     |	 36 ++-
- glib/reference/tmpl/poppler-attachment.sgml |	 65 ++++++
- glib/reference/tmpl/poppler-document.sgml   |	 50 +++++
- glib/reference/tmpl/poppler-enums.sgml      |	 60 +++++
- glib/reference/tmpl/poppler-form-field.sgml |	315
- +++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-page.sgml	     |	236 +++++++++++++++++++-
- glib/reference/tmpl/poppler-private.sgml    |	  6 +
- glib/reference/tmpl/poppler.sgml	     |	 49 +++++
- gtk-doc.make				     |	 34 +--
+ ChangeLog				     |	19 ++
+ glib/poppler-document.cc		     |	10 +
+ glib/poppler-form-field.cc		     | 205 ++++++++++++++++++
+ glib/poppler-page.cc			     |	12 +-
+ glib/reference/poppler-docs.sgml	     |	 2 +
+ glib/reference/poppler-sections.txt	     | 108 +++++++++-
+ glib/reference/poppler.types		     |	 2 +
+ glib/reference/tmpl/poppler-action.sgml     |	36 +++-
+ glib/reference/tmpl/poppler-attachment.sgml |	65 ++++++
+ glib/reference/tmpl/poppler-document.sgml   |	50 +++++
+ glib/reference/tmpl/poppler-enums.sgml      |	60 ++++++
+ glib/reference/tmpl/poppler-form-field.sgml | 315
+ ++++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-page.sgml	     | 236 ++++++++++++++++++++-
+ glib/reference/tmpl/poppler-private.sgml    |	 6 +
+ glib/reference/tmpl/poppler.sgml	     |	49 +++++
+ gtk-doc.make				     |	34 +--
  16 files changed, 1181 insertions(+), 28 deletions(-)
 
 commit 289e3893cda45055951bb8d3b82a45644bc0b6c6
@@ -36752,8 +39941,8 @@ Date:	Sun Sep 2 17:02:55 2007 +0000
 	    ghostscript behaviour. Patch by <darren.kenny@sun.com>. Fixes
 	    #12208
 
- ChangeLog	     |	  3 +++
- poppler/GfxState.cc |	  4 ++--
+ ChangeLog	     | 3 +++
+ poppler/GfxState.cc | 4 ++--
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 6f6c2180aca2e26ea0e3c2f21f11bc8f457c19c0
@@ -36767,9 +39956,9 @@ Date:	Sun Sep 2 16:31:19 2007 +0000
 	    improve matching of half strings of decomposed
 	    characters/ligatures.
 
- ChangeLog		  |    3 +++
- glib/demo/Makefile.am	  |    1 +
- poppler/TextOutputDev.cc |   21 +++++++++++++--------
+ ChangeLog		  |  3 +++
+ glib/demo/Makefile.am	  |  1 +
+ poppler/TextOutputDev.cc | 21 +++++++++++++--------
  3 files changed, 17 insertions(+), 8 deletions(-)
 
 commit be1b5a0196cdfc78f74e08a023b477cac16eb0f3
@@ -36778,8 +39967,8 @@ Date:	Sun Sep 2 16:06:03 2007 +0000
 
     poppler/PDFDoc.cc: Don't enforce %%EOF at the end of file
 
- ChangeLog	   |	4 ++++
- poppler/PDFDoc.cc |	3 ++-
+ ChangeLog	   | 4 ++++
+ poppler/PDFDoc.cc | 3 ++-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 500a87af9240344806c18ebbd05a89f4f4c69955
@@ -36794,10 +39983,10 @@ Date:	Sun Sep 2 00:53:42 2007 +0000
 	the cairo
 	context.
 
- ChangeLog		   |	7 +++++++
- poppler/CairoOutputDev.cc |	7 ++++++-
- poppler/Error.cc	   |	7 +++++++
- poppler/Error.h	   |	1 +
+ ChangeLog		   | 7 +++++++
+ poppler/CairoOutputDev.cc | 7 ++++++-
+ poppler/Error.cc	   | 7 +++++++
+ poppler/Error.h	   | 1 +
  4 files changed, 21 insertions(+), 1 deletion(-)
 
 commit 0c22556bf70ff67eb388cdcd9784603030397785
@@ -36810,8 +39999,8 @@ Date:	Sat Sep 1 23:38:04 2007 +0000
 	will be
 	appropriately set.
 
- ChangeLog	       |    5 +++++
- glib/demo/Makefile.am |    2 ++
+ ChangeLog	       | 5 +++++
+ glib/demo/Makefile.am | 2 ++
  2 files changed, 7 insertions(+)
 
 commit a23d45dd6cd8a2ac4181170a9ee924fe49a9781b
@@ -36822,8 +40011,8 @@ Date:	Sat Sep 1 23:00:59 2007 +0000
 
 	* glib/poppler-page.cc: Add note about clipping
 
- ChangeLog	      |    4 ++++
- glib/poppler-page.cc |    2 ++
+ ChangeLog	      | 4 ++++
+ glib/poppler-page.cc | 2 ++
  2 files changed, 6 insertions(+)
 
 commit bf489d5cebc467807f2b38f74f6a6e34a503a9ca
@@ -36832,8 +40021,8 @@ Date:	Thu Aug 30 18:39:51 2007 +0000
 
 	    * poppler/Form.h: Remove unused methods. Fixes 12013
 
- ChangeLog	|    4 ++++
- poppler/Form.h |    3 ---
+ ChangeLog	| 4 ++++
+ poppler/Form.h | 3 ---
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit a81cc06c855385911dffa826b9e1407d6097e8c8
@@ -36849,15 +40038,14 @@ Date:	Thu Aug 30 18:15:34 2007 +0000
 	* glib/test-poppler-glib.c: Add support for word and line
 	selections. Based on patch by Kristian Høgsberg.
 
- ChangeLog		  |   10 ++++++
- glib/poppler-page.cc	  |   81
- ++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h	  |    2 ++
- glib/poppler.h		  |    4 +--
- glib/test-poppler-glib.c |    2 +-
- poppler/TextOutputDev.cc |   74
- +++++++++++++++++++++++++++++-------------
- poppler/TextOutputDev.h  |   34 ++++++++++++++-----
+ ChangeLog		  | 10 ++++++
+ glib/poppler-page.cc	  | 81
+ ++++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h	  |  2 ++
+ glib/poppler.h		  |  4 +--
+ glib/test-poppler-glib.c |  2 +-
+ poppler/TextOutputDev.cc | 74 +++++++++++++++++++++++++++++--------------
+ poppler/TextOutputDev.h  | 34 +++++++++++++++-----
  7 files changed, 163 insertions(+), 44 deletions(-)
 
 commit 59ddb5cc8bec54305b6d256ad9975e95ecdcb935
@@ -36869,8 +40057,8 @@ Date:	Mon Aug 27 18:37:55 2007 +0000
 	    routine. Fixes bug #11775. Patch by Ed Catmur
 	    <ed@catmur.co.uk>
 
- ChangeLog		     |	  5 +++++
- poppler/UnicodeTypeTable.cc |	  2 +-
+ ChangeLog		     | 5 +++++
+ poppler/UnicodeTypeTable.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit a6e46ce61670679f368e66c1a98a7d5d1c960c5b
@@ -36885,14 +40073,14 @@ Date:	Mon Aug 27 17:56:29 2007 +0000
 	    * qt4/src/poppler-qt4.h:
 	    A few API documentation fixes and improvements.
 
- ChangeLog		      |   10 +++++++
- qt4/src/Doxyfile	      |   26 ++++++-----------
- qt4/src/Mainpage.dox	      |   26 ++++++++++-------
- qt4/src/poppler-annotation.h |   34 +++++++++++++++++++++++
- qt4/src/poppler-form.h       |   18 ++++++------
- qt4/src/poppler-link.h       |   63
- +++++++++++++++++++++++++++++++++++++++---
- qt4/src/poppler-qt4.h	      |   44 +++++++++++++++++++----------
+ ChangeLog		      | 10 +++++++
+ qt4/src/Doxyfile	      | 26 ++++++------------
+ qt4/src/Mainpage.dox	      | 26 +++++++++++-------
+ qt4/src/poppler-annotation.h | 34 ++++++++++++++++++++++++
+ qt4/src/poppler-form.h       | 18 ++++++-------
+ qt4/src/poppler-link.h       | 63
+ +++++++++++++++++++++++++++++++++++++++++---
+ qt4/src/poppler-qt4.h	      | 44 +++++++++++++++++++++----------
  7 files changed, 166 insertions(+), 55 deletions(-)
 
 commit a7f8d92fba8c45d6ca83568c045d5e324158ee6b
@@ -36905,10 +40093,10 @@ Date:	Mon Aug 27 17:17:14 2007 +0000
 	* qt4/src/poppler-annotation.cc:
 	Don't leak the private class.
 
- ChangeLog		       |    9 +++++++++
- qt4/src/poppler-annotation.cc |    4 ++--
- qt4/src/poppler-link.cc       |    8 ++++++--
- qt4/src/poppler-link.h        |    1 +
+ ChangeLog		       | 9 +++++++++
+ qt4/src/poppler-annotation.cc | 4 ++--
+ qt4/src/poppler-link.cc       | 8 ++++++--
+ qt4/src/poppler-link.h        | 1 +
  4 files changed, 18 insertions(+), 4 deletions(-)
 
 commit 2b1ef8f06879eb0b79288d57540c238ea833db24
@@ -36917,8 +40105,8 @@ Date:	Sun Aug 26 21:39:22 2007 +0000
 
     Fix bug 12121
 
- ChangeLog		 |    4 ++++
- utils/ImageOutputDev.cc |    2 +-
+ ChangeLog		 | 4 ++++
+ utils/ImageOutputDev.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 20bcac5ee1988befb9c590a0d16cb615f0c49901
@@ -36927,8 +40115,8 @@ Date:	Sun Aug 26 21:28:34 2007 +0000
 
     forgot to cvs add
 
- qt4/src/poppler-annotation-private.h |   49
- ++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation-private.h | 49
+ ++++++++++++++++++++++++++++++++++++
  1 file changed, 49 insertions(+)
 
 commit e48de657db0ef439457b4b5ca39b937da25d531e
@@ -36941,11 +40129,11 @@ Date:	Sun Aug 26 18:11:01 2007 +0000
 	   a common
 	   shared private.
 
- ChangeLog		       |    4 +
- qt4/src/poppler-annotation.cc |  969
- ++++++++++++++++++++++++++++++++++-------
- qt4/src/poppler-annotation.h  |  277 ++++++++----
- qt4/src/poppler-page.cc       |  249 +++++++----
+ ChangeLog		       |   4 +
+ qt4/src/poppler-annotation.cc | 969
+ +++++++++++++++++++++++++++++++++++-------
+ qt4/src/poppler-annotation.h  | 277 ++++++++----
+ qt4/src/poppler-page.cc       | 249 ++++++-----
  4 files changed, 1155 insertions(+), 344 deletions(-)
 
 commit 392f050f909b6a1250acf1971446a1849534482c
@@ -36973,18 +40161,18 @@ Date:	Sun Aug 26 16:42:46 2007 +0000
 	    of the
 	    Link* classes into a common shared private.
 
- ChangeLog			 |   23 ++-
- qt4/src/poppler-document.cc	 |    7 +-
- qt4/src/poppler-embeddedfile.cc |   12 --
- qt4/src/poppler-fontinfo.cc	 |   12 +-
- qt4/src/poppler-form.cc	 |   16 +-
- qt4/src/poppler-form.h		 |   14 +-
- qt4/src/poppler-link.cc	 |  373
- ++++++++++++++++++++++++++++++---------
- qt4/src/poppler-link.h		 |   67 ++++---
- qt4/src/poppler-qt4.h		 |   32 ++--
- qt4/src/poppler-sound.cc	 |    7 -
- qt4/src/poppler-textbox.cc	 |    4 +-
+ ChangeLog			 |  23 ++-
+ qt4/src/poppler-document.cc	 |   7 +-
+ qt4/src/poppler-embeddedfile.cc |  12 --
+ qt4/src/poppler-fontinfo.cc	 |  12 +-
+ qt4/src/poppler-form.cc	 |  16 +-
+ qt4/src/poppler-form.h		 |  14 +-
+ qt4/src/poppler-link.cc	 | 373
+ ++++++++++++++++++++++++++++++----------
+ qt4/src/poppler-link.h		 |  67 +++++---
+ qt4/src/poppler-qt4.h		 |  32 ++--
+ qt4/src/poppler-sound.cc	 |   7 -
+ qt4/src/poppler-textbox.cc	 |   4 +-
  11 files changed, 404 insertions(+), 163 deletions(-)
 
 commit f215aca25fdd8fe287b717dde53f0be273d995e4
@@ -37004,26 +40192,26 @@ Date:	Sun Aug 26 10:52:19 2007 +0000
 	* glib/demo/render.[ch]:
 	* glib/demo/utils.[ch]: Add poppler glib demo tool.
 
- ChangeLog	       |   14 ++
- configure.ac	       |    1 +
- glib/Makefile.am      |    2 +-
- glib/demo/Makefile.am |   26 +++
- glib/demo/fonts.c     |  276 +++++++++++++++++++++++++++
- glib/demo/fonts.h     |   31 +++
- glib/demo/info.c      |  243 ++++++++++++++++++++++++
- glib/demo/info.h      |   31 +++
- glib/demo/links.c     |  289 ++++++++++++++++++++++++++++
- glib/demo/links.h     |   31 +++
- glib/demo/main.c      |  205 ++++++++++++++++++++
- glib/demo/outline.c   |  218 ++++++++++++++++++++++
- glib/demo/outline.h   |   31 +++
- glib/demo/page.c      |  249 +++++++++++++++++++++++++
- glib/demo/page.h      |   31 +++
- glib/demo/render.c    |  498
- +++++++++++++++++++++++++++++++++++++++++++++++++
- glib/demo/render.h    |   31 +++
- glib/demo/utils.c     |  234 +++++++++++++++++++++++
- glib/demo/utils.h     |   42 +++++
+ ChangeLog	       |  14 ++
+ configure.ac	       |   1 +
+ glib/Makefile.am      |   2 +-
+ glib/demo/Makefile.am |  26 +++
+ glib/demo/fonts.c     | 276 ++++++++++++++++++++++++++++
+ glib/demo/fonts.h     |  31 ++++
+ glib/demo/info.c      | 243 ++++++++++++++++++++++++
+ glib/demo/info.h      |  31 ++++
+ glib/demo/links.c     | 289 +++++++++++++++++++++++++++++
+ glib/demo/links.h     |  31 ++++
+ glib/demo/main.c      | 205 +++++++++++++++++++++
+ glib/demo/outline.c   | 218 ++++++++++++++++++++++
+ glib/demo/outline.h   |  31 ++++
+ glib/demo/page.c      | 249 +++++++++++++++++++++++++
+ glib/demo/page.h      |  31 ++++
+ glib/demo/render.c    | 498
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/demo/render.h    |  31 ++++
+ glib/demo/utils.c     | 234 ++++++++++++++++++++++++
+ glib/demo/utils.h     |  42 +++++
  19 files changed, 2482 insertions(+), 1 deletion(-)
 
 commit 7c9529b70dc44bb001d21a3b47fc65916813dec1
@@ -37033,8 +40221,8 @@ Date:	Thu Aug 23 20:39:31 2007 +0000
     2007-08-23	Carlos Garcia Campos  <carlosgc@gnome.org>
 	* glib/poppler-page.cc: Add missing comma.
 
- ChangeLog	      |    4 ++++
- glib/poppler-page.cc |    2 +-
+ ChangeLog	      | 4 ++++
+ glib/poppler-page.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 3c4a85503261ee81a829a1683f1f5fa85d41f8ee
@@ -37050,8 +40238,8 @@ Date:	Thu Aug 23 20:15:46 2007 +0000
 	used when the pdf was rotated on its side.
 	Fixes #11913.
 
- ChangeLog	      |    7 +++++++
- glib/poppler-page.cc |    5 ++---
+ ChangeLog	      | 7 +++++++
+ glib/poppler-page.cc | 5 ++---
  2 files changed, 9 insertions(+), 3 deletions(-)
 
 commit 3ba088d8caee3c40c2aba0cd85adcf9195ae88a3
@@ -37068,11 +40256,11 @@ Date:	Wed Aug 22 21:29:32 2007 +0000
 	      - scale pdf to fit in a square of wanted size
 	    Patch by Ilmari Heikkinen <ilmari.heikkinen@gmail.com>
 
- ChangeLog		|   12 ++++++
- splash/SplashBitmap.cc |   18 ++++++--
- splash/SplashBitmap.h	|    2 +
- utils/pdftoppm.cc	|  107
- ++++++++++++++++++++++++++++++++++++++++--------
+ ChangeLog		|  12 ++++++
+ splash/SplashBitmap.cc |  18 +++++++--
+ splash/SplashBitmap.h	|   2 +
+ utils/pdftoppm.cc	| 107
+ +++++++++++++++++++++++++++++++++++++++++--------
  4 files changed, 119 insertions(+), 20 deletions(-)
 
 commit 567e82c13aace4f40c7a555a62a3a4d223a46d92
@@ -37084,8 +40272,8 @@ Date:	Wed Aug 22 19:34:02 2007 +0000
 	* poppler/GlobalParams.cc: Fix debug spew. Patch from Matthias
 	Clasen.
 
- ChangeLog		 |    4 ++++
- poppler/GlobalParams.cc |    1 -
+ ChangeLog		 | 4 ++++
+ poppler/GlobalParams.cc | 1 -
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit bc499987074d046baf29deafe4a29d57039c0c5e
@@ -37098,8 +40286,8 @@ Date:	Wed Aug 22 19:28:24 2007 +0000
 	in the
 	image scaling code.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	6 ++++--
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 6 ++++--
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit d9719233447cb4f85f2bf9d9ec6ef089caa21140
@@ -37112,8 +40300,8 @@ Date:	Sun Aug 19 16:20:21 2007 +0000
 	currentFont is not set in beginString. This closes a possible
 	memory leak.
 
- ChangeLog		   |	6 ++++++
- poppler/CairoOutputDev.cc |	3 +++
+ ChangeLog		   | 6 ++++++
+ poppler/CairoOutputDev.cc | 3 +++
  2 files changed, 9 insertions(+)
 
 commit 099eb56896046e020f4ef0365e1ee382f85ec1ab
@@ -37122,8 +40310,8 @@ Date:	Wed Aug 15 18:52:20 2007 +0000
 
 	   * poppler/JBIG2Stream.cc: Quick fix for bug #12014
 
- ChangeLog		|    4 ++++
- poppler/JBIG2Stream.cc |   16 +++++++++++-----
+ ChangeLog		|  4 ++++
+ poppler/JBIG2Stream.cc | 16 +++++++++++-----
  2 files changed, 15 insertions(+), 5 deletions(-)
 
 commit 3b7e3645c85c7a3d341457f105835b58c935bd67
@@ -37132,9 +40320,9 @@ Date:	Wed Aug 15 00:04:48 2007 +0000
 
     RC2 is out! (0.5.91)
 
- ChangeLog    |    1 +
- NEWS	      |   18 ++++++++++++++++++
- configure.ac |    2 +-
+ ChangeLog    |  1 +
+ NEWS	      | 18 ++++++++++++++++++
+ configure.ac |  2 +-
  3 files changed, 20 insertions(+), 1 deletion(-)
 
 commit c240daefe660ac3456dc0c5f5dc82aa53ebc3313
@@ -37143,8 +40331,8 @@ Date:	Tue Aug 14 23:10:37 2007 +0000
 
     * poppler/Stream.cc: Fix CVE-2007-3387 by merging xpdf-3.02pl1.patch
 
- ChangeLog	   |	1 +
- poppler/Stream.cc |   12 +++++-------
+ ChangeLog	   |  1 +
+ poppler/Stream.cc | 12 +++++-------
  2 files changed, 6 insertions(+), 7 deletions(-)
 
 commit 1ba884b6b98ac8d755c9adc9f23a7a68d8b17b54
@@ -37156,9 +40344,9 @@ Date:	Tue Aug 14 22:47:30 2007 +0000
 	    <vtorri@univ-evry.fr> to
 	    fix linking under MinGW
 
- ChangeLog	     |	  6 ++++++
- configure.ac	     |	 13 +++++++++++++
- poppler/Makefile.am |	  5 +++--
+ ChangeLog	     |	6 ++++++
+ configure.ac	     | 13 +++++++++++++
+ poppler/Makefile.am |	5 +++--
  3 files changed, 22 insertions(+), 2 deletions(-)
 
 commit 3c31f923fcf1aeb361910eb1e9445cc28aa5b3ca
@@ -37171,8 +40359,8 @@ Date:	Tue Aug 7 16:22:12 2007 +0000
 	when we have a rotation as that case has not been tested.
 	Also make sure that scaledHeight is at least 1.
 
- ChangeLog		   |	6 ++++++
- poppler/CairoOutputDev.cc |	7 ++++++-
+ ChangeLog		   | 6 ++++++
+ poppler/CairoOutputDev.cc | 7 ++++++-
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit af97e5f8e0f3beeb43acde92a0788c02d9718adf
@@ -37187,13 +40375,13 @@ Date:	Mon Aug 6 17:41:17 2007 +0000
 	* poppler/Page.cc: Do not always regenerate appearance stream for
 	every form widget, but only when it's actually needed.
 
- ChangeLog	  |    9 ++++++
- poppler/Annot.cc |   86
- +++++++++++++++++++++++++++++++++---------------------
- poppler/Annot.h  |    8 ++---
- poppler/Form.cc  |   25 +++-------------
- poppler/Form.h   |    4 ++-
- poppler/Page.cc  |    8 ++---
+ ChangeLog	  |  9 ++++++
+ poppler/Annot.cc | 86
+ ++++++++++++++++++++++++++++++++++----------------------
+ poppler/Annot.h  |  8 +++---
+ poppler/Form.cc  | 25 +++-------------
+ poppler/Form.h   |  4 ++-
+ poppler/Page.cc  |  8 ++----
  6 files changed, 74 insertions(+), 66 deletions(-)
 
 commit 74627e71388ca0a4c0938a472c291ef87186f370
@@ -37204,8 +40392,8 @@ Date:	Tue Jul 31 21:40:19 2007 +0000
 
 	* poppler/GlobalParams.cc: s/GList/GooList/ some Windows code.
 
- ChangeLog		 |    4 ++++
- poppler/GlobalParams.cc |    8 ++++----
+ ChangeLog		 | 4 ++++
+ poppler/GlobalParams.cc | 8 ++++----
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit f421e2151345ac855b75e819e19343a90789b3bf
@@ -37217,9 +40405,9 @@ Date:	Tue Jul 31 16:50:06 2007 +0000
 	* glib/poppler-document.cc:
 	* glib/poppler-document.h: Add poppler_fonts_iter_get_file_name.
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |   16 ++++++++++++++++
- glib/poppler-document.h  |    1 +
+ ChangeLog		  |  5 +++++
+ glib/poppler-document.cc | 16 ++++++++++++++++
+ glib/poppler-document.h  |  1 +
  3 files changed, 22 insertions(+)
 
 commit 4d57b8a12b845d5d5ac321d7a4bca980d60d429f
@@ -37232,8 +40420,8 @@ Date:	Tue Jul 31 16:48:35 2007 +0000
 	CairoImageOutputDevice's
 	implementation.
 
- ChangeLog		  |    5 +++++
- poppler/CairoOutputDev.h |    1 +
+ ChangeLog		  | 5 +++++
+ poppler/CairoOutputDev.h | 1 +
  2 files changed, 6 insertions(+)
 
 commit f04a67006abdb5843ab481aa1e25b51abd1b1b64
@@ -37244,9 +40432,9 @@ Date:	Tue Jul 31 11:41:53 2007 +0000
 	* poppler/Form.cc:
 	* poppler/Form.h: Fix memory leak.
 
- ChangeLog	 |    5 +++++
- poppler/Form.cc |    9 +++++----
- poppler/Form.h  |    4 ++--
+ ChangeLog	 | 5 +++++
+ poppler/Form.cc | 9 +++++----
+ poppler/Form.h  | 4 ++--
  3 files changed, 12 insertions(+), 6 deletions(-)
 
 commit ee9d556a8b413160911a535a0e9089b919ca29f5
@@ -37258,8 +40446,8 @@ Date:	Tue Jul 31 11:40:22 2007 +0000
 	groups and soft masks in CairoImageOutputDev. Fixes a crash in
 	poppler_page_get_image_mapping.
 
- ChangeLog		  |    6 ++++++
- poppler/CairoOutputDev.h |   11 +++++++++++
+ ChangeLog		  |  6 ++++++
+ poppler/CairoOutputDev.h | 11 +++++++++++
  2 files changed, 17 insertions(+)
 
 commit e08779856c801b9968dc2d47e28e86abc1ec7110
@@ -37280,8 +40468,8 @@ Date:	Tue Jul 31 05:29:57 2007 +0000
 	Patch by Koji Otani.
 	Fixes #11413.
 
- ChangeLog	    |	10 ++++++++++
- poppler/GfxFont.cc |	 1 +
+ ChangeLog	    | 10 ++++++++++
+ poppler/GfxFont.cc |  1 +
  2 files changed, 11 insertions(+)
 
 commit 86fc9a6f343be920f5159e745947401227e41a37
@@ -37296,10 +40484,10 @@ Date:	Mon Jul 30 19:28:17 2007 +0000
 	to cairo to improve the quality of the scaled image. Improves
 	#5589.
 
- ChangeLog		   |	6 +
- poppler/CairoOutputDev.cc |  300
- +++++++++++++++++++++++++++++++++++++++++++--
- poppler/CairoOutputDev.h  |   10 +-
+ ChangeLog		   |   6 +
+ poppler/CairoOutputDev.cc | 300
+ ++++++++++++++++++++++++++++++++++++++++++++--
+ poppler/CairoOutputDev.h  |  10 +-
  3 files changed, 303 insertions(+), 13 deletions(-)
 
 commit f754246e47161e9bf99887201e283c1419ade4f1
@@ -37310,8 +40498,8 @@ Date:	Mon Jul 30 19:07:45 2007 +0000
 
 	* configure.ac: Update require cairo version to 1.4
 
- ChangeLog    |    4 ++++
- configure.ac |    2 +-
+ ChangeLog    | 4 ++++
+ configure.ac | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit bb20249ac676995725b617ef442f5feb01f78205
@@ -37324,10 +40512,10 @@ Date:	Mon Jul 30 18:44:41 2007 +0000
 	* poppler/CairoOutputDev.h: Add transparency group support.
 	Fixes #7856.
 
- ChangeLog		   |	6 ++
- poppler/CairoOutputDev.cc |  133
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |   21 ++++++-
+ ChangeLog		   |   6 +++
+ poppler/CairoOutputDev.cc | 133
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  |  21 +++++++-
  3 files changed, 159 insertions(+), 1 deletion(-)
 
 commit a85acecaeb0d122becbc52a385d918561e995eca
@@ -37341,9 +40529,9 @@ Date:	Mon Jul 30 00:22:35 2007 +0000
 	type3 fonts
 	instead of using set_matrix()
 
- ChangeLog		   |	6 ++++++
- poppler/CairoOutputDev.cc |   20 +++++++++++++++++---
- poppler/CairoOutputDev.h  |	1 +
+ ChangeLog		   |  6 ++++++
+ poppler/CairoOutputDev.cc | 20 +++++++++++++++++---
+ poppler/CairoOutputDev.h  |  1 +
  3 files changed, 24 insertions(+), 3 deletions(-)
 
 commit a81a082169de32d01c36c969616a5c2279f1bac7
@@ -37354,8 +40542,8 @@ Date:	Mon Jul 30 00:18:59 2007 +0000
 
 	* glib/test-poppler-glib.c: include <time.h> to fix compilation.
 
- ChangeLog		  |    4 ++++
- glib/test-poppler-glib.c |    1 +
+ ChangeLog		  | 4 ++++
+ glib/test-poppler-glib.c | 1 +
  2 files changed, 5 insertions(+)
 
 commit 81393cb30f6287caf5195265cdc039555f2767d3
@@ -37369,12 +40557,12 @@ Date:	Sat Jul 28 08:22:40 2007 +0000
 	* poppler/Form.h: Make fieldLookup static in Form and use it from
 	both Form and Annot.
 
- ChangeLog	  |    8 +++++++
- poppler/Annot.cc |   43 ++++++++++-------------------------
- poppler/Annot.h  |    1 -
- poppler/Form.cc  |   66
- ++++++++++++++++++++++++++----------------------------
- poppler/Form.h   |    2 ++
+ ChangeLog	  |  8 +++++++
+ poppler/Annot.cc | 43 +++++++++++-------------------------
+ poppler/Annot.h  |  1 -
+ poppler/Form.cc  | 66
+ +++++++++++++++++++++++++++-----------------------------
+ poppler/Form.h   |  2 ++
  5 files changed, 54 insertions(+), 66 deletions(-)
 
 commit 81b669dcb14bf821a49c9879f8d4129075647f5f
@@ -37385,8 +40573,8 @@ Date:	Sat Jul 28 08:05:11 2007 +0000
 	* glib/poppler-page.h: Remove unneeded declarations. Fixes bug
 	#11744. Patch by Kouhei Sutou <kou@cozmixng.org>.
 
- ChangeLog	     |	  5 +++++
- glib/poppler-page.h |	  2 --
+ ChangeLog	     | 5 +++++
+ glib/poppler-page.h | 2 --
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit f2c4e5305009f1da770c99d3e2e3371ff37c75f3
@@ -37400,12 +40588,12 @@ Date:	Fri Jul 27 09:17:40 2007 +0000
 	* glib/test-poppler-glib.c: Make PopplerFontInfo GObject. Patch by
 	Kouhei Sutou <kou@cozmixng.org>.
 
- ChangeLog		  |    8 ++++++++
- glib/poppler-document.cc |   44
+ ChangeLog		  |  8 ++++++++
+ glib/poppler-document.cc | 44
  ++++++++++++++++++++++++++++++++++++++++----
- glib/poppler-document.h  |    6 +++++-
- glib/poppler-private.h   |    1 +
- glib/test-poppler-glib.c |    2 +-
+ glib/poppler-document.h  |  6 +++++-
+ glib/poppler-private.h   |  1 +
+ glib/test-poppler-glib.c |  2 +-
  5 files changed, 55 insertions(+), 6 deletions(-)
 
 commit 975c7cff10d9b00359e147329ae2c7a93f8a3833
@@ -37414,7 +40602,7 @@ Date:	Wed Jul 25 17:20:06 2007 +0000
 
     micro optimization
 
- qt4/src/poppler-page.cc |    4 ++--
+ qt4/src/poppler-page.cc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 525a7f49dd95f2644870a1c59ca15124e30026b4
@@ -37430,10 +40618,10 @@ Date:	Tue Jul 24 16:45:25 2007 +0000
 	radio buttons. Look for some inheritable attributes in the
 	parent when needed.
 
- ChangeLog	  |   10 +++++++
- poppler/Annot.cc |   27 ++++++++++---------
- poppler/Form.cc  |   77
- ++++++++++++++++++++++++++++++++++++++----------------
+ ChangeLog	  | 10 ++++++++
+ poppler/Annot.cc | 27 ++++++++++----------
+ poppler/Form.cc  | 77
+ +++++++++++++++++++++++++++++++++++++++-----------------
  3 files changed, 78 insertions(+), 36 deletions(-)
 
 commit 633a1cde65f86ee6577a68f4f8d36de43d14c714
@@ -37445,9 +40633,9 @@ Date:	Sun Jul 15 21:03:50 2007 +0000
 	    correct place,
 	    not in the invocation dir. Fixes bug #11610
 
- ChangeLog		|    6 ++++++
- utils/HtmlOutputDev.cc |   37 ++++++++++---------------------------
- utils/HtmlOutputDev.h	|    4 ----
+ ChangeLog		|  6 ++++++
+ utils/HtmlOutputDev.cc | 37 ++++++++++---------------------------
+ utils/HtmlOutputDev.h	|  4 ----
  3 files changed, 16 insertions(+), 31 deletions(-)
 
 commit ccb2d420ca8d818aa9ba1d64f08f5e94ab313a72
@@ -37465,10 +40653,10 @@ Date:	Sun Jul 15 17:09:29 2007 +0000
 	    exiting the program.
 	    * poppler/Stream.cc: Remove bogus #warning
 
- ChangeLog	      |   10 ++++++++++
- poppler/DCTStream.cc |   17 ++++++++++++++++-
- poppler/DCTStream.h  |    1 +
- poppler/Stream.cc    |    1 -
+ ChangeLog	      | 10 ++++++++++
+ poppler/DCTStream.cc | 17 ++++++++++++++++-
+ poppler/DCTStream.h  |  1 +
+ poppler/Stream.cc    |  1 -
  4 files changed, 27 insertions(+), 2 deletions(-)
 
 commit f9d82dfd299ae23a1baf3e35e2c3cd351129c525
@@ -37479,8 +40667,8 @@ Date:	Sat Jul 14 18:23:42 2007 +0000
 	    calculated if not
 	    specified
 
- ChangeLog	  |    5 +++++
- utils/pdftops.cc |    4 ++--
+ ChangeLog	  | 5 +++++
+ utils/pdftops.cc | 4 ++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 1c04136e9538ccfaa2d6b968861682ca3b69ffb3
@@ -37492,9 +40680,9 @@ Date:	Sat Jul 14 15:23:31 2007 +0000
 	* glib/poppler-document.h: Remove trailing comma from the last
 	item of enums.
 
- ChangeLog		 |    6 ++++++
- glib/poppler-action.h	 |    2 +-
- glib/poppler-document.h |    8 ++++----
+ ChangeLog		 | 6 ++++++
+ glib/poppler-action.h	 | 2 +-
+ glib/poppler-document.h | 8 ++++----
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 commit b9b68cabce19a5e23911e5432ace8c13bd237391
@@ -37508,10 +40696,10 @@ Date:	Sat Jul 14 15:15:57 2007 +0000
 	a text form field type, since a text field could be multiline and
 	password at the same time.
 
- ChangeLog		    |	 8 ++++++++
- glib/poppler-form-field.cc |	10 ++++++++--
- glib/poppler-form-field.h  |	 2 +-
- glib/test-poppler-glib.c   |	 4 ++--
+ ChangeLog		    |  8 ++++++++
+ glib/poppler-form-field.cc | 10 ++++++++--
+ glib/poppler-form-field.h  |  2 +-
+ glib/test-poppler-glib.c   |  4 ++--
  4 files changed, 19 insertions(+), 5 deletions(-)
 
 commit 14a8361039d708661b8699b2e7c4496135021a85
@@ -37530,16 +40718,16 @@ Date:	Fri Jul 13 22:18:05 2007 +0000
 	    Japanese fonts.
 	    Fixes bug 11413
 
- ChangeLog		      |   13 ++
- fofi/FoFiTrueType.cc	      |  305
- ++++++++++++++++++++++++++++++++++++++++++
- fofi/FoFiTrueType.h	      |   12 ++
- poppler/CairoFontEngine.cc   |   47 ++-----
- poppler/CharCodeToUnicode.cc |   16 +++
- poppler/CharCodeToUnicode.h  |    1 +
- poppler/GfxFont.cc	      |  230 +++++++++++++++++++++++++++----
- poppler/GfxFont.h	      |    2 +
- poppler/SplashOutputDev.cc   |   53 ++------
+ ChangeLog		      |  13 ++
+ fofi/FoFiTrueType.cc	      | 305
+ +++++++++++++++++++++++++++++++++++++++++++
+ fofi/FoFiTrueType.h	      |  12 ++
+ poppler/CairoFontEngine.cc   |  47 ++-----
+ poppler/CharCodeToUnicode.cc |  16 +++
+ poppler/CharCodeToUnicode.h  |   1 +
+ poppler/GfxFont.cc	      | 230 ++++++++++++++++++++++++++++----
+ poppler/GfxFont.h	      |   2 +
+ poppler/SplashOutputDev.cc   |  53 ++------
  9 files changed, 577 insertions(+), 102 deletions(-)
 
 commit 8389099d8e8940e3f8920b14a83075d69bcd8e6c
@@ -37549,8 +40737,8 @@ Date:	Fri Jul 13 18:21:02 2007 +0000
 	    * poppler/FontInfo.cc: Fix the FontInfoScanner::scan method to
 	    actually scan the number of requested pages
 
- ChangeLog	     |	  6 ++++++
- poppler/FontInfo.cc |	 12 ++++++------
+ ChangeLog	     |	6 ++++++
+ poppler/FontInfo.cc | 12 ++++++------
  2 files changed, 12 insertions(+), 6 deletions(-)
 
 commit 9ced4442372d08375e0ded62f79052d8a3ec9cd6
@@ -37560,8 +40748,8 @@ Date:	Fri Jul 13 18:08:44 2007 +0000
 	    * poppler/GlobalParams.cc: Remove dead unused code from
 	    Win32 ifdef
 
- ChangeLog		 |    4 ++++
- poppler/GlobalParams.cc |    6 ------
+ ChangeLog		 | 4 ++++
+ poppler/GlobalParams.cc | 6 ------
  2 files changed, 4 insertions(+), 6 deletions(-)
 
 commit fb89fdb8de608ff94082e16819f042cddabf2bcc
@@ -37574,10 +40762,10 @@ Date:	Wed Jul 11 18:52:12 2007 +0000
 	    had text
 	    twice
 
- ChangeLog		|    7 +++++++
- poppler/PSOutputDev.cc |    5 +++++
- poppler/PSOutputDev.h	|    2 ++
- utils/pdftohtml.cc	|    3 +--
+ ChangeLog		| 7 +++++++
+ poppler/PSOutputDev.cc | 5 +++++
+ poppler/PSOutputDev.h	| 2 ++
+ utils/pdftohtml.cc	| 3 +--
  4 files changed, 15 insertions(+), 2 deletions(-)
 
 commit 0c9fa59bf5edf3cfcca1792da51b904a7c7f7615
@@ -37589,10 +40777,10 @@ Date:	Wed Jul 11 18:30:19 2007 +0000
 	* poppler/XRef.cc:
 	* poppler/XRef.h: Fix memory leak.
 
- ChangeLog	 |    6 ++++++
- poppler/Form.cc |   49 ++++++++++++++++++++++++-------------------------
- poppler/XRef.cc |   22 ++++++++++------------
- poppler/XRef.h  |    2 +-
+ ChangeLog	 |  6 ++++++
+ poppler/Form.cc | 49 ++++++++++++++++++++++++-------------------------
+ poppler/XRef.cc | 22 ++++++++++------------
+ poppler/XRef.h  |  2 +-
  4 files changed, 41 insertions(+), 38 deletions(-)
 
 commit 4ae7d43bd54c5b3e2f08c48441f741d3099e228f
@@ -37610,15 +40798,15 @@ Date:	Wed Jul 11 18:12:26 2007 +0000
 	    but at least
 	    make it compile :-D
 
- ChangeLog		      |   11 +++++++++++
- goo/GooVector.h	      |    4 ++--
- goo/gfile.cc		      |    6 +++---
- poppler/GlobalParams.cc      |   26 +++++++++++++-------------
- splash/SplashFontEngine.cc   |    2 +-
- splash/SplashT1FontEngine.cc |    8 ++++----
- splash/SplashT1FontEngine.h  |    7 +++----
- splash/SplashT1FontFile.cc   |    8 +++++---
- splash/SplashT1FontFile.h    |    4 ++--
+ ChangeLog		      | 11 +++++++++++
+ goo/GooVector.h	      |  4 ++--
+ goo/gfile.cc		      |  6 +++---
+ poppler/GlobalParams.cc      | 26 +++++++++++++-------------
+ splash/SplashFontEngine.cc   |  2 +-
+ splash/SplashT1FontEngine.cc |  8 ++++----
+ splash/SplashT1FontEngine.h  |  7 +++----
+ splash/SplashT1FontFile.cc   |  8 +++++---
+ splash/SplashT1FontFile.h    |  4 ++--
  9 files changed, 44 insertions(+), 32 deletions(-)
 
 commit 7bd125ce96c603fd5cf42d7c6a29b542e82dd4ec
@@ -37633,12 +40821,12 @@ Date:	Wed Jul 11 18:08:07 2007 +0000
 	* glib/test-poppler-glib.c: Add a method to get the max length
 	allowed in text form fields.
 
- ChangeLog		    |	 9 +++++++++
- glib/poppler-form-field.cc |	 8 ++++++++
- glib/poppler-form-field.h  |	 1 +
- glib/test-poppler-glib.c   |	 1 +
- poppler/Form.cc	    |	11 +++++++++++
- poppler/Form.h		    |	 4 ++++
+ ChangeLog		    |  9 +++++++++
+ glib/poppler-form-field.cc |  8 ++++++++
+ glib/poppler-form-field.h  |  1 +
+ glib/test-poppler-glib.c   |  1 +
+ poppler/Form.cc	    | 11 +++++++++++
+ poppler/Form.h		    |  4 ++++
  6 files changed, 34 insertions(+)
 
 commit 8a68855735e9d295d71685e82de39204d639ea7a
@@ -37650,10 +40838,10 @@ Date:	Mon Jul 9 08:52:58 2007 +0000
 	* poppler/Annot.h: Render '*' instead of the actual content in
 	password form fields. Patch by Julien Rebetez <julien@fhtagn.net>
 
- ChangeLog	  |    6 ++++++
- poppler/Annot.cc |   52
+ ChangeLog	  |  6 ++++++
+ poppler/Annot.cc | 52
  +++++++++++++++++++++++++++++-----------------------
- poppler/Annot.h  |    5 +++--
+ poppler/Annot.h  |  5 +++--
  3 files changed, 38 insertions(+), 25 deletions(-)
 
 commit 53cf7d7084dc03a28239f11c94f2095bb02d6108
@@ -37668,12 +40856,12 @@ Date:	Sat Jul 7 16:23:56 2007 +0000
 	* glib/test-poppler-glib.c: Add a method to get the type of a Form
 	Field Button.
 
- ChangeLog		    |	 9 +++++++++
- glib/poppler-form-field.cc |	18 ++++++++++++++++++
- glib/poppler-form-field.h  |	 8 ++++++++
- glib/test-poppler-glib.c   |	26 +++++++++++++++++++++++---
- poppler/Form.cc	    |	 5 +++++
- poppler/Form.h		    |	 2 ++
+ ChangeLog		    |  9 +++++++++
+ glib/poppler-form-field.cc | 18 ++++++++++++++++++
+ glib/poppler-form-field.h  |  8 ++++++++
+ glib/test-poppler-glib.c   | 26 +++++++++++++++++++++++---
+ poppler/Form.cc	    |  5 +++++
+ poppler/Form.h		    |  2 ++
  6 files changed, 65 insertions(+), 3 deletions(-)
 
 commit de0a40181e5832a0dc263d40ed0a269867764623
@@ -37684,8 +40872,8 @@ Date:	Sat Jul 7 15:28:29 2007 +0000
 	* poppler/Form.cc: Fix a crash when setting state on buttons that
 	don't have state.
 
- ChangeLog	 |    5 +++++
- poppler/Form.cc |    3 +++
+ ChangeLog	 | 5 +++++
+ poppler/Form.cc | 3 +++
  2 files changed, 8 insertions(+)
 
 commit a33518a3283ff25aa5517bc535ddb61383b1cfdc
@@ -37699,8 +40887,8 @@ Date:	Fri Jul 6 09:08:44 2007 +0000
 	    delete children or widgets. Patch by
 	    Julien Rebetez <julien@fhtagn.net>
 
- ChangeLog	 |    4 ++++
- poppler/Form.cc |   17 +++++++++++------
+ ChangeLog	 |  4 ++++
+ poppler/Form.cc | 17 +++++++++++------
  2 files changed, 15 insertions(+), 6 deletions(-)
 
 commit 43f0d5b9bb198cdcbc2f7111f294c6f947105314
@@ -37712,9 +40900,9 @@ Date:	Fri Jul 6 08:47:11 2007 +0000
 	    patch by
 	    Darren Kenny <darren.kenny@sun.com>
 
- ChangeLog		 |    6 ++++++
- goo/GooString.cc	 |    2 +-
- poppler/ABWOutputDev.cc |    4 +++-
+ ChangeLog		 | 6 ++++++
+ goo/GooString.cc	 | 2 +-
+ poppler/ABWOutputDev.cc | 4 +++-
  3 files changed, 10 insertions(+), 2 deletions(-)
 
 commit 4e7405071b69889362e4d49de3f881f0e3e261e3
@@ -37725,8 +40913,8 @@ Date:	Thu Jul 5 13:04:01 2007 +0000
 	* glib/poppler-form-field.cc: Allow to set NULL in form fields
 	that can contain text.
 
- ChangeLog		    |	 5 +++++
- glib/poppler-form-field.cc |	30 ++++++++++++------------------
+ ChangeLog		    |  5 +++++
+ glib/poppler-form-field.cc | 30 ++++++++++++------------------
  2 files changed, 17 insertions(+), 18 deletions(-)
 
 commit 625510797c528257527003477fe28adbacfe80e7
@@ -37740,10 +40928,10 @@ Date:	Thu Jul 5 08:13:51 2007 +0000
 	and mtime, since they are public attributes and we don't want to
 	break the API.
 
- ChangeLog		    |	 8 ++++++++
- glib/poppler-attachment.cc |	 4 ++--
- glib/poppler-attachment.h  |	 4 ++--
- glib/test-poppler-glib.c   |	 4 ++--
+ ChangeLog		    | 8 ++++++++
+ glib/poppler-attachment.cc | 4 ++--
+ glib/poppler-attachment.h  | 4 ++--
+ glib/test-poppler-glib.c   | 4 ++--
  4 files changed, 14 insertions(+), 6 deletions(-)
 
 commit 9b2640f156f24b07c797d9461f84e64d550efa1a
@@ -37756,9 +40944,9 @@ Date:	Wed Jul 4 13:57:31 2007 +0000
 	    the unicode formated string
 	    * qt4/src/poppler-private.h: create QStringToUnicodeGooString
 
- ChangeLog		   |	7 +++++++
- qt4/src/poppler-form.cc   |	2 +-
- qt4/src/poppler-private.h |   15 +++++++++++++++
+ ChangeLog		   |  7 +++++++
+ qt4/src/poppler-form.cc   |  2 +-
+ qt4/src/poppler-private.h | 15 +++++++++++++++
  3 files changed, 23 insertions(+), 1 deletion(-)
 
 commit b70115cf979b29f75c644518ae0e9c0dd9892ebf
@@ -37769,8 +40957,8 @@ Date:	Wed Jul 4 13:06:38 2007 +0000
 	* glib/poppler-form-field.cc: Convert strings from UTF8 to UTF16BE
 	before setting them.
 
- ChangeLog		    |	 5 +++++
- glib/poppler-form-field.cc |	34 ++++++++++++++++++++++++----------
+ ChangeLog		    |  5 +++++
+ glib/poppler-form-field.cc | 34 ++++++++++++++++++++++++----------
  2 files changed, 29 insertions(+), 10 deletions(-)
 
 commit d37843877a6f93a9f27502d07ad82cba79e9aa73
@@ -37788,14 +40976,14 @@ Date:	Wed Jul 4 08:26:52 2007 +0000
 	into a GTime that is used by attachments and document
 	properties. Fix memory leak in attachments.
 
- ChangeLog		    |	12 ++++
- glib/poppler-attachment.cc |	25 +++++++-
- glib/poppler-attachment.h  |	16 ++---
- glib/poppler-document.cc   |  142
- +++++++++++++++++++++++---------------------
- glib/poppler-private.h     |	 6 +-
- glib/poppler.h		    |	 1 +
- glib/test-poppler-glib.c   |	56 ++++++++++++++---
+ ChangeLog		    |  12 ++++
+ glib/poppler-attachment.cc |  25 +++++++-
+ glib/poppler-attachment.h  |  16 ++---
+ glib/poppler-document.cc   | 142
+ +++++++++++++++++++++++----------------------
+ glib/poppler-private.h     |	6 +-
+ glib/poppler.h		    |	1 +
+ glib/test-poppler-glib.c   |  56 +++++++++++++++---
  7 files changed, 171 insertions(+), 87 deletions(-)
 
 commit d933f47d4af0992059148259a189373b42499bbe
@@ -37806,8 +40994,8 @@ Date:	Tue Jul 3 20:31:20 2007 +0000
 	    add all
 	    the enums
 
- ChangeLog		     |	  2 ++
- qt4/tests/poppler-fonts.cpp |	 28 ++++++++++++++++++++--------
+ ChangeLog		     |	2 ++
+ qt4/tests/poppler-fonts.cpp | 28 ++++++++++++++++++++--------
  2 files changed, 22 insertions(+), 8 deletions(-)
 
 commit d90b166cfbdc4857351baa627d158d5e0b6652b4
@@ -37822,9 +41010,9 @@ Date:	Tue Jul 3 16:46:51 2007 +0000
 	    for sake of
 	    correctness
 
- ChangeLog			   |	7 +++++++
- poppler/Catalog.cc		   |	1 -
- qt4/tests/poppler-attachments.cpp |	1 +
+ ChangeLog			   | 7 +++++++
+ poppler/Catalog.cc		   | 1 -
+ qt4/tests/poppler-attachments.cpp | 1 +
  3 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 7fa87eb2b093770271bc3a72de5b0b9dc228aa1b
@@ -37837,10 +41025,10 @@ Date:	Tue Jul 3 14:01:40 2007 +0000
 	* glib/test-poppler-glib.c: Add choice_commit_on_change function
 	to glib bindings.
 
- ChangeLog		    |	 7 +++++++
- glib/poppler-form-field.cc |	 8 ++++++++
- glib/poppler-form-field.h  |	 1 +
- glib/test-poppler-glib.c   |	 2 ++
+ ChangeLog		    | 7 +++++++
+ glib/poppler-form-field.cc | 8 ++++++++
+ glib/poppler-form-field.h  | 1 +
+ glib/test-poppler-glib.c   | 2 ++
  4 files changed, 18 insertions(+)
 
 commit 8b67e0403f6eaab6770cc0b7861074ae0b6d85bb
@@ -37852,10 +41040,10 @@ Date:	Tue Jul 3 13:49:18 2007 +0000
 	* glib/poppler-form-field.h:
 	* glib/test-poppler-glib.c: Fix a typo.
 
- ChangeLog		    |	 6 ++++++
- glib/poppler-form-field.cc |	 2 +-
- glib/poppler-form-field.h  |	 2 +-
- glib/test-poppler-glib.c   |	 2 +-
+ ChangeLog		    | 6 ++++++
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-form-field.h  | 2 +-
+ glib/test-poppler-glib.c   | 2 +-
  4 files changed, 9 insertions(+), 3 deletions(-)
 
 commit 33a5765eb404a4b321b09c26af74c1ed64a5d474
@@ -37871,11 +41059,11 @@ Date:	Tue Jul 3 13:22:54 2007 +0000
 	    to the qt4
 	    frontend
 
- ChangeLog			 |    9 +++++++++
- poppler/Catalog.cc		 |   19 ++++++++++++++++---
- poppler/Catalog.h		 |   13 +++++++++++--
- qt4/src/poppler-embeddedfile.cc |   16 ++++++++++++++++
- qt4/src/poppler-qt4.h		 |   14 ++++++++++++++
+ ChangeLog			 |  9 +++++++++
+ poppler/Catalog.cc		 | 19 ++++++++++++++++---
+ poppler/Catalog.h		 | 13 +++++++++++--
+ qt4/src/poppler-embeddedfile.cc | 16 ++++++++++++++++
+ qt4/src/poppler-qt4.h		 | 14 ++++++++++++++
  5 files changed, 66 insertions(+), 5 deletions(-)
 
 commit c7d21f9354bbe090cce6459124dcaadf1e46639e
@@ -37889,10 +41077,10 @@ Date:	Mon Jul 2 13:39:32 2007 +0000
 	Use FILE_SELECT instead of FILESELECT and fix a typo. Patch by
 	Kouhei Sutou
 
- ChangeLog		    |	 9 +++++++++
- glib/poppler-form-field.cc |	 2 +-
- glib/poppler-form-field.h  |	 2 +-
- glib/test-poppler-glib.c   |	 2 +-
+ ChangeLog		    | 9 +++++++++
+ glib/poppler-form-field.cc | 2 +-
+ glib/poppler-form-field.h  | 2 +-
+ glib/test-poppler-glib.c   | 2 +-
  4 files changed, 12 insertions(+), 3 deletions(-)
 
 commit 5e301064c62c6d58f488839d7bf804af912a3de1
@@ -37906,10 +41094,10 @@ Date:	Mon Jul 2 13:34:26 2007 +0000
 	Add poppler_form_field_is_read_only to glib bindings. Patch by
 	Kouhei Sutou
 
- ChangeLog		    |	 9 +++++++++
- glib/poppler-form-field.cc |	 8 ++++++++
- glib/poppler-form-field.h  |	 1 +
- glib/test-poppler-glib.c   |	 6 +++++-
+ ChangeLog		    | 9 +++++++++
+ glib/poppler-form-field.cc | 8 ++++++++
+ glib/poppler-form-field.h  | 1 +
+ glib/test-poppler-glib.c   | 6 +++++-
  4 files changed, 23 insertions(+), 1 deletion(-)
 
 commit 11875746ce28e8999bcad46167fcfea131cd267a
@@ -37921,8 +41109,8 @@ Date:	Sat Jun 30 08:33:30 2007 +0000
 	instead of poppler_page_transition which doesn't exist. Patch by
 	Kouhei Sutou
 
- ChangeLog	      |    6 ++++++
- glib/poppler-page.cc |    2 +-
+ ChangeLog	      | 6 ++++++
+ glib/poppler-page.cc | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 0a5acaae3b9bfcd731bc4e072f35f9433aa773da
@@ -37943,18 +41131,18 @@ Date:	Sat Jun 30 08:25:15 2007 +0000
 	in order to make it more consistent with the current API and
 	easier to use.
 
- ChangeLog		    |	15 +++
- glib/Makefile.am	    |	 2 +
- glib/poppler-document.cc   |  197 ++-------------------------
- glib/poppler-document.h    |	55 +-------
- glib/poppler-form-field.cc |  316
- ++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-form-field.h  |	96 ++++++++++++++
- glib/poppler-page.cc	    |  210 ++++++++++++-----------------
- glib/poppler-page.h	    |	55 ++------
- glib/poppler-private.h     |	11 +-
- glib/poppler.h		    |	40 +++---
- glib/test-poppler-glib.c   |  119 ++++++++++++++---
+ ChangeLog		    |  15 +++
+ glib/Makefile.am	    |	2 +
+ glib/poppler-document.cc   | 197 ++--------------------------
+ glib/poppler-document.h    |  55 +-------
+ glib/poppler-form-field.cc | 316
+ +++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-form-field.h  |  96 ++++++++++++++
+ glib/poppler-page.cc	    | 210 ++++++++++++------------------
+ glib/poppler-page.h	    |  55 ++------
+ glib/poppler-private.h     |  11 +-
+ glib/poppler.h		    |  40 +++---
+ glib/test-poppler-glib.c   | 119 ++++++++++++++---
  11 files changed, 662 insertions(+), 454 deletions(-)
 
 commit 2212874e57a6eb9db733b2e9a98f0cfcb88a8fc1
@@ -37965,8 +41153,8 @@ Date:	Tue Jun 26 21:31:07 2007 +0000
 	    but no
 	    AcroForm->Fields (it's mandatory but...)
 
- ChangeLog	 |    5 +++++
- poppler/Form.cc |   54
+ ChangeLog	 |  5 +++++
+ poppler/Form.cc | 54
  +++++++++++++++++++++++++++++-------------------------
  2 files changed, 34 insertions(+), 25 deletions(-)
 
@@ -37978,9 +41166,9 @@ Date:	Sat Jun 23 18:06:07 2007 +0000
 	* poppler/Annot.cc:
 	* poppler/Form.cc: Fix memory leaks.
 
- ChangeLog	  |    5 +++++
- poppler/Annot.cc |    2 +-
- poppler/Form.cc  |   13 +++++++++----
+ ChangeLog	  |  5 +++++
+ poppler/Annot.cc |  2 +-
+ poppler/Form.cc  | 13 +++++++++----
  3 files changed, 15 insertions(+), 5 deletions(-)
 
 commit d874a2753e3ac51b6f539dfdf980435c8c381b4f
@@ -37993,10 +41181,10 @@ Date:	Wed Jun 20 20:07:15 2007 +0000
 	from the qt4 binding. Based on patch by Jason Kivlighn
 	* qt4/tests/test-poppler-qt4.cpp: Print metadata if it exists
 
- ChangeLog			|    5 +++++
- qt4/src/poppler-document.cc	|   13 +++++++++++++
- qt4/src/poppler-qt4.h		|    5 +++++
- qt4/tests/test-poppler-qt4.cpp |    1 +
+ ChangeLog			|  5 +++++
+ qt4/src/poppler-document.cc	| 13 +++++++++++++
+ qt4/src/poppler-qt4.h		|  5 +++++
+ qt4/tests/test-poppler-qt4.cpp |  1 +
  4 files changed, 24 insertions(+)
 
 commit 08d4c437e735ac50a340c4ae17ee0eeccd00dc20
@@ -38008,8 +41196,8 @@ Date:	Wed Jun 20 18:40:03 2007 +0000
 	   through the glib binding. Patch by Jason Kivlighn
 	   <jkivlighn@gmail.com> Approved by Carlos
 
- ChangeLog		  |    6 ++++++
- glib/poppler-document.cc |   21 +++++++++++++++++++++
+ ChangeLog		  |  6 ++++++
+ glib/poppler-document.cc | 21 +++++++++++++++++++++
  2 files changed, 27 insertions(+)
 
 commit cdd2a49dc99aa16ded674c58dbb50298f06cf18a
@@ -38024,9 +41212,9 @@ Date:	Fri Jun 15 18:15:53 2007 +0000
 	    Jauco Noordzij <jauco.noordzij@gmail.com>. More info at
 	    bug #11273
 
- ChangeLog		 |    8 +
- poppler/ABWOutputDev.cc |  384
- ++++++++++++-----------------------------------
+ ChangeLog		 |   8 +
+ poppler/ABWOutputDev.cc | 384
+ ++++++++++++------------------------------------
  2 files changed, 106 insertions(+), 286 deletions(-)
 
 commit 7f23383197b0e2fa24be7b4925ea6f39eb95bbc1
@@ -38038,10 +41226,10 @@ Date:	Wed Jun 13 20:39:21 2007 +0000
 	    by
 	    Jauco Noordzij <jauco.noordzij@gmail.com>. Fixes bug #11187
 
- ChangeLog		 |    6 ++++
- poppler/ABWOutputDev.cc |   80
- ++++++++++++++++++++++++++++++++++++++++++++++-
- poppler/ABWOutputDev.h  |    1 +
+ ChangeLog		 |  6 ++++
+ poppler/ABWOutputDev.cc | 80
+ ++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/ABWOutputDev.h  |  1 +
  3 files changed, 86 insertions(+), 1 deletion(-)
 
 commit 948520cd529ce47d1970aae6a0b8058128e37c30
@@ -38067,12 +41255,12 @@ Date:	Wed Jun 13 18:50:40 2007 +0000
 	    .../include/poppler
 	    in the include path
 
- ChangeLog		     |	 16 ++++++++++++++++
- goo/FixedPoint.h	     |	  2 +-
- goo/gmem.h		     |	  2 +-
- poppler/SecurityHandler.h   |	  2 +-
- poppler/poppler-config.h.in |	 12 +++++++++++-
- utils/ImageOutputDev.h      |	  2 +-
+ ChangeLog		     | 16 ++++++++++++++++
+ goo/FixedPoint.h	     |	2 +-
+ goo/gmem.h		     |	2 +-
+ poppler/SecurityHandler.h   |	2 +-
+ poppler/poppler-config.h.in | 12 +++++++++++-
+ utils/ImageOutputDev.h      |	2 +-
  6 files changed, 31 insertions(+), 5 deletions(-)
 
 commit 825461e47b05595805e87a0d2960b07197c8da8b
@@ -38081,8 +41269,8 @@ Date:	Wed Jun 13 18:24:56 2007 +0000
 
     configure.ac: Fix detection of glib
 
- ChangeLog    |    4 ++++
- configure.ac |    2 +-
+ ChangeLog    | 4 ++++
+ configure.ac | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit a67a93fc6b4812a4f892b311c5b299e59283cd47
@@ -38097,12 +41285,12 @@ Date:	Mon Jun 11 21:14:22 2007 +0000
 	    Axel Howind
 	    on bug #11228
 
- ChangeLog		     |	  9 +++++++++
- poppler/CMap.h		     |	  2 +-
- poppler/CharCodeToUnicode.h |	  2 +-
- poppler/GlobalParams.h      |	  2 +-
- poppler/PageLabelInfo.h     |	  6 +++---
- poppler/UnicodeMap.h	     |	  2 +-
+ ChangeLog		     | 9 +++++++++
+ poppler/CMap.h		     | 2 +-
+ poppler/CharCodeToUnicode.h | 2 +-
+ poppler/GlobalParams.h      | 2 +-
+ poppler/PageLabelInfo.h     | 6 +++---
+ poppler/UnicodeMap.h	     | 2 +-
  6 files changed, 16 insertions(+), 7 deletions(-)
 
 commit 051b31af053cac4727718169b79b25451a4bdd95
@@ -38112,9 +41300,9 @@ Date:	Mon Jun 11 21:11:05 2007 +0000
 	   * qt/poppler-qt.h
 	   * qt4/src/poppler-qt4.h: Headers cleanup
 
- ChangeLog	       |    5 +++++
- qt/poppler-qt.h       |    6 +++---
- qt4/src/poppler-qt4.h |    8 ++++----
+ ChangeLog	       | 5 +++++
+ qt/poppler-qt.h       | 6 +++---
+ qt4/src/poppler-qt4.h | 8 ++++----
  3 files changed, 12 insertions(+), 7 deletions(-)
 
 commit 3e1597b80fc6750f1ec3269f9819aa8225879524
@@ -38123,8 +41311,8 @@ Date:	Fri Jun 8 22:39:23 2007 +0000
 
     poppler/Annot.cc: Fix leak
 
- ChangeLog	  |    4 ++++
- poppler/Annot.cc |    1 +
+ ChangeLog	  | 4 ++++
+ poppler/Annot.cc | 1 +
  2 files changed, 5 insertions(+)
 
 commit 49535c20b4f71d1c1381134233e2e1449cf560c0
@@ -38138,9 +41326,9 @@ Date:	Thu Jun 7 21:23:03 2007 +0000
 	"!" for consistency with the rest of the code. Patch by Jens
 	Granseuer
 
- ChangeLog		 |    5 +++
- poppler/ABWOutputDev.cc |   93
- ++++++++++++++++++++++++-----------------------
+ ChangeLog		 |  5 +++
+ poppler/ABWOutputDev.cc | 93
+ +++++++++++++++++++++++++------------------------
  2 files changed, 52 insertions(+), 46 deletions(-)
 
 commit dd8fa975bf51dd18120369d0ef2d8f1781e04d93
@@ -38149,7 +41337,7 @@ Date:	Sat Jun 2 09:18:11 2007 +0000
 
     correct form of patch 11102
 
- utils/HtmlFonts.cc |	 5 ++++-
+ utils/HtmlFonts.cc | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 commit cdf70857ece0748f13b11c923ccf9626094555b4
@@ -38162,10 +41350,10 @@ Date:	Fri Jun 1 18:34:48 2007 +0000
 	    --enable-fixedpoint. Fixes
 	    bug 11110
 
- ChangeLog		    |	 7 +++++++
- poppler/ArthurOutputDev.cc |	 8 ++++----
- splash/SplashFTFont.cc     |	 8 ++++----
- splash/SplashMath.h	    |	 2 +-
+ ChangeLog		    | 7 +++++++
+ poppler/ArthurOutputDev.cc | 8 ++++----
+ splash/SplashFTFont.cc     | 8 ++++----
+ splash/SplashMath.h	    | 2 +-
  4 files changed, 16 insertions(+), 9 deletions(-)
 
 commit 90b1a404629a884cc32737a3a729c9a75f7a59c1
@@ -38178,8 +41366,8 @@ Date:	Wed May 30 18:33:24 2007 +0000
 	    they got
 	    it from.
 
- ChangeLog    |    6 ++++++
- configure.ac |    2 +-
+ ChangeLog    | 6 ++++++
+ configure.ac | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 03d766ea1ddd4ce6d938f96b53906a7dc8bd179a
@@ -38188,7 +41376,7 @@ Date:	Wed May 30 18:29:57 2007 +0000
 
     make dist needs this
 
- qt4/src/Makefile.am |	  2 ++
+ qt4/src/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 commit d540c04268047fdd125ad932ca05c7553a97c0fe
@@ -38201,14 +41389,14 @@ Date:	Wed May 30 17:50:00 2007 +0000
 
     And some changes in glib/reference/tmpl
 
- ChangeLog				   |	5 +
- glib/reference/tmpl/poppler-document.sgml |	4 +
- glib/reference/tmpl/poppler-enums.sgml    |  150
- +++++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-page.sgml	   |	5 +-
- glib/reference/tmpl/poppler-unused.sgml   |  130
- -------------------------
- utils/HtmlFonts.cc			   |	2 +-
+ ChangeLog				   |   5 +
+ glib/reference/tmpl/poppler-document.sgml |   4 +
+ glib/reference/tmpl/poppler-enums.sgml    | 150
+ ++++++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-page.sgml	   |   5 +-
+ glib/reference/tmpl/poppler-unused.sgml   | 130
+ --------------------------
+ utils/HtmlFonts.cc			   |   2 +-
  6 files changed, 162 insertions(+), 134 deletions(-)
 
 commit ce414f2a36f4d97a3bddfd42baabdc1e34bf9321
@@ -38219,9 +41407,8 @@ Date:	Tue May 29 22:01:58 2007 +0000
 
 	* poppler/gen-unicode-tables.py: Add this script to fix distcheck.
 
- ChangeLog		       |    4 ++++
- poppler/gen-unicode-tables.py |   38
- ++++++++++++++++++++++++++++++++++++++
+ ChangeLog		       |  4 ++++
+ poppler/gen-unicode-tables.py | 38 ++++++++++++++++++++++++++++++++++++++
  2 files changed, 42 insertions(+)
 
 commit 97e602752b05f3690acb1821bdca31c5771361e1
@@ -38234,11 +41421,11 @@ Date:	Sun May 27 11:24:40 2007 +0000
 	* glib/poppler-page.h:
 	Fix indentation, some code cleanups and memory leaks.
 
- ChangeLog		  |    7 ++
- glib/poppler-page.cc	  |  198
- ++++++++++++++++++++++++++++------------------
- glib/poppler-page.h	  |    6 +-
- glib/test-poppler-glib.c |   39 +++++++++
+ ChangeLog		  |   7 ++
+ glib/poppler-page.cc	  | 198
+ ++++++++++++++++++++++++++++-------------------
+ glib/poppler-page.h	  |   6 +-
+ glib/test-poppler-glib.c |  39 ++++++++++
  4 files changed, 168 insertions(+), 82 deletions(-)
 
 commit 3d31c2b1ea913fc80211f1c6fed9b3666f124049
@@ -38250,10 +41437,10 @@ Date:	Sun May 27 10:12:56 2007 +0000
 	* glib/poppler-page.h:
 	Add missing image mapping type definition.
 
- ChangeLog	      |    6 ++++++
- glib/poppler-page.cc |   48
+ ChangeLog	      |  6 ++++++
+ glib/poppler-page.cc | 48
  +++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-page.h  |    5 +++++
+ glib/poppler-page.h  |  5 +++++
  3 files changed, 56 insertions(+), 3 deletions(-)
 
 commit 8284a769568322066a9d4626bd9b2cf3d18a6487
@@ -38263,9 +41450,9 @@ Date:	Sat May 26 23:20:12 2007 +0000
 	    * configure.ac:
 	    * NEWS: Bump release to 0.5.9 (0.6 Release Candidate)
 
- ChangeLog    |    2 ++
- NEWS	      |   15 +++++++++++++++
- configure.ac |    2 +-
+ ChangeLog    |  2 ++
+ NEWS	      | 15 +++++++++++++++
+ configure.ac |  2 +-
  3 files changed, 18 insertions(+), 1 deletion(-)
 
 commit e6ff9e0d95e058f6aff3c72d5f4d7d7ccf661999
@@ -38281,11 +41468,11 @@ Date:	Sat May 26 22:33:21 2007 +0000
 	    don't get
 	    conflicts when making separate qt3 and qt4 packages
 
- ChangeLog	     |	  9 +++++++++
- poppler-qt.pc.in    |	  2 +-
- poppler-qt4.pc.in   |	  2 +-
- qt/Makefile.am      |	  2 +-
- qt4/src/Makefile.am |	  2 +-
+ ChangeLog	     | 9 +++++++++
+ poppler-qt.pc.in    | 2 +-
+ poppler-qt4.pc.in   | 2 +-
+ qt/Makefile.am      | 2 +-
+ qt4/src/Makefile.am | 2 +-
  5 files changed, 13 insertions(+), 4 deletions(-)
 
 commit fefefe495a182c1745314186b99441b9e76ba5b4
@@ -38301,12 +41488,12 @@ Date:	Fri May 25 23:17:58 2007 +0000
 	    transformations
 	    * qt4/src/poppler-private.h: Fix indentation
 
- ChangeLog				  |    6 ++++++
- qt4/src/poppler-link-extractor-private.h |    1 +
- qt4/src/poppler-link-extractor.cc	  |   12 ++++++------
- qt4/src/poppler-link.cc		  |   25 +++++++++++++++----------
- qt4/src/poppler-link.h			  |    7 ++++++-
- qt4/src/poppler-private.h		  |   15 ++++++++-------
+ ChangeLog				  |  6 ++++++
+ qt4/src/poppler-link-extractor-private.h |  1 +
+ qt4/src/poppler-link-extractor.cc	  | 12 ++++++------
+ qt4/src/poppler-link.cc		  | 25 +++++++++++++++----------
+ qt4/src/poppler-link.h			  |  7 ++++++-
+ qt4/src/poppler-private.h		  | 15 ++++++++-------
  6 files changed, 42 insertions(+), 24 deletions(-)
 
 commit ecaeaa9512d1dae4a036703ea8739102a8e463f0
@@ -38317,8 +41504,8 @@ Date:	Fri May 25 22:30:20 2007 +0000
 	    to extract
 	    link clickable area
 
- ChangeLog			   |	5 +++++
- qt4/src/poppler-link-extractor.cc |	2 +-
+ ChangeLog			   | 5 +++++
+ qt4/src/poppler-link-extractor.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 774a9456c668ef70b2e8f17d59f8f427aa97bad5
@@ -38333,10 +41520,10 @@ Date:	Fri May 25 18:43:04 2007 +0000
 	Don't cache DisplayFontParams by font name, instead cache them
 	in GfxFont. Fixes #8140.
 
- ChangeLog		 |    8 ++++++++
- poppler/GfxFont.cc	 |    2 ++
- poppler/GfxFont.h	 |    6 ++++++
- poppler/GlobalParams.cc |    4 ++--
+ ChangeLog		 | 8 ++++++++
+ poppler/GfxFont.cc	 | 2 ++
+ poppler/GfxFont.h	 | 6 ++++++
+ poppler/GlobalParams.cc | 4 ++--
  4 files changed, 18 insertions(+), 2 deletions(-)
 
 commit a88fadf0bb9af55c83c9c4f7d08deb17d6aa9ae4
@@ -38351,10 +41538,10 @@ Date:	Fri May 25 17:33:37 2007 +0000
 	to allow
 	requesting selections of words and paragraphs.
 
- ChangeLog	      |    8 ++++++++
- glib/poppler-page.cc |   30 ++++++++++++++++--------------
- glib/poppler-page.h  |    6 ++++--
- glib/poppler.h       |    7 +++++++
+ ChangeLog	      |  8 ++++++++
+ glib/poppler-page.cc | 30 ++++++++++++++++--------------
+ glib/poppler-page.h  |  6 ++++--
+ glib/poppler.h       |  7 +++++++
  4 files changed, 35 insertions(+), 16 deletions(-)
 
 commit bf195b489c22875695e202d6ca6659144ef57e61
@@ -38370,13 +41557,13 @@ Date:	Wed May 23 21:20:58 2007 +0000
 	    * qt4/src/poppler-qt4.h:
 	    A few of API documentation fixes and improvements.
 
- ChangeLog		     |	 10 ++++++++
- qt4/src/Mainpage.dox	     |	  8 ++----
- qt4/src/poppler-document.cc |	  5 ++--
- qt4/src/poppler-link.h      |	  4 ++-
- qt4/src/poppler-private.h   |	  1 +
- qt4/src/poppler-qt4.h	     |	 57
- ++++++++++++++++++++++++++++---------------
+ ChangeLog		     | 10 ++++++++
+ qt4/src/Mainpage.dox	     |	8 ++-----
+ qt4/src/poppler-document.cc |	5 ++--
+ qt4/src/poppler-link.h      |	4 +++-
+ qt4/src/poppler-private.h   |	1 +
+ qt4/src/poppler-qt4.h	     | 57
+ ++++++++++++++++++++++++++++++---------------
  6 files changed, 57 insertions(+), 28 deletions(-)
 
 commit 36d1fe292778ba29990a389c50a0df0d51f11913
@@ -38385,8 +41572,8 @@ Date:	Mon May 21 21:42:38 2007 +0000
 
     Fix assert in bug 11023
 
- ChangeLog		|    4 ++++
- glib/poppler-action.cc |    2 +-
+ ChangeLog		| 4 ++++
+ glib/poppler-action.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 5b411246a2cce6ed3bb2d8c9e9d856227b6aba7f
@@ -38397,10 +41584,10 @@ Date:	Mon May 21 21:39:08 2007 +0000
 	    * glib/poppler-page.h:
 	    poppler_page_render_section() for cairo. Bug 7023
 
- ChangeLog	      |    6 ++++
- glib/poppler-page.cc |   88
- ++++++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h  |    9 ++++++
+ ChangeLog	      |  6 ++++
+ glib/poppler-page.cc | 88
+ ++++++++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h  |  9 ++++++
  3 files changed, 93 insertions(+), 10 deletions(-)
 
 commit 409f2a9cb31add29accb87011331c50dc08110cd
@@ -38416,15 +41603,15 @@ Date:	Mon May 21 21:35:10 2007 +0000
 	    * poppler/CairoOutputDev.h: Extend CairoOutputdev to do
 	    image caching when rendering
 
- ChangeLog		   |   11 +++
- glib/poppler-page.cc	   |  161 +++++++++++++++++++++++++++++++--
- glib/poppler-page.h	   |   10 +++
- glib/poppler-private.h    |	3 +
- glib/poppler.h		   |	9 +-
- glib/test-poppler-glib.c  |   27 +++++-
- poppler/CairoOutputDev.cc |  215
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |  122 +++++++++++++++++++++++++
+ ChangeLog		   |  11 +++
+ glib/poppler-page.cc	   | 161 ++++++++++++++++++++++++++++++++--
+ glib/poppler-page.h	   |  10 +++
+ glib/poppler-private.h    |   3 +
+ glib/poppler.h		   |   9 +-
+ glib/test-poppler-glib.c  |  27 +++++-
+ poppler/CairoOutputDev.cc | 215
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  | 122 ++++++++++++++++++++++++++
  8 files changed, 545 insertions(+), 13 deletions(-)
 
 commit afd11ec66430dae084b5a5560333e933460fc637
@@ -38442,11 +41629,11 @@ Date:	Mon May 21 21:29:09 2007 +0000
 	    components in
 	    any SplashColor always be 4
 
- ChangeLog		   |   11 +++++++++++
- poppler/Annot.cc	   |	6 ++++++
- poppler/Form.cc	   |	1 +
- qt4/src/poppler-private.h |	5 ++++-
- splash/SplashTypes.h	   |	6 +-----
+ ChangeLog		   | 11 +++++++++++
+ poppler/Annot.cc	   |  6 ++++++
+ poppler/Form.cc	   |  1 +
+ qt4/src/poppler-private.h |  5 ++++-
+ splash/SplashTypes.h	   |  6 +-----
  5 files changed, 23 insertions(+), 6 deletions(-)
 
 commit f019c8a8efde004e1663ea88cb48c0e46318d936
@@ -38460,9 +41647,9 @@ Date:	Thu May 17 21:32:57 2007 +0000
 	    * qt4/src/poppler-private.h:
 	    Fix memory leak when converting QString -> GooString
 
- ChangeLog		   |	7 +++++++
- qt4/src/poppler-link.cc   |   12 ++++++++++++
- qt4/src/poppler-private.h |	4 +++-
+ ChangeLog		   |  7 +++++++
+ qt4/src/poppler-link.cc   | 12 ++++++++++++
+ qt4/src/poppler-private.h |  4 +++-
  3 files changed, 22 insertions(+), 1 deletion(-)
 
 commit d68a4eb44b5390b3093774f39a6805ad2e95c146
@@ -38475,8 +41662,8 @@ Date:	Sun May 13 00:53:43 2007 +0000
 	choice or
 	other fields that contain text. Patch by Julien Rebetez.
 
- ChangeLog	  |    5 +++++
- poppler/Annot.cc |   52
+ ChangeLog	  |  5 +++++
+ poppler/Annot.cc | 52
  ++++++++++++++++++++++++++++++++++++++++++++++------
  2 files changed, 51 insertions(+), 6 deletions(-)
 
@@ -38490,10 +41677,10 @@ Date:	Mon May 7 18:41:09 2007 +0000
 	    implementation
 	    * Page.cc: Fix leak
 
- ChangeLog	    |	 7 +++++++
- poppler/Catalog.cc |	 1 +
- poppler/Form.cc    |	 5 +++++
- poppler/Page.cc    |	 1 +
+ ChangeLog	    | 7 +++++++
+ poppler/Catalog.cc | 1 +
+ poppler/Form.cc    | 5 +++++
+ poppler/Page.cc    | 1 +
  4 files changed, 14 insertions(+)
 
 commit d46553d696b2d7fe416ce8db40db54dd1d7c6733
@@ -38506,8 +41693,8 @@ Date:	Mon Apr 30 22:34:21 2007 +0000
 	    glib frontend
 	    the qt one does not end up depending on cairo
 
- ChangeLog	     |	  6 ++++++
- poppler/Makefile.am |	  1 -
+ ChangeLog	     | 6 ++++++
+ poppler/Makefile.am | 1 -
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit d5c52409c532a126bcb8eb65f6f1390113a5f258
@@ -38516,7 +41703,7 @@ Date:	Sun Apr 29 17:37:38 2007 +0000
 
     jeff committed this line by mistake
 
- ChangeLog |	1 -
+ ChangeLog | 1 -
  1 file changed, 1 deletion(-)
 
 commit 6ddc11ef4c534369ee104422bfb989603c466790
@@ -38533,8 +41720,8 @@ Date:	Sun Apr 29 17:33:58 2007 +0000
 	before: 1415838  128864       8 1544710  179206 libpoppler.so
 	after:	1404574  140128       8 1544710  179206 libpoppler.so
 
- ChangeLog		     |	 10 ++++++++++
- poppler/UnicodeTypeTable.cc |	 24 ++++++++++++------------
+ ChangeLog		     | 10 ++++++++++
+ poppler/UnicodeTypeTable.cc | 24 ++++++++++++------------
  2 files changed, 22 insertions(+), 12 deletions(-)
 
 commit c5613ab5ce65fc84eb3a5584cee1454171173fa7
@@ -38550,14 +41737,14 @@ Date:	Sat Apr 28 23:25:59 2007 +0000
 	    splashModeXBGR8 and
 	    hopefully fix qt frontends image generation
 
- ChangeLog		    |	10 +++++
- poppler/SplashOutputDev.cc |  102
- ++++++++++++++++++++++++++++++++------------
- qt/poppler-private.h	    |	 2 +-
- qt4/src/poppler-private.h  |	 2 +-
- splash/Splash.cc	    |	44 ++++++++++---------
- splash/SplashBitmap.cc     |	16 +++----
- splash/SplashTypes.h	    |	 4 +-
+ ChangeLog		    |  10 +++++
+ poppler/SplashOutputDev.cc | 102
+ +++++++++++++++++++++++++++++++++------------
+ qt/poppler-private.h	    |	2 +-
+ qt4/src/poppler-private.h  |	2 +-
+ splash/Splash.cc	    |  44 +++++++++----------
+ splash/SplashBitmap.cc     |  16 +++----
+ splash/SplashTypes.h	    |	4 +-
  7 files changed, 120 insertions(+), 60 deletions(-)
 
 commit 6479ce224f1393235ca9888dfe0710327fbfccd2
@@ -38566,8 +41753,8 @@ Date:	Sat Apr 28 22:12:22 2007 +0000
 
     fix merging problems
 
- splash/Splash.cc	|    1 +
- splash/SplashBitmap.cc |    1 -
+ splash/Splash.cc	| 1 +
+ splash/SplashBitmap.cc | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)
 
 commit e2ac4ada3e29139053871ff7f53772e1ccc7adc0
@@ -38577,7 +41764,7 @@ Date:	Sat Apr 28 15:39:36 2007 +0000
     \n at the end of the printf
     Although i'm not sure we want to printf this...
 
- poppler/GlobalParams.cc |    2 +-
+ poppler/GlobalParams.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 9b8133940638c95940edcb9b98126ca9a4f7b8d4
@@ -38595,12 +41782,12 @@ Date:	Sat Apr 28 12:00:38 2007 +0000
 	    to the
 	    printing process.
 
- ChangeLog			 |   10 +++
- qt4/src/Makefile.am		 |    1 +
- qt4/src/poppler-document.cc	 |   39 ++------
- qt4/src/poppler-ps-converter.cc |  190
- +++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h		 |  119 ++++++++++++++++++++----
+ ChangeLog			 |  10 +++
+ qt4/src/Makefile.am		 |   1 +
+ qt4/src/poppler-document.cc	 |  39 ++-------
+ qt4/src/poppler-ps-converter.cc | 190
+ ++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h		 | 119 +++++++++++++++++++++----
  5 files changed, 307 insertions(+), 52 deletions(-)
 
 commit 26d5fefcd4c858e2ebd689d963a65773957ac808
@@ -38612,8 +41799,8 @@ Date:	Sat Apr 28 11:35:34 2007 +0000
 	   using
 	   ArthurOutputDev.
 
- ChangeLog		 |    6 ++++++
- qt4/src/poppler-page.cc |    2 +-
+ ChangeLog		 | 6 ++++++
+ qt4/src/poppler-page.cc | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 218364bc4951682de8e63e1bd3f061636b08b615
@@ -38627,11 +41814,11 @@ Date:	Sat Apr 28 11:34:14 2007 +0000
 	    of the
 	    frontends and helper classes. Forgot to do it before merging.
 
- ChangeLog		 |    8 ++++++++
- glib/poppler-document.h |    6 +++++-
- poppler/FontInfo.h	 |    6 +++++-
- qt/poppler-qt.h	 |    6 +++++-
- qt4/src/poppler-qt4.h	 |   20 ++++++++++++--------
+ ChangeLog		 |  8 ++++++++
+ glib/poppler-document.h |  6 +++++-
+ poppler/FontInfo.h	 |  6 +++++-
+ qt/poppler-qt.h	 |  6 +++++-
+ qt4/src/poppler-qt4.h	 | 20 ++++++++++++--------
  5 files changed, 35 insertions(+), 11 deletions(-)
 
 commit c1a40d3b4e9b27e34c94c9477a0313534563a394
@@ -38641,8 +41828,8 @@ Date:	Sat Apr 28 11:20:58 2007 +0000
 	    * qt4/src/poppler-annotation.h:
 	    Make the header clean.
 
- ChangeLog		      |    5 +++++
- qt4/src/poppler-annotation.h |    3 +++
+ ChangeLog		      | 5 +++++
+ qt4/src/poppler-annotation.h | 3 +++
  2 files changed, 8 insertions(+)
 
 commit 3f4bf880b95e28a1ae7a38b18b341e089860780c
@@ -38662,15 +41849,15 @@ Date:	Sat Apr 28 11:16:49 2007 +0000
 	   parameter
 	   of the Page::render() can be dropped.
 
- ChangeLog				  |   13 ++++++
- qt4/src/Makefile.am			  |    3 +-
- qt4/src/poppler-link-extractor-private.h |   55 ++++++++++++++++++++++
- qt4/src/poppler-link-extractor.cc	  |   74
- ++++++++++++++++++++++++++++++
- qt4/src/poppler-page-private.h		  |   38 +++++++++++++++
- qt4/src/poppler-page.cc		  |   52 ++++-----------------
- qt4/src/poppler-private.h		  |    5 +-
- qt4/src/poppler-qt4.h			  |    4 +-
+ ChangeLog				  | 13 ++++++
+ qt4/src/Makefile.am			  |  3 +-
+ qt4/src/poppler-link-extractor-private.h | 55 ++++++++++++++++++++++++
+ qt4/src/poppler-link-extractor.cc	  | 74
+ ++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page-private.h		  | 38 ++++++++++++++++
+ qt4/src/poppler-page.cc		  | 52 ++++------------------
+ qt4/src/poppler-private.h		  |  5 ++-
+ qt4/src/poppler-qt4.h			  |  4 +-
  8 files changed, 195 insertions(+), 49 deletions(-)
 
 commit 7f9eec9ef4e7dc895d2a3e38014b6368cc7564b6
@@ -38681,30 +41868,30 @@ Date:	Fri Apr 27 22:41:10 2007 +0000
 
 	    * qt4/*: Stop requyring users to declare UNSTABLE_POPPLER_QT4
 
- ChangeLog			    |	 4 ++++
- qt4/src/Doxyfile		    |	 2 +-
- qt4/src/Mainpage.dox		    |	 3 +--
- qt4/src/poppler-document.cc	    |	 2 --
- qt4/src/poppler-embeddedfile.cc    |	 2 --
- qt4/src/poppler-fontinfo.cc	    |	 2 --
- qt4/src/poppler-form.cc	    |	 1 -
- qt4/src/poppler-link.cc	    |	 2 --
- qt4/src/poppler-page.cc	    |	 1 -
- qt4/src/poppler-qt4.h		    |	 3 ---
- qt4/src/poppler-sound.cc	    |	 2 --
- qt4/src/poppler-textbox.cc	    |	 2 --
- qt4/tests/check_attachments.cpp    |	 1 -
- qt4/tests/check_dateConversion.cpp |	 1 -
- qt4/tests/check_fonts.cpp	    |	 1 -
- qt4/tests/check_metadata.cpp	    |	 1 -
- qt4/tests/check_pagelayout.cpp     |	 1 -
- qt4/tests/check_pagemode.cpp	    |	 1 -
- qt4/tests/check_permissions.cpp    |	 1 -
- qt4/tests/poppler-attachments.cpp  |	 1 -
- qt4/tests/poppler-fonts.cpp	    |	 1 -
- qt4/tests/stress-poppler-qt4.cpp   |	 1 -
- qt4/tests/test-password-qt4.cpp    |	 1 -
- qt4/tests/test-poppler-qt4.cpp     |	 1 -
+ ChangeLog			    | 4 ++++
+ qt4/src/Doxyfile		    | 2 +-
+ qt4/src/Mainpage.dox		    | 3 +--
+ qt4/src/poppler-document.cc	    | 2 --
+ qt4/src/poppler-embeddedfile.cc    | 2 --
+ qt4/src/poppler-fontinfo.cc	    | 2 --
+ qt4/src/poppler-form.cc	    | 1 -
+ qt4/src/poppler-link.cc	    | 2 --
+ qt4/src/poppler-page.cc	    | 1 -
+ qt4/src/poppler-qt4.h		    | 3 ---
+ qt4/src/poppler-sound.cc	    | 2 --
+ qt4/src/poppler-textbox.cc	    | 2 --
+ qt4/tests/check_attachments.cpp    | 1 -
+ qt4/tests/check_dateConversion.cpp | 1 -
+ qt4/tests/check_fonts.cpp	    | 1 -
+ qt4/tests/check_metadata.cpp	    | 1 -
+ qt4/tests/check_pagelayout.cpp     | 1 -
+ qt4/tests/check_pagemode.cpp	    | 1 -
+ qt4/tests/check_permissions.cpp    | 1 -
+ qt4/tests/poppler-attachments.cpp  | 1 -
+ qt4/tests/poppler-fonts.cpp	    | 1 -
+ qt4/tests/stress-poppler-qt4.cpp   | 1 -
+ qt4/tests/test-password-qt4.cpp    | 1 -
+ qt4/tests/test-poppler-qt4.cpp     | 1 -
  24 files changed, 6 insertions(+), 32 deletions(-)
 
 commit 45993a6faafd7646075bc6630d5d2ad7a44f7e20
@@ -38727,17 +41914,17 @@ Date:	Fri Apr 27 22:26:09 2007 +0000
 	    frontends to poppler core. Expose Page transitions on the glib
 	    frontend.
 
- ChangeLog		       |   15 ++++
- glib/poppler-page.cc	       |  122 +++++++++++++++++++++++++
- glib/poppler-page.h	       |  111 +++++++++++++----------
- glib/poppler.h		       |   58 ++++++++----
- glib/test-poppler-glib.c      |   60 +++++++++++++
- poppler/Makefile.am	       |    2 +
- poppler/PageTransition.cc     |  197
- +++++++++++++++--------------------------
- poppler/PageTransition.h      |   86 ++++++++++++++++++
- qt/poppler-page-transition.cc |  145 ++++++------------------------
- qt/poppler-page-transition.h  |    9 +-
+ ChangeLog		       |  15 ++++
+ glib/poppler-page.cc	       | 122 ++++++++++++++++++++++++++
+ glib/poppler-page.h	       | 111 ++++++++++++++----------
+ glib/poppler.h		       |  58 +++++++++----
+ glib/test-poppler-glib.c      |  60 +++++++++++++
+ poppler/Makefile.am	       |   2 +
+ poppler/PageTransition.cc     | 197
+ +++++++++++++++---------------------------
+ poppler/PageTransition.h      |  86 ++++++++++++++++++
+ qt/poppler-page-transition.cc | 145 ++++++-------------------------
+ qt/poppler-page-transition.h  |   9 +-
  10 files changed, 497 insertions(+), 308 deletions(-)
 
 commit 877d6b202a75eb12119b16e740f85cc8b477d589
@@ -38761,16 +41948,16 @@ Date:	Fri Apr 27 21:25:30 2007 +0000
     Patches for other frontends more than welcome
     Comments and suggestions even more than welcome :-)
 
- ChangeLog		     |	 14 +++++++++++++
- glib/poppler-page.cc	     |	  3 ++-
- poppler/PSOutputDev.cc      |	 48
- +++++++++++++++++++++++++++++--------------
- poppler/PSOutputDev.h	     |	 17 +++++++++------
- qt/poppler-document.cc      |	  2 +-
- qt4/src/poppler-document.cc |	  9 ++++++--
- qt4/src/poppler-qt4.h	     |	  2 +-
- utils/pdftohtml.cc	     |	  2 +-
- utils/pdftops.cc	     |	  2 +-
+ ChangeLog		     | 14 +++++++++++++
+ glib/poppler-page.cc	     |	3 ++-
+ poppler/PSOutputDev.cc      | 48
+ +++++++++++++++++++++++++++++++--------------
+ poppler/PSOutputDev.h	     | 17 ++++++++++------
+ qt/poppler-document.cc      |	2 +-
+ qt4/src/poppler-document.cc |	9 +++++++--
+ qt4/src/poppler-qt4.h	     |	2 +-
+ utils/pdftohtml.cc	     |	2 +-
+ utils/pdftops.cc	     |	2 +-
  9 files changed, 71 insertions(+), 28 deletions(-)
 
 commit 99053be5357235c47a87775985646ef8d9880ed9
@@ -38779,8 +41966,8 @@ Date:	Thu Apr 26 17:57:01 2007 +0000
 
 	    * goo/Makefile.am: Remove duplicate gmem.h
 
- ChangeLog	 |    4 ++++
- goo/Makefile.am |    1 -
+ ChangeLog	 | 4 ++++
+ goo/Makefile.am | 1 -
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit f6adb46cd88d23b34f1918d3be31c05b68b6a443
@@ -38789,7 +41976,7 @@ Date:	Wed Apr 25 21:31:17 2007 +0000
 
     ignore pdftoabw binary
 
- utils/.cvsignore |    1 +
+ utils/.cvsignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit e09f231ac6c03ac2c3606f1bf20ba1bde3d85abd
@@ -38802,9 +41989,9 @@ Date:	Wed Apr 25 21:25:06 2007 +0000
 	    needed
 	    * qt4/src/poppler-private: initilize m_hints
 
- ChangeLog		     |	  5 +++++
- qt4/src/poppler-document.cc |	  1 -
- qt4/src/poppler-private.h   |	  1 +
+ ChangeLog		     | 5 +++++
+ qt4/src/poppler-document.cc | 1 -
+ qt4/src/poppler-private.h   | 1 +
  3 files changed, 6 insertions(+), 1 deletion(-)
 
 commit bf7e0e980bf29994021cb1228f89f582adddf284
@@ -38964,8 +42151,8 @@ Date:	Mon Apr 16 21:25:46 2007 +0000
 	   Add the information about the open/close item in the DOM tree
 	   of the TOC.
 
- ChangeLog		   |	7 +++++++
- qt4/src/poppler-private.h |	5 ++++-
+ ChangeLog		   | 7 +++++++
+ qt4/src/poppler-private.h | 5 ++++-
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 6c7969f37c85f326327aca98e0346f2ebc86ffda
@@ -38976,9 +42163,9 @@ Date:	Sat Apr 14 23:19:46 2007 +0000
 	   complex mode.
 	   * utils/pdftohtml.cc: Fix rendering of links.
 
- ChangeLog	    |	 5 +++++
- utils/HtmlFonts.cc |	 8 ++++----
- utils/pdftohtml.cc |	 2 +-
+ ChangeLog	    | 5 +++++
+ utils/HtmlFonts.cc | 8 ++++----
+ utils/pdftohtml.cc | 2 +-
  3 files changed, 10 insertions(+), 5 deletions(-)
 
 commit add8515d7b3fba59c20ed1bbb058cea9e138c1a8
@@ -38990,7 +42177,7 @@ Date:	Sat Apr 14 07:29:04 2007 +0000
 
     CCMAIL: aacid@kde.org
 
- qt4/src/poppler-embeddedfile.cc |    1 -
+ qt4/src/poppler-embeddedfile.cc | 1 -
  1 file changed, 1 deletion(-)
 
 commit f3ded10305f6ac682640c37c21f569db0f830756
@@ -39002,8 +42189,8 @@ Date:	Sat Apr 7 21:12:35 2007 +0000
 	* utils/pdftoabw.cc: Fixing passing the wrong type
 	to fprintf. Patch by Kouhei Sutou. Fixes #10554.
 
- ChangeLog	   |	5 +++++
- utils/pdftoabw.cc |	2 +-
+ ChangeLog	   | 5 +++++
+ utils/pdftoabw.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 2fcb76df955c143153fe4b273d0388fcb7f67d8a
@@ -39026,10 +42213,10 @@ Date:	Fri Apr 6 15:27:52 2007 +0000
 		fail for any reason
 	Patch by Dominic Lachowicz
 
- ChangeLog		 |   12 ++++++
- poppler/ABWOutputDev.cc |    3 ++
- utils/pdftoabw.cc	 |  101
- +++++++++++++++++++++++++++--------------------
+ ChangeLog		 |  12 ++++++
+ poppler/ABWOutputDev.cc |   3 ++
+ utils/pdftoabw.cc	 | 101
+ ++++++++++++++++++++++++++++--------------------
  3 files changed, 74 insertions(+), 42 deletions(-)
 
 commit 29da65ec48b5ba91139084e197ce457d3cff3732
@@ -39039,8 +42226,8 @@ Date:	Thu Apr 5 12:13:51 2007 +0000
     * poppler/PSOutputDev.cc: Readd code wrongly removed when doing the
     GlobalParams cleaning
 
- ChangeLog		|    5 +++++
- poppler/PSOutputDev.cc |    5 +++++
+ ChangeLog		| 5 +++++
+ poppler/PSOutputDev.cc | 5 +++++
  2 files changed, 10 insertions(+)
 
 commit 722b2bd86f58f2d7a914571cccfa195485a70c47
@@ -39076,8 +42263,8 @@ Date:	Thu Mar 22 20:56:24 2007 +0000
 	    images. Fixes
 	    KDE bug 143322
 
- ChangeLog	|    5 +++++
- poppler/Gfx.cc |   14 ++++++++++----
+ ChangeLog	|  5 +++++
+ poppler/Gfx.cc | 14 ++++++++++----
  2 files changed, 15 insertions(+), 4 deletions(-)
 
 commit ff8f8d44ef47a98f7dbdfaa4d27a720b1f37015f
@@ -39087,8 +42274,8 @@ Date:	Thu Mar 15 20:16:13 2007 +0000
 	   * glib/Makefile.am: Make it build with BSD/Make. Patch by
 	   Henry Precheur <henry@precheur.org>
 
- ChangeLog	  |    5 +++++
- glib/Makefile.am |    4 ++--
+ ChangeLog	  | 5 +++++
+ glib/Makefile.am | 4 ++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit bbf7e78b6b2509ecdc476d7f55151ef327470d9d
@@ -39113,14 +42300,14 @@ Date:	Wed Mar 7 19:15:32 2007 +0000
 	   Make the Qt4 frontend compilable again with no Splash.
 	   Make the Qt3 frontend compilable with no Splash.
 
- ChangeLog		 |   18 ++++++++++++++++++
- configure.ac		 |   12 +-----------
- poppler/Page.cc	 |    7 ++++++-
- qt/Makefile.am		 |    1 -
- qt/poppler-link.cc	 |    4 +++-
- qt/poppler-page.cc	 |   16 +++++++++++++++-
- qt/poppler-private.h	 |   11 ++++++++++-
- qt4/src/poppler-link.cc |   10 ++++++----
+ ChangeLog		 | 18 ++++++++++++++++++
+ configure.ac		 | 12 +-----------
+ poppler/Page.cc	 |  7 ++++++-
+ qt/Makefile.am		 |  1 -
+ qt/poppler-link.cc	 |  4 +++-
+ qt/poppler-page.cc	 | 16 +++++++++++++++-
+ qt/poppler-private.h	 | 11 ++++++++++-
+ qt4/src/poppler-link.cc | 10 ++++++----
  8 files changed, 59 insertions(+), 20 deletions(-)
 
 commit 08dcc7121450cbfa163254001e73bb6a2670e055
@@ -39132,9 +42319,9 @@ Date:	Tue Mar 6 22:27:18 2007 +0000
 	    Fix uninitialized variables.
 	    Properly escape parenthesis and slash in text field
 
- ChangeLog	  |    9 ++++++++-
- poppler/Annot.cc |    3 +++
- poppler/Form.cc  |    1 +
+ ChangeLog	  | 9 ++++++++-
+ poppler/Annot.cc | 3 +++
+ poppler/Form.cc  | 1 +
  3 files changed, 12 insertions(+), 1 deletion(-)
 
 commit e8d3b21d08a59ec8b62503b48504fe046d746bfa
@@ -39143,13 +42330,13 @@ Date:	Sun Mar 4 07:30:31 2007 +0000
 
     Switch to using pkg-config to find Qt4.
 
- ChangeLog	       |    9 +++
- configure.ac	       |   36 +++++------
- m4/qt.m4	       |  165
- -------------------------------------------------
- poppler/Makefile.am   |    2 +-
- qt4/src/Makefile.am   |    3 +-
- qt4/tests/Makefile.am |   21 +++----
+ ChangeLog	       |   9 +++
+ configure.ac	       |  36 +++++------
+ m4/qt.m4	       | 165
+ --------------------------------------------------
+ poppler/Makefile.am   |   2 +-
+ qt4/src/Makefile.am   |   3 +-
+ qt4/tests/Makefile.am |  21 +++----
  6 files changed, 36 insertions(+), 200 deletions(-)
 
 commit bd99616b9c06f96beadb68e015d2904b7fe2df1d
@@ -39166,11 +42353,11 @@ Date:	Sun Feb 25 00:34:21 2007 +0000
 	    * poppler/Form.h:
 	    Fix compilation warnings.
 
- ChangeLog	  |   10 ++++++++++
- poppler/Annot.cc |   30 +++++++++++++++++-------------
- poppler/Annot.h  |    5 ++++-
- poppler/Form.cc  |   37 ++++++++++++++-----------------------
- poppler/Form.h   |   13 ++++++-------
+ ChangeLog	  | 10 ++++++++++
+ poppler/Annot.cc | 30 +++++++++++++++++-------------
+ poppler/Annot.h  |  5 ++++-
+ poppler/Form.cc  | 37 ++++++++++++++-----------------------
+ poppler/Form.h   | 13 ++++++-------
  5 files changed, 51 insertions(+), 44 deletions(-)
 
 commit d8d23b56332618d8c7d8198f55ec6efafd24187e
@@ -39179,9 +42366,9 @@ Date:	Sun Feb 25 00:00:20 2007 +0000
 
     forgot to commit these
 
- qt4/src/poppler-form.cc |  284
- +++++++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-form.h  |  247 +++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-form.cc | 284
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-form.h  | 247 +++++++++++++++++++++++++++++++++++++++++
  2 files changed, 531 insertions(+)
 
 commit 984ce7f919aec27d5f4225376550cd6b58d4ae52
@@ -39204,14 +42391,14 @@ Date:	Sat Feb 24 23:58:31 2007 +0000
 		    Qt4 frontend. It supports text and choice fields in
 		    a basic way.
 
- ChangeLog			     |	 14 ++++++++++
- qt4/src/Doxyfile		     |	  1 +
- qt4/src/Makefile.am		     |	  2 ++
- qt4/src/poppler-annotation-helper.h |	 18 ++++++------
- qt4/src/poppler-page.cc	     |	 36 ++++++++++++++++++++++++
- qt4/src/poppler-private.h	     |	 52
- ++++++++++++++++++++++++++++++++++-
- qt4/src/poppler-qt4.h		     |	  7 +++++
+ ChangeLog			     | 14 ++++++++++
+ qt4/src/Doxyfile		     |	1 +
+ qt4/src/Makefile.am		     |	2 ++
+ qt4/src/poppler-annotation-helper.h | 18 ++++++-------
+ qt4/src/poppler-page.cc	     | 36 +++++++++++++++++++++++++
+ qt4/src/poppler-private.h	     | 52
+ ++++++++++++++++++++++++++++++++++++-
+ qt4/src/poppler-qt4.h		     |	7 +++++
  7 files changed, 120 insertions(+), 10 deletions(-)
 
 commit de7a90fc724de14151ec994d18f860ada3be2ac8
@@ -39241,26 +42428,26 @@ Date:	Sat Feb 24 23:43:34 2007 +0000
 	    and cleanup
 				  GlobalParams accordingly
 
- ChangeLog		     |	 22 ++
- configure.ac		     |	  1 -
- glib/poppler-document.cc    |	  4 +-
- poppler/GlobalParams.cc     |	666
- +------------------------------------------
- poppler/GlobalParams.h      |	 59 +---
- poppler/PSOutputDev.cc      |	  8 -
- qt/poppler-document.cc      |	  4 +-
- qt4/src/poppler-document.cc |	  2 +-
- qt4/src/poppler-private.h   |	  2 +-
- qt4/src/poppler-qt4.h	     |	  6 +-
- test/gtk-splash-test.cc     |	  2 +-
- test/pdf-inspector.cc	     |	  2 +-
- utils/pdffonts.cc	     |	  5 +-
- utils/pdfimages.cc	     |	  5 +-
- utils/pdfinfo.cc	     |	  5 +-
- utils/pdftohtml.cc	     |	  2 +-
- utils/pdftoppm.cc	     |	 15 +-
- utils/pdftops.cc	     |	 50 ++--
- utils/pdftotext.cc	     |	  5 +-
+ ChangeLog		     |	22 ++
+ configure.ac		     |	 1 -
+ glib/poppler-document.cc    |	 4 +-
+ poppler/GlobalParams.cc     | 666
+ +-------------------------------------------
+ poppler/GlobalParams.h      |	59 +---
+ poppler/PSOutputDev.cc      |	 8 -
+ qt/poppler-document.cc      |	 4 +-
+ qt4/src/poppler-document.cc |	 2 +-
+ qt4/src/poppler-private.h   |	 2 +-
+ qt4/src/poppler-qt4.h	     |	 6 +-
+ test/gtk-splash-test.cc     |	 2 +-
+ test/pdf-inspector.cc	     |	 2 +-
+ utils/pdffonts.cc	     |	 5 +-
+ utils/pdfimages.cc	     |	 5 +-
+ utils/pdfinfo.cc	     |	 5 +-
+ utils/pdftohtml.cc	     |	 2 +-
+ utils/pdftoppm.cc	     |	15 +-
+ utils/pdftops.cc	     |	50 ++--
+ utils/pdftotext.cc	     |	 5 +-
  19 files changed, 72 insertions(+), 793 deletions(-)
 
 commit 74e70386b759a3cd9864d11eb4ca210010136aa5
@@ -39343,8 +42530,8 @@ Date:	Sun Feb 18 21:44:24 2007 +0000
 		    instead of
 		    ${prefix}/poppler Better fixes are welcome.
 
- ChangeLog    |    6 ++++++
- configure.ac |    2 +-
+ ChangeLog    | 6 ++++++
+ configure.ac | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit dd140dd63de661303b578863af4d515d82117cca
@@ -39353,7 +42540,7 @@ Date:	Sun Feb 4 00:19:25 2007 +0000
 
     fix date
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 3c1ed68bf4ee49b27275f7f65d49f42933b1cfa0
@@ -39365,9 +42552,9 @@ Date:	Sun Feb 4 00:16:43 2007 +0000
 	    optimizations
 	    in bugzilla issue 7808
 
- ChangeLog	  |    6 ++++++
- poppler/Lexer.cc |   30 ++++++++++++++++++++----------
- poppler/Lexer.h  |    2 +-
+ ChangeLog	  |  6 ++++++
+ poppler/Lexer.cc | 30 ++++++++++++++++++++----------
+ poppler/Lexer.h  |  2 +-
  3 files changed, 27 insertions(+), 11 deletions(-)
 
 commit 672408839de0deac4c6006b54df723336ee4be2d
@@ -39381,9 +42568,9 @@ Date:	Wed Jan 31 22:05:09 2007 +0000
     * qt4/tests/test-poppler-qt4.cpp:
       Simply a bit. Patch by Pino Toscano <pino@kde.org>.
 
- ChangeLog			|    8 ++++++++
- qt4/src/poppler-page.cc	|    2 --
- qt4/tests/test-poppler-qt4.cpp |   24 ++++++++++++------------
+ ChangeLog			|  8 ++++++++
+ qt4/src/poppler-page.cc	|  2 --
+ qt4/tests/test-poppler-qt4.cpp | 24 ++++++++++++------------
  3 files changed, 20 insertions(+), 14 deletions(-)
 
 commit 9c64b8c754e09ff2858af56ce38ef013002bf8e4
@@ -39393,8 +42580,8 @@ Date:	Wed Jan 31 18:48:16 2007 +0000
     * m4/qt.m4: Fix Qt4 detection on Mac. Patch by Benjamin Reed
     <ranger@befunk.com>
 
- ChangeLog |	5 +++++
- m4/qt.m4  |   26 +++++++++++++++++++++++---
+ ChangeLog |  5 +++++
+ m4/qt.m4  | 26 +++++++++++++++++++++++---
  2 files changed, 28 insertions(+), 3 deletions(-)
 
 commit 1b81192ff2bb9fae4a7bbc685fafe1718f303a7b
@@ -39408,10 +42595,10 @@ Date:	Sun Jan 28 15:55:11 2007 +0000
 	    coordinates. Patch by
 	    Carlos Garcia Campos <carlosgc@gnome.org>
 
- ChangeLog		|    4 ++
- glib/poppler-action.cc |   15 +++++-
- glib/poppler-page.cc	|  124
- ++++++++++++++++++++++++++++++------------------
+ ChangeLog		|   4 ++
+ glib/poppler-action.cc |  15 +++++-
+ glib/poppler-page.cc	| 124
+ +++++++++++++++++++++++++++++++------------------
  3 files changed, 97 insertions(+), 46 deletions(-)
 
 commit 75dcf94f53c2d7241111f0d527ee4d3a2ef0b0cf
@@ -39421,8 +42608,8 @@ Date:	Sun Jan 28 15:36:08 2007 +0000
     * glib/poppler-document.cc: Plug memory leak in
     poppler-document. Patch by Carlos Garcia Campos <carlosgc@gnome.org>
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |   30 ++++++++++++++----------------
+ ChangeLog		  |  5 +++++
+ glib/poppler-document.cc | 30 ++++++++++++++----------------
  2 files changed, 19 insertions(+), 16 deletions(-)
 
 commit 682a15fc38a2c569d9b1f9871e3e949b62b33cf8
@@ -39441,11 +42628,11 @@ Date:	Sun Jan 21 22:35:23 2007 +0000
 	   Add a Page::label to get the label associated with a page.
 	   Patches by Pino Toscano <pino@kde.org>.
 
- ChangeLog		     |	 12 ++++++++++++
- qt4/src/poppler-document.cc |	 20 ++++++++++++++++++++
- qt4/src/poppler-page.cc     |	 14 +++++++++++++-
- qt4/src/poppler-private.h   |	 29 ++++++++++++++++++++++++-----
- qt4/src/poppler-qt4.h	     |	 25 +++++++++++++++++++++++++
+ ChangeLog		     | 12 ++++++++++++
+ qt4/src/poppler-document.cc | 20 ++++++++++++++++++++
+ qt4/src/poppler-page.cc     | 14 +++++++++++++-
+ qt4/src/poppler-private.h   | 29 ++++++++++++++++++++++++-----
+ qt4/src/poppler-qt4.h	     | 25 +++++++++++++++++++++++++
  5 files changed, 94 insertions(+), 6 deletions(-)
 
 commit 7331bc46c1cb323316501f05ae1740bea5655596
@@ -39459,11 +42646,11 @@ Date:	Wed Jan 17 20:06:29 2007 +0000
 	    into the Sound class, so frontends can use it easily.
 	    Patch by Pino Toscano <pino@kde.org>.
 
- ChangeLog		  |   10 +++-
- poppler/Sound.cc	  |   80 +++++++++++++++++++++++++-
- poppler/Sound.h	  |   32 ++++++++++-
- qt4/src/poppler-sound.cc |  144
- ++++++++++++++++------------------------------
+ ChangeLog		  |  10 +++-
+ poppler/Sound.cc	  |  80 +++++++++++++++++++++++++-
+ poppler/Sound.h	  |  32 ++++++++++-
+ qt4/src/poppler-sound.cc | 144
+ +++++++++++++++++------------------------------
  4 files changed, 167 insertions(+), 99 deletions(-)
 
 commit 841bee94da7b6376d2e1fb3daaf8b727b90e42d8
@@ -39482,14 +42669,14 @@ Date:	Sat Jan 13 23:19:21 2007 +0000
 	    documents with a password and don't need to do a malloc and
 	    a memcpy.
 
- ChangeLog		     |	 11 +++++++
- poppler/Stream.cc	     |	  5 ---
- poppler/Stream.h	     |	  1 -
- qt4/src/poppler-document.cc |	 74
- +++++++++++++++++++++++--------------------
- qt4/src/poppler-link.cc     |	  4 +--
- qt4/src/poppler-page.cc     |	 34 ++++++++++----------
- qt4/src/poppler-private.h   |	 24 ++++++++------
+ ChangeLog		     | 11 +++++++
+ poppler/Stream.cc	     |	5 ---
+ poppler/Stream.h	     |	1 -
+ qt4/src/poppler-document.cc | 74
+ ++++++++++++++++++++++++---------------------
+ qt4/src/poppler-link.cc     |	4 +--
+ qt4/src/poppler-page.cc     | 34 ++++++++++-----------
+ qt4/src/poppler-private.h   | 24 +++++++++------
  7 files changed, 84 insertions(+), 69 deletions(-)
 
 commit e1432fd7c4a6a2386789f450d39c6d954fd4e656
@@ -39507,15 +42694,15 @@ Date:	Sat Jan 13 18:29:39 2007 +0000
 	    even with
 	    no Splash backend. Patch by Pino Toscano <pino@kde.org>.
 
- ChangeLog		     |	 12 ++++++++++++
- configure.ac		     |	  5 -----
- poppler/Makefile.am	     |	  5 +++--
- qt4/src/Makefile.am	     |	  6 +++++-
- qt4/src/poppler-document.cc |	 16 ++++++++++++++--
- qt4/src/poppler-link.cc     |	  1 +
- qt4/src/poppler-page.cc     |	 15 ++++++++++++---
- qt4/src/poppler-private.h   |	  8 +++++++-
- qt4/src/poppler-qt4.h	     |	  6 ++++++
+ ChangeLog		     | 12 ++++++++++++
+ configure.ac		     |	5 -----
+ poppler/Makefile.am	     |	5 +++--
+ qt4/src/Makefile.am	     |	6 +++++-
+ qt4/src/poppler-document.cc | 16 ++++++++++++++--
+ qt4/src/poppler-link.cc     |	1 +
+ qt4/src/poppler-page.cc     | 15 ++++++++++++---
+ qt4/src/poppler-private.h   |	8 +++++++-
+ qt4/src/poppler-qt4.h	     |	6 ++++++
  9 files changed, 60 insertions(+), 14 deletions(-)
 
 commit 457038e97325720615c4390ffa075dd8283966ee
@@ -39528,12 +42715,12 @@ Date:	Sat Jan 13 17:56:07 2007 +0000
 	    * qt4/src/poppler-private.h:
 	    * qt4/src/poppler-qt4.h: Add Document::loadFromData method
 
- ChangeLog		     |	  8 ++++++++
- poppler/Stream.cc	     |	  5 +++++
- poppler/Stream.h	     |	  1 +
- qt4/src/poppler-document.cc |	 22 ++++++++++++++++++++++
- qt4/src/poppler-private.h   |	 17 +++++++++++++++--
- qt4/src/poppler-qt4.h	     |	 16 ++++++++++++++++
+ ChangeLog		     |	8 ++++++++
+ poppler/Stream.cc	     |	5 +++++
+ poppler/Stream.h	     |	1 +
+ qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++
+ qt4/src/poppler-private.h   | 17 +++++++++++++++--
+ qt4/src/poppler-qt4.h	     | 16 ++++++++++++++++
  6 files changed, 67 insertions(+), 2 deletions(-)
 
 commit 4e2a9c49ecab00b1f5d175570165cd490afdd31e
@@ -39542,8 +42729,8 @@ Date:	Thu Jan 11 22:28:03 2007 +0000
 
      goo/gmem.c: Merge change from xpdf-3.01pl2
 
- ChangeLog  |	 4 ++++
- goo/gmem.c |	13 +++++++++++--
+ ChangeLog  |  4 ++++
+ goo/gmem.c | 13 +++++++++++--
  2 files changed, 15 insertions(+), 2 deletions(-)
 
 commit bce14b274fd788d728116950d6464a85e33a9966
@@ -39554,9 +42741,9 @@ Date:	Thu Jan 11 22:12:11 2007 +0000
 	   * poppler/Catalog.cc: Limit max depth of recursive calls on
 	   readPageTree to fix MOAB-06-01-2007
 
- ChangeLog	    |	 6 ++++++
- poppler/Catalog.cc |	20 +++++++++++++++-----
- poppler/Catalog.h  |	 2 +-
+ ChangeLog	    |  6 ++++++
+ poppler/Catalog.cc | 20 +++++++++++++++-----
+ poppler/Catalog.h  |  2 +-
  3 files changed, 22 insertions(+), 6 deletions(-)
 
 commit 3f0679a336ffaf2aff149f8526fa11f8f8cbda59
@@ -39566,12 +42753,12 @@ Date:	Sat Jan 6 21:53:08 2007 +0000
     Patch by Pino Toscano <pino@kde.org> to fix some memory leaks when
     dealing with sounds.
 
- ChangeLog		  |    9 +++++++++
- poppler/Sound.cc	  |    1 +
- qt4/src/poppler-link.cc  |    5 +++++
- qt4/src/poppler-link.h   |    1 +
- qt4/src/poppler-page.cc  |    4 ++++
- qt4/src/poppler-sound.cc |    7 ++++++-
+ ChangeLog		  | 9 +++++++++
+ poppler/Sound.cc	  | 1 +
+ qt4/src/poppler-link.cc  | 5 +++++
+ qt4/src/poppler-link.h   | 1 +
+ qt4/src/poppler-page.cc  | 4 ++++
+ qt4/src/poppler-sound.cc | 7 ++++++-
  6 files changed, 26 insertions(+), 1 deletion(-)
 
 commit d41cd2f567a955031cb7498d9089e70e14df4a42
@@ -39580,8 +42767,8 @@ Date:	Thu Jan 4 19:10:16 2007 +0000
 
     qt4/src/poppler-private.h: gmallocn -> new[]
 
- ChangeLog		   |	4 ++++
- qt4/src/poppler-private.h |	2 +-
+ ChangeLog		   | 4 ++++
+ qt4/src/poppler-private.h | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit f8edfb6832144cbbd1b234f6b35e33325269255c
@@ -39591,8 +42778,8 @@ Date:	Thu Jan 4 18:56:13 2007 +0000
     qt/poppler-page-transition.cc: Fix memory leak. Patch by Tobias
     Koenig <tokoe@kde.org>
 
- ChangeLog		       |    5 +++++
- qt/poppler-page-transition.cc |    1 +
+ ChangeLog		       | 5 +++++
+ qt/poppler-page-transition.cc | 1 +
  2 files changed, 6 insertions(+)
 
 commit 250a9f4b429344e0968c7bd0c0cebe7af373ae0a
@@ -39603,9 +42790,9 @@ Date:	Sat Dec 30 14:50:25 2006 +0000
     * qt4/src/poppler-document.cc: Add const & to some parameters. Patch
     by Pino Toscano <pino@kde.org>
 
- ChangeLog		     |	  6 ++++++
- qt4/src/poppler-document.cc |	  4 ++--
- qt4/src/poppler-qt4.h	     |	  4 ++--
+ ChangeLog		     | 6 ++++++
+ qt4/src/poppler-document.cc | 4 ++--
+ qt4/src/poppler-qt4.h	     | 4 ++--
  3 files changed, 10 insertions(+), 4 deletions(-)
 
 commit 250c1f94cc9a53f980fd08364d6cce29db9fd067
@@ -39615,8 +42802,8 @@ Date:	Fri Dec 29 14:08:35 2006 +0000
     * poppler/UGooString.cc: Patch by Pino Toscano <pino@kde.org> so
     that QStringToUGooString does not crash.
 
- ChangeLog	       |    5 +++++
- poppler/UGooString.cc |    1 +
+ ChangeLog	       | 5 +++++
+ poppler/UGooString.cc | 1 +
  2 files changed, 6 insertions(+)
 
 commit 42770e5f07407b03dce31c73fd6956f9c8fc9a06
@@ -39630,10 +42817,10 @@ Date:	Fri Dec 29 04:12:40 2006 +0000
 	poppler_document_new_from_data
 	  to allow loading PDFs out of memory.
 
- ChangeLog		  |    6 +++
- glib/poppler-document.cc |  113
- ++++++++++++++++++++++++++++++++++------------
- glib/poppler-document.h  |    4 ++
+ ChangeLog		  |   6 +++
+ glib/poppler-document.cc | 113
+ ++++++++++++++++++++++++++++++++++-------------
+ glib/poppler-document.h  |   4 ++
  3 files changed, 93 insertions(+), 30 deletions(-)
 
 commit 6fedd991b584e300b5710630fa7942d357fe7aaa
@@ -39644,10 +42831,10 @@ Date:	Thu Dec 28 17:22:36 2006 +0000
     * qt4/src/poppler-document.cc:
     * qt/poppler-document.cc: Fix memory leaks
 
- ChangeLog			 |    6 ++++++
- qt/poppler-document.cc		 |    4 ++++
- qt4/src/poppler-document.cc	 |    4 +++-
- qt4/src/poppler-embeddedfile.cc |    4 +++-
+ ChangeLog			 | 6 ++++++
+ qt/poppler-document.cc		 | 4 ++++
+ qt4/src/poppler-document.cc	 | 4 +++-
+ qt4/src/poppler-embeddedfile.cc | 4 +++-
  4 files changed, 16 insertions(+), 2 deletions(-)
 
 commit 7da5885e45c33382060276c95d9a3bd117ae55c7
@@ -39667,18 +42854,18 @@ Date:	Thu Dec 28 15:51:44 2006 +0000
     <kkowalczyk@gmail.com> to improve performance. See bug 7808 for
     details.
 
- ChangeLog		  |   15 ++++
- goo/GooString.cc	  |  186
- +++++++++++++++++++++++-----------------------
- goo/GooString.h	  |   28 +++++--
- goo/gmem.c		  |    3 +-
- goo/gmem.h		  |    2 +-
- poppler/Lexer.cc	  |   19 +++--
- poppler/Lexer.h	  |   10 +++
- poppler/PageLabelInfo.cc |    1 +
- poppler/Parser.cc	  |   17 +++--
- poppler/UGooString.cc	  |  137 +++++++++++++++++++++++++++-------
- poppler/UGooString.h	  |   40 ++++++++--
+ ChangeLog		  |  15 ++++
+ goo/GooString.cc	  | 186
+ ++++++++++++++++++++++++-----------------------
+ goo/GooString.h	  |  28 +++++--
+ goo/gmem.c		  |   3 +-
+ goo/gmem.h		  |   2 +-
+ poppler/Lexer.cc	  |  19 +++--
+ poppler/Lexer.h	  |  10 +++
+ poppler/PageLabelInfo.cc |   1 +
+ poppler/Parser.cc	  |  17 +++--
+ poppler/UGooString.cc	  | 137 +++++++++++++++++++++++++++-------
+ poppler/UGooString.h	  |  40 ++++++++--
  11 files changed, 313 insertions(+), 145 deletions(-)
 
 commit fbc05a6791fc28ee26a9d9188722ea3453c65ddc
@@ -39689,9 +42876,9 @@ Date:	Wed Dec 27 23:15:06 2006 +0000
     * poppler/Annot.h: Add type checking to processing of "Rect". Patch
     by Scott Turner <scotty1024@mac.com>
 
- ChangeLog	  |    6 ++++++
- poppler/Annot.cc |   48 +++++++++++++++++++++++++++++-------------------
- poppler/Annot.h  |    1 +
+ ChangeLog	  |  6 ++++++
+ poppler/Annot.cc | 48 +++++++++++++++++++++++++++++-------------------
+ poppler/Annot.h  |  1 +
  3 files changed, 36 insertions(+), 19 deletions(-)
 
 commit dc6b372358ac629c43aa2faabd644942cb0ed98b
@@ -39700,8 +42887,8 @@ Date:	Wed Dec 27 15:23:04 2006 +0000
 
     Remove , after last value of enum. Thanks to André Wöbbeking
 
- ChangeLog	   |	1 +
- poppler/Catalog.h |	2 +-
+ ChangeLog	   | 1 +
+ poppler/Catalog.h | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 commit c7d19539a95927eb277966a521f13393c9e116bb
@@ -39711,8 +42898,8 @@ Date:	Wed Dec 27 12:38:58 2006 +0000
     qt4/src/poppler-qt4.h: Remove , after last value of enum. Thanks to
     André Wöbbeking
 
- ChangeLog	       |    5 +++++
- qt4/src/poppler-qt4.h |    4 ++--
+ ChangeLog	       | 5 +++++
+ qt4/src/poppler-qt4.h | 4 ++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit b29429c702e6540b9f35689b0a164f30e747d5d9
@@ -39723,9 +42910,9 @@ Date:	Tue Dec 26 20:07:03 2006 +0000
     * qt4/src/poppler-page.cc: Add Page::duration() function to the
     qt4 frontend.
 
- ChangeLog		 |    6 ++++++
- qt4/src/poppler-page.cc |    8 ++++++++
- qt4/src/poppler-qt4.h	 |    9 ++++++++-
+ ChangeLog		 | 6 ++++++
+ qt4/src/poppler-page.cc | 8 ++++++++
+ qt4/src/poppler-qt4.h	 | 9 ++++++++-
  3 files changed, 22 insertions(+), 1 deletion(-)
 
 commit 62dfc58903b496c4cc720c8b2c759c6fb82fb443
@@ -39740,12 +42927,12 @@ Date:	Tue Dec 26 19:56:28 2006 +0000
 	    by Carlos
 	    Garcia Campos <carlosgc@gnome.org>
 
- ChangeLog		  |    9 +++++++++
- glib/poppler-page.cc	  |   16 ++++++++++++++++
- glib/poppler-page.h	  |    1 +
- glib/test-poppler-glib.c |    7 +++++++
- poppler/Page.cc	  |   13 +++++++++++++
- poppler/Page.h		  |    6 ++++++
+ ChangeLog		  |  9 +++++++++
+ glib/poppler-page.cc	  | 16 ++++++++++++++++
+ glib/poppler-page.h	  |  1 +
+ glib/test-poppler-glib.c |  7 +++++++
+ poppler/Page.cc	  | 13 +++++++++++++
+ poppler/Page.h		  |  6 ++++++
  6 files changed, 52 insertions(+)
 
 commit 34e5aa62f4d3ba7a2d94a68a91c11a48277a4119
@@ -39758,9 +42945,9 @@ Date:	Sat Dec 23 13:12:13 2006 +0000
 	    i tested
 	    the patchs improves PSTokenizer::getToken performance by 15%
 
- ChangeLog		|    6 ++++++
- poppler/PSTokenizer.cc |   33 +++++++++++++++++++++------------
- poppler/PSTokenizer.h	|    1 +
+ ChangeLog		|  6 ++++++
+ poppler/PSTokenizer.cc | 33 +++++++++++++++++++++------------
+ poppler/PSTokenizer.h	|  1 +
  3 files changed, 28 insertions(+), 12 deletions(-)
 
 commit 1a5fa1d2ced62e7d027e085663e987cff625ce0b
@@ -39770,8 +42957,8 @@ Date:	Fri Dec 22 23:39:41 2006 +0000
     poppler/Page.cc: Fix memory leak when reading a wrong color map in
     a thumbnail. Patch by Scott Turner <scotty1024@mac.com>
 
- ChangeLog	 |    3 +++
- poppler/Page.cc |    1 +
+ ChangeLog	 | 3 +++
+ poppler/Page.cc | 1 +
  2 files changed, 4 insertions(+)
 
 commit dd1c134dcf085338a85188c7f205fc300396dc86
@@ -39781,8 +42968,8 @@ Date:	Fri Dec 22 23:27:53 2006 +0000
     qt/poppler-page.cc: Fix memory leak in Page::textList. Patch by
     Jerry Epplin <jepplin@globalvelocity.com>
 
- ChangeLog	    |	 5 +++++
- qt/poppler-page.cc |	 4 +++-
+ ChangeLog	    | 5 +++++
+ qt/poppler-page.cc | 4 +++-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 87e474a018c4808d6251fd79f9e9640e0f733551
@@ -39797,8 +42984,8 @@ Date:	Thu Dec 21 01:01:30 2006 +0000
 	the mask.
 	Fixes #9403.
 
- ChangeLog		   |	6 ++++++
- poppler/CairoOutputDev.cc |	8 ++------
+ ChangeLog		   | 6 ++++++
+ poppler/CairoOutputDev.cc | 8 ++------
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 commit 769a89623c680f51690db1751522b016b02b83a8
@@ -39811,8 +42998,8 @@ Date:	Wed Dec 20 19:55:55 2006 +0000
 	close to
 	one pixel wide as we can. Fixes #9393.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |   10 ++++++++--
+ ChangeLog		   |  5 +++++
+ poppler/CairoOutputDev.cc | 10 ++++++++--
  2 files changed, 13 insertions(+), 2 deletions(-)
 
 commit 5c4bca18373528f293bd5e080efca572977fc1ff
@@ -39822,8 +43009,8 @@ Date:	Tue Dec 19 20:27:55 2006 +0000
     poppler/SplashOutputDev.cc: Fix gray calculation. Patch by Scott
     Turner <scotty1024@mac.com>
 
- ChangeLog		    |	 5 +++++
- poppler/SplashOutputDev.cc |	 2 +-
+ ChangeLog		    | 5 +++++
+ poppler/SplashOutputDev.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit fba99578f6001ae0c0df0442bb73040b55109b1d
@@ -39838,8 +43025,8 @@ Date:	Tue Dec 12 05:23:59 2006 +0000
 	Patch by Daniel Colascione.
 	Fixes #9190.
 
- ChangeLog		   |	7 +++++++
- poppler/CairoOutputDev.cc |	2 +-
+ ChangeLog		   | 7 +++++++
+ poppler/CairoOutputDev.cc | 2 +-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 9a6ffa1c6e009f8606a055f873efdcd5829fcfa2
@@ -39853,8 +43040,8 @@ Date:	Sun Dec 10 05:24:56 2006 +0000
 	NULL so that it can safely deleted if initialization fails.
 	Fixes #9263.
 
- ChangeLog	     |	  6 ++++++
- poppler/Function.cc |	  1 +
+ ChangeLog	     | 6 ++++++
+ poppler/Function.cc | 1 +
  2 files changed, 7 insertions(+)
 
 commit e92d63a179ae022270156da4e396c15ff9236d89
@@ -39864,8 +43051,8 @@ Date:	Thu Nov 23 19:01:44 2006 +0000
     * m4/libjpeg.m4: Make JPEG library header search work under
     MSYS. Patch by Alexis Wilke
 
- ChangeLog     |    5 +++++
- m4/libjpeg.m4 |    2 +-
+ ChangeLog     | 5 +++++
+ m4/libjpeg.m4 | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 3913110f698fd006b394a395b5b0adfde30af31b
@@ -39874,7 +43061,7 @@ Date:	Wed Nov 22 21:55:27 2006 +0000
 
     there should not be any whitespace after the \
 
- qt4/src/Makefile.am |	  2 +-
+ qt4/src/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit c3ab7addec5a7990872949b813c2b727b1614d64
@@ -39884,7 +43071,7 @@ Date:	Sun Nov 19 18:51:23 2006 +0000
     Another leak fix on qt4/src/poppler-page.cc the previous changelog
     is enough for this one ;-)
 
- qt4/src/poppler-page.cc |    4 ++++
+ qt4/src/poppler-page.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 9e9b82da91abacb916b05302d40bf822af6ac7f1
@@ -39897,12 +43084,12 @@ Date:	Sun Nov 19 12:59:48 2006 +0000
 	    * qt4/src/poppler-textbox.cc: Fix memory leaks
 	    * splash/Splash.cc: Initialize the values of nClipRes
 
- ChangeLog		    |	 8 ++++++++
- qt4/src/poppler-link.cc    |	 6 ++++++
- qt4/src/poppler-page.cc    |	 4 +++-
- qt4/src/poppler-qt4.h	    |	 1 +
- qt4/src/poppler-textbox.cc |	 5 +++++
- splash/Splash.cc	    |	 2 +-
+ ChangeLog		    | 8 ++++++++
+ qt4/src/poppler-link.cc    | 6 ++++++
+ qt4/src/poppler-page.cc    | 4 +++-
+ qt4/src/poppler-qt4.h	    | 1 +
+ qt4/src/poppler-textbox.cc | 5 +++++
+ splash/Splash.cc	    | 2 +-
  6 files changed, 24 insertions(+), 2 deletions(-)
 
 commit b9faacc62182efcbc84df2471e4c5dcf2b03bda8
@@ -39915,9 +43102,9 @@ Date:	Sat Nov 18 17:08:04 2006 +0000
 	    marginLeft, int marginTop, bool strictMargins to
 	    Document::print()
 
- ChangeLog		     |	  6 ++++++
- qt4/src/poppler-document.cc |	 11 +++++++++--
- qt4/src/poppler-qt4.h	     |	  6 +++++-
+ ChangeLog		     |	6 ++++++
+ qt4/src/poppler-document.cc | 11 +++++++++--
+ qt4/src/poppler-qt4.h	     |	6 +++++-
  3 files changed, 20 insertions(+), 3 deletions(-)
 
 commit da8e6d4c3e0afdaa031413649ae20545c8a1f845
@@ -39926,12 +43113,12 @@ Date:	Thu Nov 16 21:03:27 2006 +0000
 
     really commit pino's patch :-S
 
- qt4/src/Doxyfile	      |   11 ++--
- qt4/src/Mainpage.dox	      |   26 +++++-----
- qt4/src/poppler-annotation.h |   33 +++++++-----
- qt4/src/poppler-link.h       |   68 +++++++++++++++++++++----
- qt4/src/poppler-qt4.h	      |  115
- +++++++++++++++++++++++++++---------------
+ qt4/src/Doxyfile	      |  11 +++--
+ qt4/src/Mainpage.dox	      |  26 +++++-----
+ qt4/src/poppler-annotation.h |  33 ++++++++-----
+ qt4/src/poppler-link.h       |  68 +++++++++++++++++++++----
+ qt4/src/poppler-qt4.h	      | 115
+ +++++++++++++++++++++++++++----------------
  5 files changed, 171 insertions(+), 82 deletions(-)
 
 commit 4f26e65096e3133a39fc0c9e82084c90cf77dda9
@@ -39947,8 +43134,8 @@ Date:	Thu Nov 16 21:00:10 2006 +0000
 
     Generated docu at http://people.freedesktop.org/~aacid/docs/qt4/
 
- ChangeLog	      |    9 +++++++++
- qt4/src/Mainpage.dox |    2 +-
+ ChangeLog	      | 9 +++++++++
+ qt4/src/Mainpage.dox | 2 +-
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit e68b6f3f8fea1e4f036eba0f19bb7e0c423d408c
@@ -39975,16 +43162,16 @@ Date:	Wed Nov 15 21:07:50 2006 +0000
 	    changes in
 	    the rendering API of Page. Patch by Pino Toscano.
 
- ChangeLog			  |   17 ++++++
- qt4/src/poppler-document.cc	  |   14 +++++
- qt4/src/poppler-link.cc	  |    2 +-
- qt4/src/poppler-page.cc	  |  123
- ++++++++++++++++++++------------------
- qt4/src/poppler-private.h	  |   32 ++++++----
- qt4/src/poppler-qt4.h		  |   75 +++++++----------------
- qt4/tests/stress-poppler-qt4.cpp |    3 +-
- qt4/tests/test-password-qt4.cpp  |   12 ++--
- qt4/tests/test-poppler-qt4.cpp   |   17 +++---
+ ChangeLog			  |  17 ++++++
+ qt4/src/poppler-document.cc	  |  14 +++++
+ qt4/src/poppler-link.cc	  |   2 +-
+ qt4/src/poppler-page.cc	  | 123
+ +++++++++++++++++++++------------------
+ qt4/src/poppler-private.h	  |  32 ++++++----
+ qt4/src/poppler-qt4.h		  |  75 +++++++-----------------
+ qt4/tests/stress-poppler-qt4.cpp |   3 +-
+ qt4/tests/test-password-qt4.cpp  |  12 ++--
+ qt4/tests/test-poppler-qt4.cpp   |  17 +++---
  9 files changed, 152 insertions(+), 143 deletions(-)
 
 commit 37088dd3335be6e7641c47bea9b1ddd689b07372
@@ -39993,8 +43180,8 @@ Date:	Mon Nov 13 19:16:44 2006 +0000
 
 	    * poppler/ArthurOutputDev.cc: Small fix to get colors right
 
- ChangeLog		    |	 4 ++++
- poppler/ArthurOutputDev.cc |	 8 ++++----
+ ChangeLog		    | 4 ++++
+ poppler/ArthurOutputDev.cc | 8 ++++----
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit 302e2cab9fd626222c69ad40f7e40be2e65d34a9
@@ -40003,8 +43190,8 @@ Date:	Sat Nov 11 15:41:27 2006 +0000
 
     Fix typo when outputing PS scale
 
- ChangeLog		|    4 ++++
- poppler/PSOutputDev.cc |    2 +-
+ ChangeLog		| 4 ++++
+ poppler/PSOutputDev.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit e3550fb286dae98992b30edbf4a9300fa58d2e77
@@ -40017,8 +43204,8 @@ Date:	Tue Nov 7 23:53:31 2006 +0000
 	when updating the font. Also, cleanup some unused code. Fixes
 	#8924.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	9 ++-------
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 9 ++-------
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 commit f020b64a72ad5c82c3e7bdcf15039bb0037b1f22
@@ -40032,10 +43219,10 @@ Date:	Wed Oct 18 18:43:59 2006 +0000
 	   encrypted document. Do not crash when unlocking a locked
 	   document.
 
- ChangeLog		     |	  7 +++++++
- qt4/src/poppler-document.cc |	 41
+ ChangeLog		     |	7 +++++++
+ qt4/src/poppler-document.cc | 41
  ++++++++++++++++-------------------------
- qt4/src/poppler-private.h   |	 14 ++++++++++++++
+ qt4/src/poppler-private.h   | 14 ++++++++++++++
  3 files changed, 37 insertions(+), 25 deletions(-)
 
 commit 577330ee1d4d1021174cf1bd59557a83a017e06f
@@ -40048,9 +43235,9 @@ Date:	Wed Oct 11 23:09:24 2006 +0000
 	     0x0 mask for an image, like
 	     http://bugs.kde.org/attachment.cgi?id=18083&action=view
 
- ChangeLog		   |	7 +++++++
- splash/Splash.cc	   |	2 ++
- splash/SplashErrorCodes.h |	2 ++
+ ChangeLog		   | 7 +++++++
+ splash/Splash.cc	   | 2 ++
+ splash/SplashErrorCodes.h | 2 ++
  3 files changed, 11 insertions(+)
 
 commit 42c016c6d3c6de65fd92b51b9d6cc96d52404689
@@ -40077,21 +43264,21 @@ Date:	Sun Oct 8 20:38:47 2006 +0000
 	    and page
 	    actions in the Qt4 backend. Patch by Pino Toscano.
 
- ChangeLog		  |   19 +++++
- poppler/Link.cc	  |   53 ++++++++++++++
- poppler/Link.h		  |   32 +++++++++
- poppler/Makefile.am	  |    2 +
- poppler/Page.cc	  |    8 +++
- poppler/Page.h		  |    4 ++
- poppler/Sound.cc	  |   65 +++++++++++++++++
- poppler/Sound.h	  |   46 ++++++++++++
- qt4/src/Makefile.am	  |    1 +
- qt4/src/poppler-link.cc  |   35 +++++++++
- qt4/src/poppler-link.h   |   26 ++++++-
- qt4/src/poppler-page.cc  |   32 +++++++++
- qt4/src/poppler-qt4.h	  |   87 +++++++++++++++++++++++
- qt4/src/poppler-sound.cc |  177
- ++++++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog		  |  19 +++++
+ poppler/Link.cc	  |  53 ++++++++++++++
+ poppler/Link.h		  |  32 +++++++++
+ poppler/Makefile.am	  |   2 +
+ poppler/Page.cc	  |   8 +++
+ poppler/Page.h		  |   4 ++
+ poppler/Sound.cc	  |  65 +++++++++++++++++
+ poppler/Sound.h	  |  46 ++++++++++++
+ qt4/src/Makefile.am	  |   1 +
+ qt4/src/poppler-link.cc  |  35 ++++++++++
+ qt4/src/poppler-link.h   |  26 ++++++-
+ qt4/src/poppler-page.cc  |  32 +++++++++
+ qt4/src/poppler-qt4.h	  |  87 +++++++++++++++++++++++
+ qt4/src/poppler-sound.cc | 177
+ +++++++++++++++++++++++++++++++++++++++++++++++
  14 files changed, 586 insertions(+), 1 deletion(-)
 
 commit 1da064d7e7403ec7111eecb2b9613e27a2c4bb5d
@@ -40100,8 +43287,8 @@ Date:	Sat Sep 30 16:28:35 2006 +0000
 
      * qt4/src/poppler-page.cc: PA is optional, H is a name not a string
 
- ChangeLog		 |    4 ++++
- qt4/src/poppler-page.cc |   15 +++++++++------
+ ChangeLog		 |  4 ++++
+ qt4/src/poppler-page.cc | 15 +++++++++------
  2 files changed, 13 insertions(+), 6 deletions(-)
 
 commit 29366d8e470ab2207cdfdab115c2fa9618c4c74e
@@ -40117,13 +43304,13 @@ Date:	Mon Sep 25 20:43:18 2006 +0000
 	    for people
 	    that need them. Patch by morfoh@opensde.org. Fixes bug #8415
 
- ChangeLog	       |   10 ++++++++++
- glib/Makefile.am      |    2 ++
- qt/Makefile.am        |    6 ++++--
- qt4/src/Makefile.am   |    2 ++
- qt4/tests/Makefile.am |    2 ++
- test/Makefile.am      |    6 ++++--
- utils/Makefile.am     |    6 ++++--
+ ChangeLog	       | 10 ++++++++++
+ glib/Makefile.am      |  2 ++
+ qt/Makefile.am        |  6 ++++--
+ qt4/src/Makefile.am   |  2 ++
+ qt4/tests/Makefile.am |  2 ++
+ test/Makefile.am      |  6 ++++--
+ utils/Makefile.am     |  6 ++++--
  7 files changed, 28 insertions(+), 6 deletions(-)
 
 commit 957c1e59df213a01ca87f03d067a8dab5dc09fb6
@@ -40132,7 +43319,7 @@ Date:	Mon Sep 25 20:05:28 2006 +0000
 
     ignore poppler-features.h
 
- glib/.cvsignore |    1 +
+ glib/.cvsignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 3158b54375bdfdc82779362cc9442aade87f84f6
@@ -40143,8 +43330,8 @@ Date:	Fri Sep 22 00:55:54 2006 +0000
 
 	* NEWS: Update list of bugs fixes, release 0.5.4.
 
- ChangeLog |	2 ++
- NEWS	   |	2 +-
+ ChangeLog | 2 ++
+ NEWS	   | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 commit 17dd1f60f9328ae68fbe262ae0745be976ff9f95
@@ -40156,8 +43343,8 @@ Date:	Thu Sep 21 23:28:14 2006 +0000
 	* configure.ac: Check for gtk+ 2.8 for the gtk+ test case, invert
 	help text for zlib option (#7788, #7661).
 
- ChangeLog    |    3 +++
- configure.ac |   12 +++++-------
+ ChangeLog    |  3 +++
+ configure.ac | 12 +++++-------
  2 files changed, 8 insertions(+), 7 deletions(-)
 
 commit ddbbd697424b9122ce1f0541ddada3fe8bb38fb1
@@ -40168,8 +43355,8 @@ Date:	Thu Sep 21 22:58:31 2006 +0000
 
 	* utils/pdftops.cc: Get duplex setting from GlobalParams.
 
- ChangeLog	  |    2 ++
- utils/pdftops.cc |    3 ++-
+ ChangeLog	  | 2 ++
+ utils/pdftops.cc | 3 ++-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 0d25592a1a5811ee8fffbd70307c7bcaaaacadf3
@@ -40182,8 +43369,8 @@ Date:	Thu Sep 21 22:40:52 2006 +0000
 	reference its document throughout the lifetime of the page
 	(#7005).
 
- ChangeLog	      |    3 +++
- glib/poppler-page.cc |    5 ++++-
+ ChangeLog	      | 3 +++
+ glib/poppler-page.cc | 5 ++++-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit b834755c7ae45eb4020e9cdbc3852eac0151fcdc
@@ -40194,8 +43381,8 @@ Date:	Thu Sep 21 22:37:00 2006 +0000
 
 	* poppler/Gfx.cc: Remove the right out->updateAll() call.
 
- ChangeLog	|    4 ++++
- poppler/Gfx.cc |    2 +-
+ ChangeLog	| 4 ++++
+ poppler/Gfx.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 181e2af1edf2cbc3c8edadad0dce215a64a990dd
@@ -40208,9 +43395,9 @@ Date:	Thu Sep 21 01:05:23 2006 +0000
 
 	* configure.ac: Bump release to 0.5.4.
 
- ChangeLog    |    4 ++++
- NEWS	      |   10 ++++++++++
- configure.ac |    2 +-
+ ChangeLog    |  4 ++++
+ NEWS	      | 10 ++++++++++
+ configure.ac |  2 +-
  3 files changed, 15 insertions(+), 1 deletion(-)
 
 commit cc9c17a6730422be99ebcd69991fcf5d7b569640
@@ -40222,9 +43409,9 @@ Date:	Thu Sep 21 00:56:33 2006 +0000
 	* poppler/Gfx.cc: Remove last remnant of erroneous type3 commit a
 	while back, fixing #8182.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	1 -
- poppler/Gfx.cc		   |	1 -
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 1 -
+ poppler/Gfx.cc		   | 1 -
  3 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 83be722b56d9266b89946fe994023351e47eb4fd
@@ -40239,8 +43426,8 @@ Date:	Wed Sep 20 20:22:19 2006 +0000
 	problem by calling incRefCnt and decRefCnt appropriately. Fixes
 	#4649
 
- ChangeLog		  |    6 ++++++
- poppler/TextOutputDev.cc |    4 ++++
+ ChangeLog		  | 6 ++++++
+ poppler/TextOutputDev.cc | 4 ++++
  2 files changed, 10 insertions(+)
 
 commit 1cf60015d7d78668c83737be6015dc880fd04ebf
@@ -40254,14 +43441,14 @@ Date:	Tue Sep 19 04:39:07 2006 +0000
 
 	* m4/define-dir.m4: New file, adds AC_DEFINE_DIR macro.
 
- ChangeLog		 |    7 +++
- configure.ac		 |   16 +------
- goo/gfile.cc		 |   16 +++----
- goo/gfile.h		 |    2 +
- m4/define-dir.m4	 |   34 ++++++++++++++
- poppler/GlobalParams.cc |  116
- +++++++++++++++++++++++++++++++----------------
- poppler/GlobalParams.h  |    7 ++-
+ ChangeLog		 |   7 +++
+ configure.ac		 |  16 +------
+ goo/gfile.cc		 |  16 +++----
+ goo/gfile.h		 |   2 +
+ m4/define-dir.m4	 |  34 ++++++++++++++
+ poppler/GlobalParams.cc | 116
+ ++++++++++++++++++++++++++++++++----------------
+ poppler/GlobalParams.h  |   7 ++-
  7 files changed, 136 insertions(+), 62 deletions(-)
 
 commit 821c883f9df9cc0e5b81aa2e070727996cf3bc4e
@@ -40273,8 +43460,8 @@ Date:	Mon Sep 18 15:40:50 2006 +0000
 	* poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo libs to
 	link if configured.
 
- ChangeLog	     |	  3 +++
- poppler/Makefile.am |	  4 ++++
+ ChangeLog	     | 3 +++
+ poppler/Makefile.am | 4 ++++
  2 files changed, 7 insertions(+)
 
 commit d8ab8ebc94c32d32ad17ed54cede453de25d7dd5
@@ -40286,8 +43473,8 @@ Date:	Wed Sep 13 20:25:03 2006 +0000
 	* configure.ac: Tighten glib check (#7906), add check for C++
 	compiler (#8048).
 
- ChangeLog    |    5 +++++
- configure.ac |    3 ++-
+ ChangeLog    | 5 +++++
+ configure.ac | 3 ++-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 7c748075e18cfe95be6a56adf09ce7f2f032b86f
@@ -40296,7 +43483,7 @@ Date:	Tue Sep 12 19:48:47 2006 +0000
 
     sorry Jeff
 
- ChangeLog |	7 +++++++
+ ChangeLog | 7 +++++++
  1 file changed, 7 insertions(+)
 
 commit 6cdcfae0e1c6fbec07ee5273e6ad97ef04110868
@@ -40311,12 +43498,12 @@ Date:	Mon Sep 11 21:20:56 2006 +0000
 	    LinkAnnotation. Patch by
 	    Pino Toscano
 
- ChangeLog		       |   10 +-
- qt4/src/poppler-annotation.cc |  230
- ++++++++++++++++++++++++++++++++++++++-
- qt4/src/poppler-annotation.h  |   22 +++-
- qt4/src/poppler-page.cc       |  237
- +++++++++++++++++++++++++----------------
+ ChangeLog		       |  10 +-
+ qt4/src/poppler-annotation.cc | 230
+ +++++++++++++++++++++++++++++++++++++++-
+ qt4/src/poppler-annotation.h  |  22 +++-
+ qt4/src/poppler-page.cc       | 237
+ +++++++++++++++++++++++++-----------------
  4 files changed, 392 insertions(+), 107 deletions(-)
 
 commit 8335c7eea2aa62a580170f47323d8674bd89e412
@@ -40332,8 +43519,8 @@ Date:	Fri Sep 8 23:28:22 2006 +0000
 	colour occasionally. Fix by moving the existing call to
 	cairo_set_source above the work-around. Fixes #7113.
 
- ChangeLog		   |	7 +++++++
- poppler/CairoOutputDev.cc |	8 ++++----
+ ChangeLog		   | 7 +++++++
+ poppler/CairoOutputDev.cc | 8 ++++----
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 commit 02d505aa0176b6e5a54ee82426d8333a9ef8f000
@@ -40346,8 +43533,8 @@ Date:	Thu Sep 7 04:01:39 2006 +0000
 	endString is called without a corresponding beginString. Fixes
 	#4515.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	8 +++++++-
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 8 +++++++-
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 commit 3ea0aada0434c9f815814253dd9d1374ae6643cc
@@ -40364,10 +43551,10 @@ Date:	Wed Sep 6 23:54:30 2006 +0000
 	only 1 byte large, however correctness is better than performance.
 	This should fix #3948.
 
- ChangeLog		|    9 +++++++++
- configure.ac		|    2 +-
- poppler/FlateStream.cc |   35 +++++++++++++++++++++++++----------
- poppler/FlateStream.h	|    3 ++-
+ ChangeLog		|  9 +++++++++
+ configure.ac		|  2 +-
+ poppler/FlateStream.cc | 35 +++++++++++++++++++++++++----------
+ poppler/FlateStream.h	|  3 ++-
  4 files changed, 37 insertions(+), 12 deletions(-)
 
 commit 1d2e6aedca0b8fcce6ac84ae2576ab067912886b
@@ -40379,8 +43566,8 @@ Date:	Tue Sep 5 01:21:50 2006 +0000
 	* poppler/CairoOutputDev.cc: Initialize currentFont to NULL before
 	use. Found by Pascal Terjan. Fixes #7924.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	1 +
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 1 +
  2 files changed, 6 insertions(+)
 
 commit 7905adaa21f2347346927fa567c64be60e2bc69c
@@ -40396,11 +43583,11 @@ Date:	Sun Sep 3 09:27:21 2006 +0000
 	    for more
 	    information.
 
- ChangeLog	   |	9 +++++++++
- poppler/Dict.cc   |	4 ++--
- poppler/Dict.h    |   11 +++++++++--
- poppler/Object.h  |   12 ++++++++++++
- poppler/Parser.cc |   15 +++++++++------
+ ChangeLog	   |  9 +++++++++
+ poppler/Dict.cc   |  4 ++--
+ poppler/Dict.h    | 11 +++++++++--
+ poppler/Object.h  | 12 ++++++++++++
+ poppler/Parser.cc | 15 +++++++++------
  5 files changed, 41 insertions(+), 10 deletions(-)
 
 commit 4da7c90a619002e54f436c4efee723b5bc42a112
@@ -40411,8 +43598,8 @@ Date:	Thu Aug 24 22:32:31 2006 +0000
      NULL. Discovered by
 	    Rafael Rodríguez <rafael.rodriguez.tf@gmail.com>
 
- ChangeLog		   |	5 +++++
- qt4/src/poppler-private.h |	2 +-
+ ChangeLog		   | 5 +++++
+ qt4/src/poppler-private.h | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 469202e117910beb4e0ad906d5c154a3bae5c98b
@@ -40422,8 +43609,8 @@ Date:	Wed Aug 16 14:35:14 2006 +0000
     * qt/poppler-page.cc: Report correct page size. Backport from Qt4
       frontend. Patch by Wilfried Huss
 
- ChangeLog	    |	 5 +++++
- qt/poppler-page.cc |	10 ++++++++--
+ ChangeLog	    |  5 +++++
+ qt/poppler-page.cc | 10 ++++++++--
  2 files changed, 13 insertions(+), 2 deletions(-)
 
 commit b881844e4d31009c5d54c9321a6daaf0f354cf6b
@@ -40432,7 +43619,7 @@ Date:	Wed Aug 16 09:18:04 2006 +0000
 
     did not want to commit that, thanks Brad for noticing!
 
- configure.ac |    2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit f52380e6d569280839d7c37362bd7cc59f2573c3
@@ -40443,8 +43630,8 @@ Date:	Tue Aug 15 22:27:31 2006 +0000
     and make your readers crash when you are not looking at it, so be
     aware that if you enable it you are on your own ;-)
 
- ChangeLog    |    4 ++++
- configure.ac |    4 ++--
+ ChangeLog    | 4 ++++
+ configure.ac | 4 ++--
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 1caba84b1024f1fa7865deebbf70379855ce078d
@@ -40455,8 +43642,8 @@ Date:	Fri Aug 11 13:12:11 2006 +0000
 
 	    * poppler/Catalog.cc: Fix leak
 
- ChangeLog	    |	 4 ++++
- poppler/Catalog.cc |	 1 +
+ ChangeLog	    | 4 ++++
+ poppler/Catalog.cc | 1 +
  2 files changed, 5 insertions(+)
 
 commit 9b6455f6530e273afaa5f948b67ceeec8a06f976
@@ -40468,8 +43655,8 @@ Date:	Thu Aug 10 16:08:51 2006 +0000
 	    * poppler/SplashOutputDev.cc: Try to fix refs to fonts
 	    yet again
 
- ChangeLog		    |	 4 ++++
- poppler/SplashOutputDev.cc |	 4 ++--
+ ChangeLog		    | 4 ++++
+ poppler/SplashOutputDev.cc | 4 ++--
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 305f60e0437dcfc5babd449123a1fe4cd062a219
@@ -40487,9 +43674,9 @@ Date:	Sat Aug 5 17:10:07 2006 +0000
 	    * qt4/src/poppler-embeddedfile.cc: Use UGooString for
 	    description
 
- ChangeLog			 |    8 ++++++++
- poppler/Catalog.cc		 |   12 ++++++++++--
- qt4/src/poppler-embeddedfile.cc |    3 ++-
+ ChangeLog			 |  8 ++++++++
+ poppler/Catalog.cc		 | 12 ++++++++++--
+ qt4/src/poppler-embeddedfile.cc |  3 ++-
  3 files changed, 20 insertions(+), 3 deletions(-)
 
 commit dd8758ea3f0f44e9f8362343f15b2064f428ad64
@@ -40504,10 +43691,10 @@ Date:	Fri Aug 4 22:48:09 2006 +0000
 	    from stdin.
 	    Patch by Dom Lachowicz
 
- ChangeLog	    |	 7 +++++++
- utils/pdffonts.cc  |	11 ++++++++++-
- utils/pdfinfo.cc   |	11 ++++++++++-
- utils/pdftotext.cc |	11 ++++++++++-
+ ChangeLog	    |  7 +++++++
+ utils/pdffonts.cc  | 11 ++++++++++-
+ utils/pdfinfo.cc   | 11 ++++++++++-
+ utils/pdftotext.cc | 11 ++++++++++-
  4 files changed, 37 insertions(+), 3 deletions(-)
 
 commit a418d844cf6baa797919796ceadaf21ef9b2e5b9
@@ -40518,8 +43705,8 @@ Date:	Thu Aug 3 10:34:52 2006 +0000
 	    utils status.
 	    Patch by Dom Lachowic
 
- ChangeLog    |    5 +++++
- configure.ac |    2 +-
+ ChangeLog    | 5 +++++
+ configure.ac | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 1673b895656143a8a1f1a45e07f777f39995940d
@@ -40534,8 +43721,8 @@ Date:	Sun Jul 30 20:31:31 2006 +0000
 	    found. Discovered by
 	    Krzysztof Kowalczyk
 
- ChangeLog	     |	  7 +++++++
- poppler/GfxState.cc |	 12 +++++++-----
+ ChangeLog	     |	7 +++++++
+ poppler/GfxState.cc | 12 +++++++-----
  2 files changed, 14 insertions(+), 5 deletions(-)
 
 commit e4561568d14e7b3b2aec6ecaf3cc09078bdf7a46
@@ -40547,9 +43734,9 @@ Date:	Sun Jul 30 09:38:28 2006 +0000
 	    embedded
 	    fonts in the pdf file. Patch by Krzysztof Kowalczyk
 
- ChangeLog		    |	 6 ++++++
- poppler/SplashOutputDev.cc |	 8 ++++++--
- splash/SplashFontEngine.cc |	12 ++++++++----
+ ChangeLog		    |  6 ++++++
+ poppler/SplashOutputDev.cc |  8 ++++++--
+ splash/SplashFontEngine.cc | 12 ++++++++----
  3 files changed, 20 insertions(+), 6 deletions(-)
 
 commit 4a27502159a89992f54be2673b44bf7a8392b60d
@@ -40558,7 +43745,7 @@ Date:	Sat Jul 29 16:24:53 2006 +0000
 
     push back thing i did not want to commit, sorry
 
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit ba448afc0e97a9e779409ff228adcd4f627971f5
@@ -40569,8 +43756,8 @@ Date:	Sat Jul 29 16:22:52 2006 +0000
 	    backend is
 	    disabled
 
- ChangeLog    |    5 +++++
- configure.ac |   18 ++++++++++++++----
+ ChangeLog    |  5 +++++
+ configure.ac | 18 ++++++++++++++----
  2 files changed, 19 insertions(+), 4 deletions(-)
 
 commit 1e32d3baa5e8296caf55bd5853216a96618c74ac
@@ -40582,8 +43769,8 @@ Date:	Fri Jul 28 18:17:45 2006 +0000
 	* poppler/CairoOutputDev.cc: Don't set font matrix translation
 	(fix from Behdad Esfahbod).
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	4 ++--
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 4 ++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 0bc1b0f35c28cb80dd27d24110367348e52c143b
@@ -40592,7 +43779,7 @@ Date:	Thu Jul 27 18:21:28 2006 +0000
 
     fix date, i don't live in the past
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2f27c3a0218608568f6cd1c718ef51b9879023a3
@@ -40603,8 +43790,8 @@ Date:	Thu Jul 27 18:17:50 2006 +0000
 	    better
 	    initialize it first ;-) Fixes bug 7646
 
- ChangeLog	   |	5 +++++
- poppler/Stream.cc |	2 +-
+ ChangeLog	   | 5 +++++
+ poppler/Stream.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit f39ab43ca824cb7e5db73137c4545b3e85134425
@@ -40620,11 +43807,11 @@ Date:	Wed Jul 26 18:16:01 2006 +0000
 	    from the qt4 frontend to the qt frontend. Patch by Wilfried
 	    Huss
 
- ChangeLog		|    7 ++++++
- qt/poppler-document.cc |   18 +++++++++++++++
- qt/poppler-private.h	|   58
- ++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h	|   16 +++++++++++++
+ ChangeLog		|  7 ++++++
+ qt/poppler-document.cc | 18 ++++++++++++++++
+ qt/poppler-private.h	| 58
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h	| 16 ++++++++++++++
  4 files changed, 99 insertions(+)
 
 commit c3a9fd546b853c85b6be5fc8f4e5a78d8a7e7437
@@ -40637,8 +43824,8 @@ Date:	Tue Jul 25 18:39:57 2006 +0000
 	    so disabling
 	    duplex printing for default is a good idea.
 
- ChangeLog		     |	  6 ++++++
- qt4/src/poppler-document.cc |	  2 +-
+ ChangeLog		     | 6 ++++++
+ qt4/src/poppler-document.cc | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit edc0499644b8083600ced9a5087ec0b0189e615b
@@ -40650,9 +43837,9 @@ Date:	Mon Jul 24 19:49:51 2006 +0000
 	* configure.ac:
 	* poppler/Makefile.am: Move fontconfig dependency to libpoppler.
 
- ChangeLog	     |	  5 +++++
- configure.ac	     |	 18 +++++++-----------
- poppler/Makefile.am |	  6 ++++--
+ ChangeLog	     |	5 +++++
+ configure.ac	     | 18 +++++++-----------
+ poppler/Makefile.am |	6 ++++--
  3 files changed, 16 insertions(+), 13 deletions(-)
 
 commit 24b5a68a3f4cdba63fbcd01dc178a330b5f604a7
@@ -40665,8 +43852,8 @@ Date:	Tue Jul 18 21:32:11 2006 +0000
 	a separate opClose and opStroke. Previously, opCloseStroke only
 	closes if there is a path however opClose closes unconditionally.
 
- ChangeLog	|    6 ++++++
- poppler/Gfx.cc |    2 +-
+ ChangeLog	| 6 ++++++
+ poppler/Gfx.cc | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit c57ebd40fcf85432b2e5045086d158a63af12525
@@ -40679,8 +43866,8 @@ Date:	Tue Jul 18 21:26:57 2006 +0000
 	like in Gfx.cc. This fixes a regression caused by the fix
 	to #6948.
 
- ChangeLog		  |    5 +++++
- poppler/TextOutputDev.cc |    1 +
+ ChangeLog		  | 5 +++++
+ poppler/TextOutputDev.cc | 1 +
  2 files changed, 6 insertions(+)
 
 commit 640d5d5a9d9e53f3f677eb05f3d18e6bfc74e95a
@@ -40693,9 +43880,9 @@ Date:	Sun Jul 16 18:22:23 2006 +0000
 	    parse a GfxImageColorMap
 	    Fixes crash on pdf that can be found at
 
- ChangeLog	     |	  7 +++++++
- poppler/GfxState.cc |	  4 ++++
- qt4/src/Doxyfile    |	  4 ++--
+ ChangeLog	     | 7 +++++++
+ poppler/GfxState.cc | 4 ++++
+ qt4/src/Doxyfile    | 4 ++--
  3 files changed, 13 insertions(+), 2 deletions(-)
 
 commit c6926d1d8ab04468f56f4687cdd3f06af206226b
@@ -40707,9 +43894,9 @@ Date:	Wed Jun 28 19:23:52 2006 +0000
 	    Fixes crash while printing pdf at
 	    http://bugs.kde.org/attachment.cgi?id=16818&action=view
 
- ChangeLog	      |    7 +++++++
- poppler/DCTStream.cc |   25 ++++++++++++++++++-------
- poppler/DCTStream.h  |    2 ++
+ ChangeLog	      |  7 +++++++
+ poppler/DCTStream.cc | 25 ++++++++++++++++++-------
+ poppler/DCTStream.h  |  2 ++
  3 files changed, 27 insertions(+), 7 deletions(-)
 
 commit 96ac8dec591a0325a822c1f7b7bc7e78b867e3a0
@@ -40721,11 +43908,11 @@ Date:	Sun Jun 25 16:59:31 2006 +0000
     have to define UNSTABLE_POPPLER_QT4 to be able of using it, one day
     we'll have to think of removing it)
 
- ChangeLog		     |	  8 ++++++++
- qt/poppler-document.cc      |	  9 +++++++--
- qt/poppler-qt.h	     |	  9 +++++++++
- qt4/src/poppler-document.cc |	  4 ++--
- qt4/src/poppler-qt4.h	     |	 10 +++++++++-
+ ChangeLog		     |	8 ++++++++
+ qt/poppler-document.cc      |	9 +++++++--
+ qt/poppler-qt.h	     |	9 +++++++++
+ qt4/src/poppler-document.cc |	4 ++--
+ qt4/src/poppler-qt4.h	     | 10 +++++++++-
  5 files changed, 35 insertions(+), 5 deletions(-)
 
 commit 965011f2001fb1ea36857995d5555266f82b8d96
@@ -40734,7 +43921,7 @@ Date:	Sun Jun 25 16:20:50 2006 +0000
 
     put back a change that was not meant to be commited
 
- qt/poppler-qt.h |    2 +-
+ qt/poppler-qt.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 4995d09c91173d34a435112828aff21a63b147e9
@@ -40744,11 +43931,11 @@ Date:	Sun Jun 25 16:19:32 2006 +0000
     rename poppler-link.h to poppler-link-qt3.h to not get conflicts
     on install
 
- qt/Makefile.am        |    2 +-
- qt/poppler-link-qt3.h |  188 +++++++++++++++++++++++++++++++++++
- qt/poppler-link.cc    |  258
- +++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h       |    4 +-
+ qt/Makefile.am        |   2 +-
+ qt/poppler-link-qt3.h | 188 ++++++++++++++++++++++++++++++++++++
+ qt/poppler-link.cc    | 258
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h       |   4 +-
  4 files changed, 449 insertions(+), 3 deletions(-)
 
 commit 087921b134c2646e6d41960f471a1819c7c8790a
@@ -40758,13 +43945,13 @@ Date:	Sun Jun 25 10:29:22 2006 +0000
     add link support to qt3 frontend.
     Patch by Wilfried Huss based on Qt4 code
 
- ChangeLog		|   11 ++++
- qt/Makefile.am		|    4 +-
- qt/poppler-document.cc |   19 ++++---
- qt/poppler-page.cc	|  136
- +++++++++++++++++++++++++++++++++++++++++++++---
- qt/poppler-private.h	|   33 +++++++++++-
- qt/poppler-qt.h	|   14 +++--
+ ChangeLog		|  11 ++++
+ qt/Makefile.am		|   4 +-
+ qt/poppler-document.cc |  19 ++++---
+ qt/poppler-page.cc	| 136
+ ++++++++++++++++++++++++++++++++++++++++++++++---
+ qt/poppler-private.h	|  33 +++++++++++-
+ qt/poppler-qt.h	|  14 +++--
  6 files changed, 196 insertions(+), 21 deletions(-)
 
 commit 831bd8942ef3224354b128d5e14e68fdfc57168b
@@ -40773,7 +43960,7 @@ Date:	Sun Jun 11 16:14:32 2006 +0000
 
     optimization by Mario Teijeiro Otero
 
- poppler/UGooString.cc |    2 +-
+ poppler/UGooString.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1223fd4b200f6c13996f8299f3563c818af0c21d
@@ -40787,8 +43974,8 @@ Date:	Sat Jun 10 22:23:19 2006 +0000
 	    http://publikationen.ub.uni-frankfurt.de/volltexte/2005/890/pdf/TR_abs_g.pdf
 	    and other docs with type3 fonts and ligatures
 
- ChangeLog	       |    9 +++++++++
- poppler/UGooString.cc |    8 ++++++++
+ ChangeLog	       | 9 +++++++++
+ poppler/UGooString.cc | 8 ++++++++
  2 files changed, 17 insertions(+)
 
 commit b85a39ddfc7de8c0621e995c114885ecd08fcdc2
@@ -40800,9 +43987,9 @@ Date:	Thu Jun 1 21:03:38 2006 +0000
 	    is	passed
 	    to the respective output devs
 
- ChangeLog		 |    6 ++++++
- qt4/src/poppler-page.cc |   22 ++++++++++++++--------
- qt4/src/poppler-qt4.h	 |   14 +++++++++-----
+ ChangeLog		 |  6 ++++++
+ qt4/src/poppler-page.cc | 22 ++++++++++++++--------
+ qt4/src/poppler-qt4.h	 | 14 +++++++++-----
  3 files changed, 29 insertions(+), 13 deletions(-)
 
 commit 2b5d3277f36864ff1ef44f1942f22de247d67ab6
@@ -40813,9 +44000,9 @@ Date:	Thu Jun 1 17:23:45 2006 +0000
 	    * qt/poppler-qt.h: Add printing support, patch by
 	    Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
 
- ChangeLog		|    6 ++++++
- qt/poppler-document.cc |   18 ++++++++++++++++++
- qt/poppler-qt.h	|    2 ++
+ ChangeLog		|  6 ++++++
+ qt/poppler-document.cc | 18 ++++++++++++++++++
+ qt/poppler-qt.h	|  2 ++
  3 files changed, 26 insertions(+)
 
 commit 5380d005b7b54cc6587ce6e8c3bbb358da5cd9a5
@@ -40828,9 +44015,9 @@ Date:	Thu Jun 1 06:42:25 2006 +0000
 	* poppler/PSOutputDev.h: Change filename parameter to PSOutputDev
 	constructor from char * to const char *.
 
- ChangeLog		|    6 ++++++
- poppler/PSOutputDev.cc |    2 +-
- poppler/PSOutputDev.h	|    2 +-
+ ChangeLog		| 6 ++++++
+ poppler/PSOutputDev.cc | 2 +-
+ poppler/PSOutputDev.h	| 2 +-
  3 files changed, 8 insertions(+), 2 deletions(-)
 
 commit c2a81ea8b01f3943a2eb737cf957acc0d05f7eed
@@ -40844,9 +44031,9 @@ Date:	Wed May 31 20:14:04 2006 +0000
 
     I'm sorry, really, i'll try to do better
 
- ChangeLog		    |	 6 ++++++
- poppler/SplashOutputDev.cc |	10 ++++++++++
- splash/Splash.cc	    |	 3 +++
+ ChangeLog		    |  6 ++++++
+ poppler/SplashOutputDev.cc | 10 ++++++++++
+ splash/Splash.cc	    |  3 +++
  3 files changed, 19 insertions(+)
 
 commit 643b310cf51474b6dfc077fe086ea121e807f6e1
@@ -40857,8 +44044,8 @@ Date:	Wed May 31 19:18:28 2006 +0000
 
 	* TODO: Remove items's from my list that are done.
 
- ChangeLog |	4 ++++
- TODO	   |	3 ---
+ ChangeLog | 4 ++++
+ TODO	   | 3 ---
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit 96e582721dcb15ea258b989c7c500084bff9f56d
@@ -40873,10 +44060,10 @@ Date:	Wed May 31 17:31:49 2006 +0000
 	transformations in
 	the OutputDevice. Fixes #6948.
 
- ChangeLog		   |	7 ++
- poppler/CairoOutputDev.cc |  200
- ++++++++++++++++++++-------------------------
- poppler/CairoOutputDev.h  |	1 +
+ ChangeLog		   |   7 ++
+ poppler/CairoOutputDev.cc | 200
+ ++++++++++++++++++++--------------------------
+ poppler/CairoOutputDev.h  |   1 +
  3 files changed, 96 insertions(+), 112 deletions(-)
 
 commit 00ffb9bf50b6b3b2e8eaa8af593aaa01d4a62a34
@@ -40889,9 +44076,9 @@ Date:	Wed May 31 04:53:27 2006 +0000
 
 	* configure.ac: Bump release to 0.5.3.
 
- ChangeLog    |    6 ++++++
- NEWS	      |    8 ++++++++
- configure.ac |    2 +-
+ ChangeLog    | 6 ++++++
+ NEWS	      | 8 ++++++++
+ configure.ac | 2 +-
  3 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 223a4bf3a679f666b6c963a8787cf5b5ac75c4b6
@@ -40904,9 +44091,9 @@ Date:	Wed May 31 02:02:54 2006 +0000
 	* configure.ac: Add poppler as a private requires if pkg-config
 	supports it.
 
- ChangeLog	    |	 6 ++++++
- configure.ac	    |	11 +++++++++++
- poppler-glib.pc.in |	 3 ++-
+ ChangeLog	    |  6 ++++++
+ configure.ac	    | 11 +++++++++++
+ poppler-glib.pc.in |  3 ++-
  3 files changed, 19 insertions(+), 1 deletion(-)
 
 commit 7aaa4d3fbdb8ea2534d3cb80e68b2759b2e8fd2f
@@ -40917,8 +44104,8 @@ Date:	Tue May 30 21:46:06 2006 +0000
 
 	* test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test.
 
- ChangeLog		|    4 ++++
- test/gtk-cairo-test.cc |   21 ++++++++++++++++++---
+ ChangeLog		|  4 ++++
+ test/gtk-cairo-test.cc | 21 ++++++++++++++++++---
  2 files changed, 22 insertions(+), 3 deletions(-)
 
 commit f7c1d519b9695ad8adfdcf3af696de746cdcf375
@@ -40932,10 +44119,10 @@ Date:	Mon May 29 18:44:17 2006 +0000
 	* poppler/CairoOutputDev.cc: Allow CairoFont creation to fail more
 	gracefully. Fixes #4030.
 
- ChangeLog		    |	 7 +++++++
- poppler/CairoFontEngine.cc |	27 +++++++++++++++++++++------
- poppler/CairoFontEngine.h  |	 4 +++-
- poppler/CairoOutputDev.cc  |	 5 +++++
+ ChangeLog		    |  7 +++++++
+ poppler/CairoFontEngine.cc | 27 +++++++++++++++++++++------
+ poppler/CairoFontEngine.h  |  4 +++-
+ poppler/CairoOutputDev.cc  |  5 +++++
  4 files changed, 36 insertions(+), 7 deletions(-)
 
 commit 84861800dad3649d4757d5c5539b9e86e2b2c644
@@ -40948,9 +44135,9 @@ Date:	Sat May 27 17:27:37 2006 +0000
 	* poppler/CairoOutputDev.h: Back out the rest of krh's type3
 	font work. This fixes type3 fonts in CairoOutputDevice.
 
- ChangeLog		   |	6 ++++++
- poppler/CairoOutputDev.cc |	3 +++
- poppler/CairoOutputDev.h  |	2 +-
+ ChangeLog		   | 6 ++++++
+ poppler/CairoOutputDev.cc | 3 +++
+ poppler/CairoOutputDev.h  | 2 +-
  3 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 6f5a89a0a2cf17d45d1c31ce105829be8c7ac456
@@ -40973,14 +44160,14 @@ Date:	Tue May 23 20:49:16 2006 +0000
 
     /me hits himself
 
- ChangeLog		    |	11 +++
- poppler/SplashOutputDev.cc |	 8 +++
- qt/poppler-private.h	    |	 2 +-
- qt4/src/poppler-private.h  |	 2 +-
- splash/Splash.cc	    |  169
- ++++++++++++++++++++++++++++++++++++++++++++
- splash/SplashBitmap.cc     |	26 ++++++-
- splash/SplashTypes.h	    |	 2 +
+ ChangeLog		    |  11 +++
+ poppler/SplashOutputDev.cc |	8 +++
+ qt/poppler-private.h	    |	2 +-
+ qt4/src/poppler-private.h  |	2 +-
+ splash/Splash.cc	    | 169
+ +++++++++++++++++++++++++++++++++++++++++++++
+ splash/SplashBitmap.cc     |  26 ++++++-
+ splash/SplashTypes.h	    |	2 +
  7 files changed, 216 insertions(+), 4 deletions(-)
 
 commit 495d592c3ba7fe81e03774f5b2ed677e5aa560c7
@@ -40991,8 +44178,8 @@ Date:	Tue May 23 19:16:37 2006 +0000
 
 	* qt4/src/Makefile.am (libpoppler_qt4_la_SOURCES): Add missing
 
- ChangeLog	     |	  5 +++++
- qt4/src/Makefile.am |	  1 +
+ ChangeLog	     | 5 +++++
+ qt4/src/Makefile.am | 1 +
  2 files changed, 6 insertions(+)
 
 commit eecd06c86585bca05c99cd2e9a1b1ff3bbae3c72
@@ -41004,9 +44191,9 @@ Date:	Mon May 22 20:19:35 2006 +0000
 	* configure.ac: Bump release.
 	* NEWS: Sum up changes.
 
- ChangeLog    |    5 +++++
- NEWS	      |   11 ++++++++++-
- configure.ac |    2 +-
+ ChangeLog    |  5 +++++
+ NEWS	      | 11 ++++++++++-
+ configure.ac |  2 +-
  3 files changed, 16 insertions(+), 2 deletions(-)
 
 commit 680f20dfd1cf0342d49516b3848a2aef5d2a3883
@@ -41022,10 +44209,10 @@ Date:	Mon May 22 19:58:41 2006 +0000
 
 	* utils/ImageOutputDev.h: Return gTrue for needNonText().
 
- ChangeLog		 |    9 +++++++++
- NEWS			 |    4 ++++
- utils/ImageOutputDev.cc |    6 +++---
- utils/ImageOutputDev.h  |    2 +-
+ ChangeLog		 | 9 +++++++++
+ NEWS			 | 4 ++++
+ utils/ImageOutputDev.cc | 6 +++---
+ utils/ImageOutputDev.h  | 2 +-
  4 files changed, 17 insertions(+), 4 deletions(-)
 
 commit e43a06bf6e953fa9af18476e2c9f27106398c09c
@@ -41038,10 +44225,10 @@ Date:	Sun May 21 23:26:45 2006 +0000
 	* poppler/CairoFontEngine.h: Back out type3 font work committed by
 	accident.
 
- ChangeLog		    |	 6 +
- poppler/CairoFontEngine.cc |  347
- +++++---------------------------------------
- poppler/CairoFontEngine.h  |	17 +--
+ ChangeLog		    |	6 +
+ poppler/CairoFontEngine.cc | 347
+ +++++----------------------------------------
+ poppler/CairoFontEngine.h  |  17 +--
  3 files changed, 47 insertions(+), 323 deletions(-)
 
 commit 7d4bb0533f88f06449ebd64c1220d0b75001937d
@@ -41050,9 +44237,9 @@ Date:	Sun May 21 18:14:15 2006 +0000
 
     fix all is blue issue on ppc machines
 
- ChangeLog		 |    7 +++++++
- qt/poppler-page.cc	 |   17 +++++++++++++++++
- qt4/src/poppler-page.cc |   17 +++++++++++++++++
+ ChangeLog		 |  7 +++++++
+ qt/poppler-page.cc	 | 17 +++++++++++++++++
+ qt4/src/poppler-page.cc | 17 +++++++++++++++++
  3 files changed, 41 insertions(+)
 
 commit 655af1e0126ca96d75c9c718d7d8f928c898b1f6
@@ -41061,7 +44248,7 @@ Date:	Sun May 21 17:19:53 2006 +0000
 
     hope to fix really Kouhei's name now
 
- ChangeLog |   10 +++++-----
+ ChangeLog | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit cc783a1ebe868ff75db5472775dabe0020ae501f
@@ -41070,7 +44257,7 @@ Date:	Sun May 21 11:54:30 2006 +0000
 
     Fix Kouhei name
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit e4b6ad3bb873a6f334934921e6d56e9d26e06a9a
@@ -41079,7 +44266,7 @@ Date:	Fri May 19 22:55:49 2006 +0000
 
     Add bug number to ChangeLog entry.
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 46f5f070cceb2c0f3b53537c8e33340b9f1bba38
@@ -41092,9 +44279,9 @@ Date:	Fri May 19 22:26:03 2006 +0000
 	* glib/poppler-action.cc: Add poppler_dest_get_type(), patch from
 	Kouhei Souto (#6907).
 
- ChangeLog		|    4 ++++
- glib/poppler-action.cc |   13 +++++++++++++
- glib/poppler-action.h	|    4 ++++
+ ChangeLog		|  4 ++++
+ glib/poppler-action.cc | 13 +++++++++++++
+ glib/poppler-action.h	|  4 ++++
  3 files changed, 21 insertions(+)
 
 commit 875dc5b112dfe2d4a48a7567b1ff79257447cc0d
@@ -41106,8 +44293,8 @@ Date:	Fri May 19 22:21:35 2006 +0000
 	* poppler-glib.pc.in (Requires): Add gdk-2.0 dependency, from
 	Kouhei Souto (#6896).
 
- ChangeLog	    |	 3 +++
- poppler-glib.pc.in |	 2 +-
+ ChangeLog	    | 3 +++
+ poppler-glib.pc.in | 2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit b66dda2640c088bbe205f698a0c4028144027922
@@ -41120,8 +44307,8 @@ Date:	Fri May 19 22:19:21 2006 +0000
 	(POPPLER_TYPE_FONTS_ITER): Add these macros, patch from Kouhei
 	Souto (#6897).
 
- ChangeLog		 |    4 ++++
- glib/poppler-document.h |    2 ++
+ ChangeLog		 | 4 ++++
+ glib/poppler-document.h | 2 ++
  2 files changed, 6 insertions(+)
 
 commit 095730456c0d8312067af10dd55a3b9165a83736
@@ -41133,8 +44320,8 @@ Date:	Fri May 19 22:16:25 2006 +0000
 	* glib/Makefile.am (INCLUDES): Add define for G_LOG_DOMAIN, from
 	Kouhei Souto (#6899).
 
- ChangeLog	  |    3 +++
- glib/Makefile.am |    1 +
+ ChangeLog	  | 3 +++
+ glib/Makefile.am | 1 +
  2 files changed, 4 insertions(+)
 
 commit b8d77633899c1dec5f3b9c9a0f075f39afa98965
@@ -41146,8 +44333,8 @@ Date:	Fri May 19 22:12:38 2006 +0000
 	* glib/poppler-document.cc (poppler_document_save): Memleak patch
 	from Paolo Borelli (#6908).
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |    2 ++
+ ChangeLog		  | 5 +++++
+ glib/poppler-document.cc | 2 ++
  2 files changed, 7 insertions(+)
 
 commit 488f77298fee9eebbca5983c1c9fb186b3b67aa3
@@ -41188,8 +44375,8 @@ Date:	Fri May 19 21:42:54 2006 +0000
 	* glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix the
 	rotation bug for real.
 
- ChangeLog	      |    5 +++++
- glib/poppler-page.cc |   16 +++++++++-------
+ ChangeLog	      |  5 +++++
+ glib/poppler-page.cc | 16 +++++++++-------
  2 files changed, 14 insertions(+), 7 deletions(-)
 
 commit 28ae789afe0625a641525e4a0768d51fa8bd667c
@@ -41207,13 +44394,13 @@ Date:	Fri May 19 20:54:13 2006 +0000
 	* glib/reference/tmpl/poppler.sgml: Make PopplerPSOutput a proper
 	glib object.
 
- ChangeLog				  |   11 +++++++
- glib/poppler-document.cc		  |   51
- ++++++++++++++++++++++++------
- glib/poppler-document.h		  |    4 +++
- glib/poppler-private.h			  |    2 ++
- glib/reference/tmpl/poppler-private.sgml |    1 +
- glib/reference/tmpl/poppler.sgml	  |    1 +
+ ChangeLog				  | 11 +++++++
+ glib/poppler-document.cc		  | 51
+ ++++++++++++++++++++++++++------
+ glib/poppler-document.h		  |  4 +++
+ glib/poppler-private.h			  |  2 ++
+ glib/reference/tmpl/poppler-private.sgml |  1 +
+ glib/reference/tmpl/poppler.sgml	  |  1 +
  6 files changed, 61 insertions(+), 9 deletions(-)
 
 commit 02cf7fd7df0b2d8c2b1c6f108e581bc1c7a973b1
@@ -41225,8 +44412,8 @@ Date:	Fri May 19 20:35:43 2006 +0000
 	* glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix
 	rotation bug (#6913, #6926).
 
- ChangeLog	      |    3 +++
- glib/poppler-page.cc |   12 +++++++++++-
+ ChangeLog	      |  3 +++
+ glib/poppler-page.cc | 12 +++++++++++-
  2 files changed, 14 insertions(+), 1 deletion(-)
 
 commit 78ae3efd9541d7b63ff5a2c4de3fde300806688f
@@ -41247,17 +44434,17 @@ Date:	Fri May 19 19:21:59 2006 +0000
 	* poppler/Gfx.cc:
 	* poppler/TextOutputDev.cc:  Fix various memory leaks.
 
- ChangeLog		    |	14 ++
- glib/poppler-action.cc     |	 9 +-
- glib/poppler-document.cc   |	31 +++-
- glib/poppler-page.cc	    |	 2 +
- poppler/CairoFontEngine.cc |  347
- +++++++++++++++++++++++++++++++++++++++-----
- poppler/CairoFontEngine.h  |	17 ++-
- poppler/CairoOutputDev.cc  |	 5 +-
- poppler/CairoOutputDev.h   |	 2 +-
- poppler/Gfx.cc		    |	 1 +
- poppler/TextOutputDev.cc   |	 9 ++
+ ChangeLog		    |  14 ++
+ glib/poppler-action.cc     |	9 +-
+ glib/poppler-document.cc   |  31 +++-
+ glib/poppler-page.cc	    |	2 +
+ poppler/CairoFontEngine.cc | 347
+ ++++++++++++++++++++++++++++++++++++++++-----
+ poppler/CairoFontEngine.h  |  17 ++-
+ poppler/CairoOutputDev.cc  |	5 +-
+ poppler/CairoOutputDev.h   |	2 +-
+ poppler/Gfx.cc		    |	1 +
+ poppler/TextOutputDev.cc   |	9 ++
  10 files changed, 381 insertions(+), 56 deletions(-)
 
 commit 354c1926b7181fd668f221e1d672974e04fda747
@@ -41267,8 +44454,8 @@ Date:	Fri May 19 17:24:19 2006 +0000
     * qt4/src/poppler-link.cc: Patch by Pino Toscano, ensure the
 	    splashoutput is created when parsing the TOC.
 
- ChangeLog		 |    5 +++++
- qt4/src/poppler-link.cc |    5 +++--
+ ChangeLog		 | 5 +++++
+ qt4/src/poppler-link.cc | 5 +++--
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 commit 3c9a5f37704781c9a51e72edd18451870452b9a7
@@ -41278,8 +44465,8 @@ Date:	Sun May 14 16:11:54 2006 +0000
 	    * poppler/FontInfo.cc: Fix possible crash, half patch
 	    by Kouhei Sutou <kou@cozmixng.org>
 
- ChangeLog	     |	  5 +++++
- poppler/FontInfo.cc |	  4 ++--
+ ChangeLog	     | 5 +++++
+ poppler/FontInfo.cc | 4 ++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 436f578fe762e8ceccce95a0f2003406527dde64
@@ -41290,9 +44477,9 @@ Date:	Sat May 13 16:01:57 2006 +0000
 	    * poppler/GfxState.h: Fix memleak, patch by
 		    Carlos Garcia Campos <carlosgc@gnome.org>
 
- ChangeLog	     |	  6 ++++++
- poppler/GfxState.cc |	  8 ++++++++
- poppler/GfxState.h  |	  3 +--
+ ChangeLog	     | 6 ++++++
+ poppler/GfxState.cc | 8 ++++++++
+ poppler/GfxState.h  | 3 +--
  3 files changed, 15 insertions(+), 2 deletions(-)
 
 commit 906515769097f2e38f6b2c2aff598919b9d1ee0d
@@ -41303,10 +44490,10 @@ Date:	Sat May 13 15:58:37 2006 +0000
 	    * qt4/src/poppler-private.h: Refcount globalparams
 	    * qt4/tests/test-poppler-qt4.cpp: Some leaks less
 
- ChangeLog			|    6 ++++++
- qt4/src/poppler-document.cc	|   10 +++++-----
- qt4/src/poppler-private.h	|    8 ++++++++
- qt4/tests/test-poppler-qt4.cpp |    6 ++++--
+ ChangeLog			|  6 ++++++
+ qt4/src/poppler-document.cc	| 10 +++++-----
+ qt4/src/poppler-private.h	|  8 ++++++++
+ qt4/tests/test-poppler-qt4.cpp |  6 ++++--
  4 files changed, 23 insertions(+), 7 deletions(-)
 
 commit 46fd63c44369c882d8dac473d4156001d9d4ed18
@@ -41315,7 +44502,7 @@ Date:	Sat May 13 11:14:24 2006 +0000
 
     numbers for easier casting
 
- qt4/src/poppler-link.h |   14 ++++++++++++--
+ qt4/src/poppler-link.h | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 commit 35500375e3f790c444ab7e7d0a687d270c5a66b1
@@ -41324,7 +44511,7 @@ Date:	Fri May 12 21:02:01 2006 +0000
 
     fixing compile problems for some people
 
- qt4/src/poppler-page.cc |    6 ++++++
+ qt4/src/poppler-page.cc | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 181f09829cf4831965059e3064114d83348c51b5
@@ -41344,16 +44531,16 @@ Date:	Fri May 12 20:40:05 2006 +0000
 	    the problem
 	    is that he left KDE development a while ago.
 
- ChangeLog			     |	 14 +
- qt4/src/Makefile.am		     |	  2 +
- qt4/src/poppler-annotation-helper.h |	213 ++++++++++
- qt4/src/poppler-annotation.cc	     |	792
- +++++++++++++++++++++++++++++++++++
- qt4/src/poppler-annotation.h	     |	257 ++++++++++++
- qt4/src/poppler-link.cc	     |	  4 +-
- qt4/src/poppler-link.h		     |	  2 +-
- qt4/src/poppler-page.cc	     |	691 ++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h		     |	  8 +-
+ ChangeLog			     |	14 +
+ qt4/src/Makefile.am		     |	 2 +
+ qt4/src/poppler-annotation-helper.h | 213 ++++++++++
+ qt4/src/poppler-annotation.cc	     | 792
+ ++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-annotation.h	     | 257 ++++++++++++
+ qt4/src/poppler-link.cc	     |	 4 +-
+ qt4/src/poppler-link.h		     |	 2 +-
+ qt4/src/poppler-page.cc	     | 691 +++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h		     |	 8 +-
  9 files changed, 1980 insertions(+), 3 deletions(-)
 
 commit 3a48e89dfbe54af73a68ed8e917938f14ad17f01
@@ -41370,15 +44557,15 @@ Date:	Tue May 9 20:07:06 2006 +0000
 	      it is basically stripped out from kpdf, but comments are
 	      obviously welcome as always
 
- ChangeLog		     |	 10 +++
- qt4/src/Makefile.am	     |	  1 +
- qt4/src/poppler-document.cc |	 13 +---
- qt4/src/poppler-link.cc     |	129 +++++++++++++++++++++++++++++--
- qt4/src/poppler-link.h      |	178
- +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc     |	139 +++++++++++++++++++++++++++++----
- qt4/src/poppler-private.h   |	  9 ++-
- qt4/src/poppler-qt4.h	     |	 56 +++-----------
+ ChangeLog		     |	10 +++
+ qt4/src/Makefile.am	     |	 1 +
+ qt4/src/poppler-document.cc |	13 +---
+ qt4/src/poppler-link.cc     | 129 ++++++++++++++++++++++++++++++--
+ qt4/src/poppler-link.h      | 178
+ ++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc     | 139 ++++++++++++++++++++++++++++++----
+ qt4/src/poppler-private.h   |	 9 ++-
+ qt4/src/poppler-qt4.h	     |	56 +++-----------
  8 files changed, 456 insertions(+), 79 deletions(-)
 
 commit f628e1506e576a8553a9699c1d7f05ef55c24fa2
@@ -41387,8 +44574,8 @@ Date:	Mon May 8 19:03:51 2006 +0000
 
     memleak-- by carlos
 
- ChangeLog	    |	 5 +++++
- poppler/Catalog.cc |	 5 ++++-
+ ChangeLog	    | 5 +++++
+ poppler/Catalog.cc | 5 ++++-
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 commit 1fce6266564583d356817a21f43c6b1ad8ce3716
@@ -41397,7 +44584,7 @@ Date:	Sat May 6 10:57:07 2006 +0000
 
     fix code, i suck
 
- qt4/src/poppler-page.cc |    2 +-
+ qt4/src/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit be913b90d59da35a347498b86fdd3edb065aef23
@@ -41408,8 +44595,8 @@ Date:	Fri May 5 20:51:01 2006 +0000
 
     Better solutions are of course accepted
 
- ChangeLog	     |	  4 ++++
- poppler/Function.cc |	  2 +-
+ ChangeLog	     | 4 ++++
+ poppler/Function.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit 2b085293bd73b4e77da848b3fe63a7e82e9ba5e5
@@ -41422,10 +44609,9 @@ Date:	Thu May 4 19:10:55 2006 +0000
     more code to make oKular qt4popplered possible, probably not most
     quickest code around, feel free to comment/optimize
 
- ChangeLog		 |    5 +++++
- qt4/src/poppler-page.cc |   43
- +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h	 |   16 ++++++++++++++++
+ ChangeLog		 |  5 +++++
+ qt4/src/poppler-page.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	 | 16 ++++++++++++++++
  3 files changed, 64 insertions(+)
 
 commit a9b0c7977aba7bc85a8673c7f95187ff17ee4173
@@ -41442,13 +44628,13 @@ Date:	Tue May 2 04:38:39 2006 +0000
 	* poppler/TextOutputDev.cc: Patch from Gary Coady to add reference
 	counting to GfxFont so we don't crash on text selection.
 
- ChangeLog		  |   10 ++++++++++
- glib/poppler-page.cc	  |    2 +-
- poppler/Gfx.cc		  |    2 ++
- poppler/GfxFont.cc	  |   14 +++++++++++++-
- poppler/GfxFont.h	  |    4 ++++
- poppler/GfxState.cc	  |    7 +++++++
- poppler/TextOutputDev.cc |    1 +
+ ChangeLog		  | 10 ++++++++++
+ glib/poppler-page.cc	  |  2 +-
+ poppler/Gfx.cc		  |  2 ++
+ poppler/GfxFont.cc	  | 14 +++++++++++++-
+ poppler/GfxFont.h	  |  4 ++++
+ poppler/GfxState.cc	  |  7 +++++++
+ poppler/TextOutputDev.cc |  1 +
  7 files changed, 38 insertions(+), 2 deletions(-)
 
 commit 57af0207334ff1a407899370281ebb90fe953a32
@@ -41464,11 +44650,11 @@ Date:	Mon May 1 18:33:47 2006 +0000
 
     More things to make poppler-qt4Okular nearer
 
- ChangeLog		    |	 8 ++++++++
- qt4/src/poppler-page.cc    |	14 ++++++++++++++
- qt4/src/poppler-private.h  |	11 +++++++++++
- qt4/src/poppler-qt4.h	    |	 8 ++++++++
- qt4/src/poppler-textbox.cc |	23 ++++++++++++++++-------
+ ChangeLog		    |  8 ++++++++
+ qt4/src/poppler-page.cc    | 14 ++++++++++++++
+ qt4/src/poppler-private.h  | 11 +++++++++++
+ qt4/src/poppler-qt4.h	    |  8 ++++++++
+ qt4/src/poppler-textbox.cc | 23 ++++++++++++++++-------
  5 files changed, 57 insertions(+), 7 deletions(-)
 
 commit 61b126390f764fd38c79b6a64160a7dc7870bd4a
@@ -41477,9 +44663,8 @@ Date:	Mon May 1 13:41:14 2006 +0000
 
     revert thing that should not have gone in
 
- poppler/PageLabelInfo.cc |   43
- +++++++++++++++++++++++++++++++++++++++++++
- poppler/PageLabelInfo.h  |   44
+ poppler/PageLabelInfo.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
+ poppler/PageLabelInfo.h  | 44
  --------------------------------------------
  2 files changed, 43 insertions(+), 44 deletions(-)
 
@@ -41495,14 +44680,14 @@ Date:	Mon May 1 13:32:31 2006 +0000
 
     One step more to make oKular fully use the qt4 bindings
 
- ChangeLog		     |	  7 +++++++
- poppler/PageLabelInfo.cc    |	 43
- ------------------------------------------
- poppler/PageLabelInfo.h     |	 44
- +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-document.cc |	 10 ++++++++++
- qt4/src/poppler-private.h   |	 22 +++++++++++++++++-----
- qt4/src/poppler-qt4.h	     |	  6 ++++++
+ ChangeLog		     |	7 +++++++
+ poppler/PageLabelInfo.cc    | 43
+ -------------------------------------------
+ poppler/PageLabelInfo.h     | 44
+ ++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-document.cc | 10 ++++++++++
+ qt4/src/poppler-private.h   | 22 +++++++++++++++++-----
+ qt4/src/poppler-qt4.h	     |	6 ++++++
  6 files changed, 84 insertions(+), 48 deletions(-)
 
 commit 4147400e2b692df7f70c3772e8a4b576d4d85294
@@ -41511,8 +44696,8 @@ Date:	Sat Apr 29 15:23:41 2006 +0000
 
     Fix memory leak. Bug 6765
 
- ChangeLog		|    5 +++++
- poppler/JBIG2Stream.cc |    1 +
+ ChangeLog		| 5 +++++
+ poppler/JBIG2Stream.cc | 1 +
  2 files changed, 6 insertions(+)
 
 commit 960d60467d62d28f20b127d07e8de1af42eec568
@@ -41525,8 +44710,8 @@ Date:	Thu Apr 27 17:26:36 2006 +0000
 	functions fail. Fixes coverty reports #2106, #2107, #2077 and
 	bug #6764. Patch by Kjartan Maraas.
 
- ChangeLog		   |	6 ++++++
- poppler/CairoOutputDev.cc |   34 +++++++++++++++++++++++++---------
+ ChangeLog		   |  6 ++++++
+ poppler/CairoOutputDev.cc | 34 +++++++++++++++++++++++++---------
  2 files changed, 31 insertions(+), 9 deletions(-)
 
 commit 155112131c6e25bfde752cf5daa80a6c9712cfed
@@ -41536,8 +44721,8 @@ Date:	Sun Apr 23 15:50:52 2006 +0000
     qt4/src/poppler-private.h: Protect us against a link not having
 	    a destination or a namedDestination
 
- ChangeLog		   |	5 +++++
- qt4/src/poppler-private.h |	2 +-
+ ChangeLog		   | 5 +++++
+ qt4/src/poppler-private.h | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit c902a3a22bcceedc8ee8ca377064efcc8a9178ca
@@ -41548,7 +44733,7 @@ Date:	Fri Apr 21 12:02:19 2006 +0000
 
     CCMAIL: montel@kde.org
 
- m4/qt.m4 |    4 ++--
+ m4/qt.m4 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 18f8e1f1d213dbcda27cd0ec429273801f65e208
@@ -41558,8 +44743,8 @@ Date:	Tue Apr 18 19:11:56 2006 +0000
     * goo/GooVector.h: Fix typo that was preventing build with MSVC8
 	    Discovered by Reece Dunn <msclrhd@hotmail.com>
 
- ChangeLog	 |    5 +++++
- goo/GooVector.h |    4 ++--
+ ChangeLog	 | 5 +++++
+ goo/GooVector.h | 4 ++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit cbbb28a5959343d20dffe945ea83272c0b2e287b
@@ -41578,16 +44763,16 @@ Date:	Sun Apr 16 22:59:44 2006 +0000
 	* glib/poppler-document.h:
 	Allow to find named destinations in document.
 
- ChangeLog				   |   12 +++
- glib/poppler-action.cc			   |  152
- ++++++++++++++++++++++++-----
- glib/poppler-action.h			   |	7 +-
- glib/poppler-document.cc		   |   37 +++++++
- glib/poppler-document.h		   |	4 +-
- glib/poppler-private.h			   |	2 +
- glib/poppler.h				   |	1 +
- glib/reference/tmpl/poppler-action.sgml   |	2 +
- glib/reference/tmpl/poppler-document.sgml |	4 -
+ ChangeLog				   |  12 +++
+ glib/poppler-action.cc			   | 152
+ +++++++++++++++++++++++++-----
+ glib/poppler-action.h			   |   7 +-
+ glib/poppler-document.cc		   |  37 ++++++++
+ glib/poppler-document.h		   |   4 +-
+ glib/poppler-private.h			   |   2 +
+ glib/poppler.h				   |   1 +
+ glib/reference/tmpl/poppler-action.sgml   |   2 +
+ glib/reference/tmpl/poppler-document.sgml |   4 -
  9 files changed, 189 insertions(+), 32 deletions(-)
 
 commit 85687a1e0e4c6be2dbfb23ba00018b9c7c7454f5
@@ -41604,10 +44789,10 @@ Date:	Wed Apr 12 06:52:07 2006 +0000
 	committing this, but the results were so pretty I couldn't resist.
 	Fixes #6174.
 
- ChangeLog		   |	8 +++
- poppler/CairoOutputDev.cc |  118
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |	8 +++
+ ChangeLog		   |   8 ++++
+ poppler/CairoOutputDev.cc | 118
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  |   8 ++++
  3 files changed, 134 insertions(+)
 
 commit 6039d4fc65cb25bef20efa29bc29d42086fc0854
@@ -41619,8 +44804,8 @@ Date:	Wed Apr 12 05:46:44 2006 +0000
 	* poppler/CairoOutputDev.cc: Fix breakage by krh by only calling
 	cairo_destroy on non-null.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	4 +++-
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 4 +++-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit d839a0bd78361930e5e2fe889df12e1e853ffed3
@@ -41650,20 +44835,20 @@ Date:	Wed Apr 12 02:07:07 2006 +0000
 	* utils/Makefile.am (EXTRA_DIST): Fix warning where this was
 	assigned twice.
 
- ChangeLog		    |	23 ++++
- configure.ac		    |	 8 ++
- glib/Makefile.am	    |	10 +-
- glib/poppler-features.h.in |	24 ++++
- glib/poppler-page.cc	    |	63 +++++++---
- glib/poppler-page.h	    |	10 ++
- glib/poppler.h		    |	 1 +
- poppler-glib.pc.in	    |	 2 +-
- poppler/CairoOutputDev.cc  |	23 ++--
- poppler/CairoOutputDev.h   |	 6 +-
- test/Makefile.am	    |	 4 +-
- test/gtk-cairo-test.cc     |  286
- +++++++++++++-------------------------------
- utils/Makefile.am	    |	 6 +-
+ ChangeLog		    |  23 ++++
+ configure.ac		    |	8 ++
+ glib/Makefile.am	    |  10 +-
+ glib/poppler-features.h.in |  24 ++++
+ glib/poppler-page.cc	    |  63 +++++++---
+ glib/poppler-page.h	    |  10 ++
+ glib/poppler.h		    |	1 +
+ poppler-glib.pc.in	    |	2 +-
+ poppler/CairoOutputDev.cc  |  23 ++--
+ poppler/CairoOutputDev.h   |	6 +-
+ test/Makefile.am	    |	4 +-
+ test/gtk-cairo-test.cc     | 286
+ ++++++++++++++-------------------------------
+ utils/Makefile.am	    |	6 +-
  13 files changed, 221 insertions(+), 245 deletions(-)
 
 commit b198c9801c668014c0979c57033a0637e7e046e2
@@ -41676,8 +44861,8 @@ Date:	Mon Apr 10 18:12:44 2006 +0000
 	account in
 	drawChar() to draw vertical text properly. Fixes #6551.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	2 +-
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit fd251f52efc7748fda91cc77fb9d3966e0f02ac8
@@ -41687,8 +44872,8 @@ Date:	Sun Apr 9 11:05:51 2006 +0000
     m4/qt.m4: Improve for systems that need -pthread to be linked when
     linking Qt. Patch by Diego Pettenò
 
- ChangeLog |	5 +++++
- m4/qt.m4  |   28 +++++++++++++++++++++++++++-
+ ChangeLog |  5 +++++
+ m4/qt.m4  | 28 +++++++++++++++++++++++++++-
  2 files changed, 32 insertions(+), 1 deletion(-)
 
 commit 36de9747153a2ea9b3cf86c41e75a521441a2e06
@@ -41700,9 +44885,9 @@ Date:	Sat Apr 8 10:44:43 2006 +0000
     Qt4 frontend
       Patch by Stefan Schweizer
 
- ChangeLog	     |	  6 ++++++
- poppler/Makefile.am |	 11 +++++------
- qt4/src/Makefile.am |	  1 +
+ ChangeLog	     |	6 ++++++
+ poppler/Makefile.am | 11 +++++------
+ qt4/src/Makefile.am |	1 +
  3 files changed, 12 insertions(+), 6 deletions(-)
 
 commit bf7afe161d76c50fd1c480eb236607145782e59d
@@ -41712,8 +44897,8 @@ Date:	Wed Apr 5 18:20:56 2006 +0000
     poppler/JBIG2Stream.cc: Fix for some buggy JBIG2 documents, patch
     by Raj Kumar and Paul Walmsley. Fixes bug 6500
 
- ChangeLog		|    5 +++++
- poppler/JBIG2Stream.cc |   43 +++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog		|  5 +++++
+ poppler/JBIG2Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 48 insertions(+)
 
 commit 315f8e488d3db848f88a06c7568b6583bbf0e432
@@ -41726,8 +44911,8 @@ Date:	Wed Apr 5 17:20:56 2006 +0000
 	softmask.
 	fixes #6492.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |   11 ++++++++++-
+ ChangeLog		   |  5 +++++
+ poppler/CairoOutputDev.cc | 11 ++++++++++-
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 0d311518f678a479c1efeaec15011e0a34de80fc
@@ -41747,12 +44932,12 @@ Date:	Tue Apr 4 21:01:01 2006 +0000
     I'll leave adapting the glib frontend for you guys, i tried to adapt
     it but i got lost at gdk_pixbuf_get_n_channels (pixbuf);
 
- ChangeLog		 |    9 ++++++
- qt/poppler-page.cc	 |   18 ++++-------
- qt4/src/poppler-page.cc |   15 ++++-----
- splash/Splash.cc	 |   81
- ++++++++++++++++++++++++-----------------------
- splash/SplashBitmap.cc  |   10 +++---
+ ChangeLog		 |  9 ++++++
+ qt/poppler-page.cc	 | 18 ++++-------
+ qt4/src/poppler-page.cc | 15 ++++-----
+ splash/Splash.cc	 | 81
+ +++++++++++++++++++++++++------------------------
+ splash/SplashBitmap.cc  | 10 +++---
  5 files changed, 67 insertions(+), 66 deletions(-)
 
 commit 888bd41b42507f0a1af55c55495d31d802ce7706
@@ -41761,8 +44946,8 @@ Date:	Tue Apr 4 20:42:08 2006 +0000
 
     Fix crash when using fixedpoint math. Patch by Frank Meerkoetter
 
- ChangeLog		|    5 +++++
- splash/SplashFTFont.cc |    2 +-
+ ChangeLog		| 5 +++++
+ splash/SplashFTFont.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 56c98450160b639790931226a045ce4712e7d45e
@@ -41771,15 +44956,15 @@ Date:	Sun Apr 2 18:07:59 2006 +0000
 
     Improvements to the Qt4 frontend, comments welcome
 
- ChangeLog		     |	  7 +++
- m4/qt.m4		     |	  4 +-
- qt4/src/Makefile.am	     |	  1 +
- qt4/src/poppler-document.cc |	 85 ++++++++++++++++++++------
- qt4/src/poppler-link.cc     |	138
- +++++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc     |	  9 ++-
- qt4/src/poppler-private.h   |	 95 ++++++++++++++++++++++++++++-
- qt4/src/poppler-qt4.h	     |	 86 ++++++++++++++++++++++++---
+ ChangeLog		     |	 7 +++
+ m4/qt.m4		     |	 4 +-
+ qt4/src/Makefile.am	     |	 1 +
+ qt4/src/poppler-document.cc |	85 +++++++++++++++++++++------
+ qt4/src/poppler-link.cc     | 138
+ ++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc     |	 9 ++-
+ qt4/src/poppler-private.h   |	95 +++++++++++++++++++++++++++++-
+ qt4/src/poppler-qt4.h	     |	86 ++++++++++++++++++++++++---
  8 files changed, 395 insertions(+), 30 deletions(-)
 
 commit c80ebf237e9c6232a1d0567a2688a294acfd481b
@@ -41788,8 +44973,8 @@ Date:	Sat Apr 1 11:25:57 2006 +0000
 
     Fix bug 6454
 
- ChangeLog	 |    5 +++++
- poppler/XRef.cc |   22 +++++++++++++---------
+ ChangeLog	 |  5 +++++
+ poppler/XRef.cc | 22 +++++++++++++---------
  2 files changed, 18 insertions(+), 9 deletions(-)
 
 commit fe8142fbc12127682b8024673fe1af57b47bb5c9
@@ -41803,8 +44988,8 @@ Date:	Tue Mar 21 04:25:53 2006 +0000
 	make code cleaner. Combined with the memleak fix closes #6187.
 	Patch by chpe.
 
- ChangeLog	      |    6 ++++++
- glib/poppler-page.cc |    5 +----
+ ChangeLog	      | 6 ++++++
+ glib/poppler-page.cc | 5 +----
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 commit 4f961df2e6e91a0dc0a024ae5acdefa394179a05
@@ -41816,8 +45001,8 @@ Date:	Tue Mar 21 04:19:18 2006 +0000
 	* glib/poppler-page.cc: Fix memory leak in poppler_page_get_text
 	Patch by chpe.
 
- ChangeLog	      |    5 +++++
- glib/poppler-page.cc |    2 +-
+ ChangeLog	      | 5 +++++
+ glib/poppler-page.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit ff4febab0a519732972c21bf76d7693c98265e0f
@@ -41826,9 +45011,9 @@ Date:	Mon Mar 20 20:07:36 2006 +0000
 
     Use UGooString for dates, fixes KDE bug 123938
 
- ChangeLog		     |	  6 ++++++
- qt/poppler-document.cc      |	  2 +-
- qt4/src/poppler-document.cc |	  2 +-
+ ChangeLog		     | 6 ++++++
+ qt/poppler-document.cc      | 2 +-
+ qt4/src/poppler-document.cc | 2 +-
  3 files changed, 8 insertions(+), 2 deletions(-)
 
 commit 75ac6de8cd651b1cbe2d6a7ffa4574097088041f
@@ -41842,8 +45027,8 @@ Date:	Mon Mar 20 19:12:29 2006 +0000
 	* glib/poppler-document.cc: Fix memory leak in
 	poppler_font_info_free
 
- ChangeLog		  |    6 ++++++
- glib/poppler-document.cc |    2 +-
+ ChangeLog		  | 6 ++++++
+ glib/poppler-document.cc | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 784f6d9a0888dab34c586ffe14db8e55b8a11f51
@@ -41854,8 +45039,8 @@ Date:	Mon Mar 20 19:02:10 2006 +0000
 
 	* poppler/CairoFontEngine.h: remove unused variables
 
- ChangeLog		   |	4 ++++
- poppler/CairoFontEngine.h |	1 -
+ ChangeLog		   | 4 ++++
+ poppler/CairoFontEngine.h | 1 -
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit 847436779d7c82b428acfd6339130228bfadca24
@@ -41864,7 +45049,7 @@ Date:	Sun Mar 19 19:19:42 2006 +0000
 
     fix date
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 401bae69cc7ade676cacd89b483f0a93a653c7a1
@@ -41873,9 +45058,9 @@ Date:	Sun Mar 19 17:01:05 2006 +0000
 
     fix htmloutputdev
 
- ChangeLog		|    4 ++++
- utils/HtmlOutputDev.cc |    2 +-
- utils/HtmlOutputDev.h	|    2 +-
+ ChangeLog		| 4 ++++
+ utils/HtmlOutputDev.cc | 2 +-
+ utils/HtmlOutputDev.h	| 2 +-
  3 files changed, 6 insertions(+), 2 deletions(-)
 
 commit d56330e688c0a40b4e206ed3bbddd06d7f3ee66c
@@ -41890,8 +45075,8 @@ Date:	Thu Mar 16 22:04:56 2006 +0000
 
     Might be worth backporting to the stable branch
 
- ChangeLog	 |    8 +++++++-
- poppler/Page.cc |    2 --
+ ChangeLog	 | 8 +++++++-
+ poppler/Page.cc | 2 --
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 7ed6737b00ece7ca00cee1d148752b11700370e6
@@ -41900,8 +45085,8 @@ Date:	Thu Mar 16 19:21:11 2006 +0000
 
     poppler/FontInfo.cc: Embedded fonts don't have a font file
 
- ChangeLog	     |	  4 ++++
- poppler/FontInfo.cc |	 20 ++++++++++++--------
+ ChangeLog	     |	4 ++++
+ poppler/FontInfo.cc | 20 ++++++++++++--------
  2 files changed, 16 insertions(+), 8 deletions(-)
 
 commit a34688ee29e1cdfcbaca232cf005af55af87f796
@@ -41911,8 +45096,8 @@ Date:	Tue Mar 14 19:34:10 2006 +0000
     * qt4/src/poppler-qt4.h: Fix compilation with gcc4.1, patch by
     Michael Olbrich
 
- ChangeLog	       |    5 +++++
- qt4/src/poppler-qt4.h |   10 +++++-----
+ ChangeLog	       |  5 +++++
+ qt4/src/poppler-qt4.h | 10 +++++-----
  2 files changed, 10 insertions(+), 5 deletions(-)
 
 commit 1a90b3aaf6be4ca3ebb47e904842b1e14a0e8dfc
@@ -41932,14 +45117,14 @@ Date:	Sat Mar 11 15:19:02 2006 +0000
 
     May be interesting to have in the other frontends
 
- ChangeLog		     |	 13 +++++++++++++
- poppler/FontInfo.cc	     |	 10 ++++++++++
- poppler/FontInfo.h	     |	  2 ++
- qt4/src/poppler-document.cc |	 14 +-------------
- qt4/src/poppler-fontinfo.cc |	 29 +++++++++--------------------
- qt4/src/poppler-private.h   |	 29 +++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h	     |	  8 ++++++--
- qt4/tests/poppler-fonts.cpp |	  5 +++--
+ ChangeLog		     | 13 +++++++++++++
+ poppler/FontInfo.cc	     | 10 ++++++++++
+ poppler/FontInfo.h	     |	2 ++
+ qt4/src/poppler-document.cc | 14 +-------------
+ qt4/src/poppler-fontinfo.cc | 29 +++++++++--------------------
+ qt4/src/poppler-private.h   | 29 +++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	     |	8 ++++++--
+ qt4/tests/poppler-fonts.cpp |	5 +++--
  8 files changed, 73 insertions(+), 37 deletions(-)
 
 commit 22b1618185ec70895ec644d9e590c266ff98c9db
@@ -41948,8 +45133,8 @@ Date:	Thu Mar 9 21:56:07 2006 +0000
 
     Build with cairo disabled, patch by Eduardo de Barros Lima
 
- ChangeLog	  |    5 +++++
- glib/Makefile.am |    2 +-
+ ChangeLog	  | 5 +++++
+ glib/Makefile.am | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 50ecfadab36a9769b09e4c2c1670d86448a0e1ee
@@ -41968,15 +45153,15 @@ Date:	Tue Feb 28 23:24:59 2006 +0000
 	    * poppler/Makefile.am: Move cairo link dependency to glib
 	    bindings.
 
- ChangeLog		 |   11 +++++++++++
- NEWS			 |   10 ++++++++++
- configure.ac		 |    2 +-
- glib/Makefile.am	 |   11 ++++++-----
- poppler/Makefile.am	 |   19 ++++++++-----------
- poppler/TextOutputDev.h |    7 +++++--
- qt/Makefile.am		 |    1 +
- test/Makefile.am	 |   16 +++++++++-------
- utils/Makefile.am	 |   29 +++++++++++++++++------------
+ ChangeLog		 | 11 +++++++++++
+ NEWS			 | 10 ++++++++++
+ configure.ac		 |  2 +-
+ glib/Makefile.am	 | 11 ++++++-----
+ poppler/Makefile.am	 | 19 ++++++++-----------
+ poppler/TextOutputDev.h |  7 +++++--
+ qt/Makefile.am		 |  1 +
+ test/Makefile.am	 | 16 +++++++++-------
+ utils/Makefile.am	 | 29 +++++++++++++++++------------
  9 files changed, 68 insertions(+), 38 deletions(-)
 
 commit b9e951ac68b9977ab7217ad0346bcf46a3fa3dfe
@@ -41993,11 +45178,11 @@ Date:	Tue Feb 28 19:59:58 2006 +0000
 
 	    More integer overflow fixes from Derek Noonburg (#5922).
 
- ChangeLog		|   10 ++++++++++
- goo/gmem.c		|    9 +++++----
- poppler/JBIG2Stream.cc |   12 ++++++++++--
- poppler/Stream.cc	|    7 +++++++
- poppler/Stream.h	|    2 +-
+ ChangeLog		| 10 ++++++++++
+ goo/gmem.c		|  9 +++++----
+ poppler/JBIG2Stream.cc | 12 ++++++++++--
+ poppler/Stream.cc	|  7 +++++++
+ poppler/Stream.h	|  2 +-
  5 files changed, 33 insertions(+), 7 deletions(-)
 
 commit 46db73a142d65a0c944910388d5971debc06ecbf
@@ -42009,8 +45194,8 @@ Date:	Tue Feb 28 18:31:59 2006 +0000
 	    * poppler/PSOutputDev.cc: Make PSOutputDev constructor respect
 	    passed in paper size (#5946, #5749).
 
- ChangeLog		|    5 +++++
- poppler/PSOutputDev.cc |   14 ++++++++------
+ ChangeLog		|  5 +++++
+ poppler/PSOutputDev.cc | 14 ++++++++------
  2 files changed, 13 insertions(+), 6 deletions(-)
 
 commit 0f7f2182b2abe965b382937f5569b65a8828fc93
@@ -42033,19 +45218,18 @@ Date:	Tue Feb 28 18:25:00 2006 +0000
 	    a ucs2
 	    marker, append the number part of the label as ucs2 (#5952).
 
- ChangeLog				 |   14 +++
- glib/poppler-document.cc		 |   52 +++++------
- glib/poppler-page.cc			 |   23 +++--
- glib/poppler-private.h			 |    3 +
- glib/reference/tmpl/poppler-enums.sgml  |  150
- -------------------------------
- glib/reference/tmpl/poppler-unused.sgml |  130
- +++++++++++++++++++++++++++
- glib/test-poppler-glib.c		 |    2 +-
- goo/GooString.cc			 |    5 ++
- goo/GooString.h			 |    4 +
- poppler/PageLabelInfo.cc		 |   39 +++++---
- poppler/PageLabelInfo.h		 |    2 +-
+ ChangeLog				 |  14 +++
+ glib/poppler-document.cc		 |  52 +++++------
+ glib/poppler-page.cc			 |  23 +++--
+ glib/poppler-private.h			 |   3 +
+ glib/reference/tmpl/poppler-enums.sgml  | 150
+ --------------------------------
+ glib/reference/tmpl/poppler-unused.sgml | 130 +++++++++++++++++++++++++++
+ glib/test-poppler-glib.c		 |   2 +-
+ goo/GooString.cc			 |   5 ++
+ goo/GooString.h			 |   4 +
+ poppler/PageLabelInfo.cc		 |  39 ++++++---
+ poppler/PageLabelInfo.h		 |   2 +-
  11 files changed, 228 insertions(+), 196 deletions(-)
 
 commit 1bf83cdc8b75e1c76956ae643ee273e0b558fd08
@@ -42054,8 +45238,8 @@ Date:	Sat Feb 25 12:30:30 2006 +0000
 
     fix warning
 
- ChangeLog	   |	4 ++++
- poppler/Object.cc |	3 ++-
+ ChangeLog	   | 4 ++++
+ poppler/Object.cc | 3 ++-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit eb5642f396c8772c83b2cf27da437413b692c952
@@ -42064,8 +45248,8 @@ Date:	Thu Feb 23 22:26:05 2006 +0000
 
     Don't build pdftoppm when splashoutput is disabled as it does not link
 
- ChangeLog	   |	5 +++++
- utils/Makefile.am |   13 +++++++++++--
+ ChangeLog	   |  5 +++++
+ utils/Makefile.am | 13 +++++++++++--
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 commit 7c5c1361045429a429a6f40d936f8c7c01fe0d07
@@ -42080,12 +45264,12 @@ Date:	Sat Feb 18 20:17:00 2006 +0000
 	* poppler/GfxState.h: Add support for drawSoftMaskedImage to
 	CairoOutputDev. Ugly but works.
 
- ChangeLog		   |	8 ++++
- poppler/CairoOutputDev.cc |  101
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/CairoOutputDev.h  |	6 +++
- poppler/GfxState.cc	   |   50 ++++++++++++++++++++++
- poppler/GfxState.h	   |	2 +
+ ChangeLog		   |   8 ++++
+ poppler/CairoOutputDev.cc | 101
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/CairoOutputDev.h  |   6 +++
+ poppler/GfxState.cc	   |  50 +++++++++++++++++++++++
+ poppler/GfxState.h	   |   2 +
  5 files changed, 167 insertions(+)
 
 commit dcb748f68112bd5f99fea8a3da06666be6cff0c5
@@ -42097,8 +45281,8 @@ Date:	Thu Feb 16 19:41:17 2006 +0000
 	* poppler/CairoOutputDev.cc: Work around cairo bug when scaling
 	1x1 bitmaps. Fixes #3387. Also gives a performance improvement.
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |   33 ++++++++++++++++++++++++---------
+ ChangeLog		   |  5 +++++
+ poppler/CairoOutputDev.cc | 33 ++++++++++++++++++++++++---------
  2 files changed, 29 insertions(+), 9 deletions(-)
 
 commit ef1070f6ca2d1e74c5f94728f3aaae22f0990c17
@@ -42107,11 +45291,11 @@ Date:	Thu Feb 16 19:28:54 2006 +0000
 
     Update soname
 
- ChangeLog	     |	  8 ++++++++
- glib/Makefile.am    |	  2 ++
- poppler/Makefile.am |	  2 ++
- qt/Makefile.am      |	  2 ++
- qt4/src/Makefile.am |	  2 ++
+ ChangeLog	     | 8 ++++++++
+ glib/Makefile.am    | 2 ++
+ poppler/Makefile.am | 2 ++
+ qt/Makefile.am      | 2 ++
+ qt4/src/Makefile.am | 2 ++
  5 files changed, 16 insertions(+)
 
 commit 24b9f5c33fb00ff80a79b34444282a57288f636c
@@ -42121,9 +45305,9 @@ Date:	Mon Feb 13 23:04:54 2006 +0000
     * poppler/ArthurOutputDev.cc: Make it compile after changing code
     so we did not pass files to freetype but buffers
 
- ChangeLog		    |	 5 +++++
- poppler/ArthurOutputDev.cc |	53
- ++++++++++++++++----------------------------
+ ChangeLog		    |  5 +++++
+ poppler/ArthurOutputDev.cc | 53
+ +++++++++++++++++-----------------------------
  2 files changed, 24 insertions(+), 34 deletions(-)
 
 commit 0bda90310b267d3a4963096293eb2bd29b120768
@@ -42133,10 +45317,10 @@ Date:	Mon Feb 13 22:38:44 2006 +0000
     Probably the last of inner patches missing from kpdf
     Everybody will we happy now, kpdf has been finally assimilated
 
- ChangeLog		|    5 ++
- poppler/PSOutputDev.cc |  124
- ++++++++++++++++++++++++++++++++++++++++++++----
- poppler/PSOutputDev.h	|    4 +-
+ ChangeLog		|   5 ++
+ poppler/PSOutputDev.cc | 124
+ +++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/PSOutputDev.h	|   4 +-
  3 files changed, 123 insertions(+), 10 deletions(-)
 
 commit cf9867fbbee2468a955b5845016585eeedf2debe
@@ -42145,11 +45329,11 @@ Date:	Mon Feb 6 20:49:21 2006 +0000
 
     Various fixes from Frank Meerkötter to enable fixedpoint arithmetic
 
- ChangeLog	      |    8 ++++++++
- configure.ac	      |    2 +-
- goo/FixedPoint.h     |    2 +-
- splash/Splash.cc     |    4 ++--
- splash/SplashTypes.h |    2 +-
+ ChangeLog	      | 8 ++++++++
+ configure.ac	      | 2 +-
+ goo/FixedPoint.h     | 2 +-
+ splash/Splash.cc     | 4 ++--
+ splash/SplashTypes.h | 2 +-
  5 files changed, 13 insertions(+), 5 deletions(-)
 
 commit f04e2c4f20f821ff8cb9465a715ccbb22091d449
@@ -42158,9 +45342,9 @@ Date:	Mon Feb 6 18:50:10 2006 +0000
 
     Jeff Muizelaar's improvements to my yesterday's small patches
 
- ChangeLog		|    6 ++++++
- poppler/Annot.cc	|    9 ++++-----
- poppler/JBIG2Stream.cc |    2 +-
+ ChangeLog		| 6 ++++++
+ poppler/Annot.cc	| 9 ++++-----
+ poppler/JBIG2Stream.cc | 2 +-
  3 files changed, 11 insertions(+), 6 deletions(-)
 
 commit 33e98f81cdfda0935ac7ea79a691976465ec790b
@@ -42169,11 +45353,11 @@ Date:	Sun Feb 5 15:46:10 2006 +0000
 
     Some small fixes from kpdf
 
- ChangeLog		    |	 8 ++++++++
- poppler/Gfx.cc		    |	 1 +
- poppler/GfxFont.cc	    |	 1 +
- poppler/JBIG2Stream.cc     |	 2 +-
- poppler/SplashOutputDev.cc |	 1 -
+ ChangeLog		    | 8 ++++++++
+ poppler/Gfx.cc		    | 1 +
+ poppler/GfxFont.cc	    | 1 +
+ poppler/JBIG2Stream.cc     | 2 +-
+ poppler/SplashOutputDev.cc | 1 -
  5 files changed, 11 insertions(+), 2 deletions(-)
 
 commit 6d9e6489d24b3105204ff4233f6493136e9b5715
@@ -42188,10 +45372,10 @@ Date:	Sat Feb 4 21:10:41 2006 +0000
 	operators.
 	Patch by Thorkild Stray.
 
- ChangeLog	      |    8 ++++++++
- poppler/Gfx.cc       |   14 ++++++++++++++
- poppler/OutputDev.cc |   16 ++++++++++++++++
- poppler/OutputDev.h  |   10 ++++++++++
+ ChangeLog	      |  8 ++++++++
+ poppler/Gfx.cc       | 14 ++++++++++++++
+ poppler/OutputDev.cc | 16 ++++++++++++++++
+ poppler/OutputDev.h  | 10 ++++++++++
  4 files changed, 48 insertions(+)
 
 commit b4e34d905cd0ca5815a450de35b4c2774f4887c9
@@ -42204,9 +45388,9 @@ Date:	Sat Feb 4 20:48:25 2006 +0000
 	Discard the ones that are not truetype or type1. Fixes #5758.
 	Patch by Ed Catmur.
 
- ChangeLog		 |    6 ++++++
- poppler/GlobalParams.cc |   51
- ++++++++++++++++++++++++++---------------------
+ ChangeLog		 |  6 ++++++
+ poppler/GlobalParams.cc | 51
+ +++++++++++++++++++++++++++----------------------
  2 files changed, 34 insertions(+), 23 deletions(-)
 
 commit fd85a0afdd7b4cafc68df400d4f94fccaea18c76
@@ -42216,8 +45400,8 @@ Date:	Sat Feb 4 20:34:13 2006 +0000
     Remove bug from "do not use an external file to pass fonts to
     Freetype" patch, patch by Stefan Schweizer
 
- ChangeLog		    |	 3 +++
- poppler/SplashOutputDev.cc |	14 ++++++++++----
+ ChangeLog		    |  3 +++
+ poppler/SplashOutputDev.cc | 14 ++++++++++----
  2 files changed, 13 insertions(+), 4 deletions(-)
 
 commit 67ca9d01f8badcf542f60b23521c384c9840ca1b
@@ -42226,9 +45410,9 @@ Date:	Sat Feb 4 20:31:00 2006 +0000
 
     Added a DTD of the xml pdftohtml creates patch by Stefan Schweizer
 
- ChangeLog	   |	2 ++
- utils/Makefile.am |	2 ++
- utils/pdf2xml.dtd |   28 ++++++++++++++++++++++++++++
+ ChangeLog	   |  2 ++
+ utils/Makefile.am |  2 ++
+ utils/pdf2xml.dtd | 28 ++++++++++++++++++++++++++++
  3 files changed, 32 insertions(+)
 
 commit f4df23ca7f396883a906f16dfc8db1ebd528e04a
@@ -42237,7 +45421,7 @@ Date:	Sat Feb 4 20:24:03 2006 +0000
 
     ignore++
 
- utils/.cvsignore |    1 +
+ utils/.cvsignore | 1 +
  1 file changed, 1 insertion(+)
 
 commit 93ad488679f594e45547a67e2a7397f4c8bd2820
@@ -42246,9 +45430,9 @@ Date:	Sat Feb 4 20:07:07 2006 +0000
 
     Actually create pdftoppm patch by Stefan Schweizer
 
- ChangeLog	   |   44 +++++++++++++++++++++++++-------------------
- utils/Makefile.am |   10 ++++++++--
- utils/pdftoppm.cc |	9 +++++----
+ ChangeLog	   | 44 +++++++++++++++++++++++++-------------------
+ utils/Makefile.am | 10 ++++++++--
+ utils/pdftoppm.cc |  9 +++++----
  3 files changed, 38 insertions(+), 25 deletions(-)
 
 commit 7d2be955e6345a052590b06b29a6d2fb2111e2e6
@@ -42257,8 +45441,8 @@ Date:	Thu Feb 2 23:06:20 2006 +0000
 
     CVE-2006-0301 fix by Derek though KDE security team
 
- ChangeLog		      |    5 +++++
- splash/SplashXPathScanner.cc |   32 ++++++++++++++++++++------------
+ ChangeLog		      |  5 +++++
+ splash/SplashXPathScanner.cc | 32 ++++++++++++++++++++------------
  2 files changed, 25 insertions(+), 12 deletions(-)
 
 commit c191e7d0f13ea429017e4d4f79ce803e84c72e40
@@ -42267,7 +45451,7 @@ Date:	Thu Feb 2 22:54:27 2006 +0000
 
     i should learn on which day i live
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1ddeed60d07c3a7e011f3f594fa9299379d0b000
@@ -42276,28 +45460,28 @@ Date:	Thu Feb 2 22:50:01 2006 +0000
 
     don't use files to pass fonts to freetype
 
- ChangeLog		      |   26 ++++++++++++
- fofi/FoFiTrueType.cc	      |   43 +++++++++++++++----
- fofi/FoFiTrueType.h	      |    7 ++--
- fofi/FoFiType1C.h	      |    2 +-
- goo/gfile.cc		      |    8 ++++
- poppler/GfxFont.cc	      |   49 +++++++++++++++++++++-
- poppler/GfxFont.h	      |    2 +
- poppler/GlobalParams.cc      |    1 +
- poppler/GlobalParams.h       |    1 +
- poppler/SplashOutputDev.cc   |   94
- +++++++++++++++++++++---------------------
- splash/SplashFTFontEngine.cc |   44 +++++++++++++-------
- splash/SplashFTFontEngine.h  |   16 ++++---
- splash/SplashFTFontFile.cc   |   47 +++++++++++++--------
- splash/SplashFTFontFile.h    |   18 ++++----
- splash/SplashFontEngine.cc   |   46 ++++++++-------------
- splash/SplashFontEngine.h    |   16 ++++---
- splash/SplashFontFile.cc     |   70 +++++++++++++++++++++++++++----
- splash/SplashFontFile.h      |   25 +++++++++--
- splash/SplashT1FontEngine.cc |   29 +++++++------
- splash/SplashT1FontFile.cc   |   30 +++++++++++---
- splash/SplashT1FontFile.h    |    4 +-
+ ChangeLog		      | 26 ++++++++++++
+ fofi/FoFiTrueType.cc	      | 43 ++++++++++++++++----
+ fofi/FoFiTrueType.h	      |  7 ++--
+ fofi/FoFiType1C.h	      |  2 +-
+ goo/gfile.cc		      |  8 ++++
+ poppler/GfxFont.cc	      | 49 ++++++++++++++++++++++-
+ poppler/GfxFont.h	      |  2 +
+ poppler/GlobalParams.cc      |  1 +
+ poppler/GlobalParams.h       |  1 +
+ poppler/SplashOutputDev.cc   | 94
+ ++++++++++++++++++++++----------------------
+ splash/SplashFTFontEngine.cc | 44 +++++++++++++--------
+ splash/SplashFTFontEngine.h  | 16 ++++----
+ splash/SplashFTFontFile.cc   | 47 +++++++++++++---------
+ splash/SplashFTFontFile.h    | 18 ++++-----
+ splash/SplashFontEngine.cc   | 46 +++++++++-------------
+ splash/SplashFontEngine.h    | 16 ++++----
+ splash/SplashFontFile.cc     | 70 +++++++++++++++++++++++++++++----
+ splash/SplashFontFile.h      | 25 ++++++++++--
+ splash/SplashT1FontEngine.cc | 29 +++++++-------
+ splash/SplashT1FontFile.cc   | 30 +++++++++++---
+ splash/SplashT1FontFile.h    |  4 +-
  21 files changed, 396 insertions(+), 182 deletions(-)
 
 commit 34df4cfa5cd8788ccf2ea698cbedd05b209041f5
@@ -42309,8 +45493,8 @@ Date:	Wed Feb 1 03:52:12 2006 +0000
 	* poppler/GlobalParams.cc (GlobalParams::getDisplayFont):
 	Allow ttc fonts to be used.
 
- ChangeLog		 |    5 +++++
- poppler/GlobalParams.cc |    2 +-
+ ChangeLog		 | 5 +++++
+ poppler/GlobalParams.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 0184e7c928ec60c0aa3f8634d96ae0cf0ad6d157
@@ -42323,8 +45507,8 @@ Date:	Sun Jan 29 05:16:31 2006 +0000
 	include.
 	Acked-by: Jonathan Blanford <jrb@redhat.com>
 
- ChangeLog		   |	5 +++++
- glib/poppler-attachment.h |	1 +
+ ChangeLog		   | 5 +++++
+ glib/poppler-attachment.h | 1 +
  2 files changed, 6 insertions(+)
 
 commit c805e25f2f074640e4345f8b71eef8d7de677109
@@ -42337,8 +45521,8 @@ Date:	Thu Jan 26 19:25:07 2006 +0000
 	    handle
 	    0-width lines (#5545).
 
- ChangeLog		   |	5 +++++
- poppler/CairoOutputDev.cc |	6 +++++-
+ ChangeLog		   | 5 +++++
+ poppler/CairoOutputDev.cc | 6 +++++-
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit 4f48abcd4c21460d4c5b718a7ba18cdceb30c2d1
@@ -42363,19 +45547,19 @@ Date:	Tue Jan 24 06:21:39 2006 +0000
 	    ctime yet,
 	    but the rest works.
 
- ChangeLog				 |   16 +++
- glib/Makefile.am			 |    2 +
- glib/poppler-attachment.cc		 |  223
- +++++++++++++++++++++++++++++++
- glib/poppler-attachment.h		 |   67 ++++++++++
- glib/poppler-document.cc		 |   63 +++++++++
- glib/poppler-document.h		 |    6 +
- glib/poppler-page.cc			 |    2 +-
- glib/poppler-private.h			 |    6 +-
- glib/poppler.h				 |    1 +
- glib/reference/tmpl/poppler-enums.sgml  |  150 +++++++++++++++++++++
- glib/reference/tmpl/poppler-unused.sgml |  130 ------------------
- glib/test-poppler-glib.c		 |   26 +++-
+ ChangeLog				 |  16 +++
+ glib/Makefile.am			 |   2 +
+ glib/poppler-attachment.cc		 | 223
+ ++++++++++++++++++++++++++++++++
+ glib/poppler-attachment.h		 |  67 ++++++++++
+ glib/poppler-document.cc		 |  63 +++++++++
+ glib/poppler-document.h		 |   6 +
+ glib/poppler-page.cc			 |   2 +-
+ glib/poppler-private.h			 |   6 +-
+ glib/poppler.h				 |   1 +
+ glib/reference/tmpl/poppler-enums.sgml  | 150 +++++++++++++++++++++
+ glib/reference/tmpl/poppler-unused.sgml | 130 -------------------
+ glib/test-poppler-glib.c		 |  26 +++-
  12 files changed, 559 insertions(+), 133 deletions(-)
 
 commit 052bf4b80c8a0dc45f6222617bfd8ae1b9c40410
@@ -42392,12 +45576,12 @@ Date:	Mon Jan 23 18:52:48 2006 +0000
 	    (#5641).
 	    Drop the built-in paper sizes.
 
- ChangeLog		     |	  9 +++++++++
- configure.ac		     |	  1 -
- poppler/GlobalParams.cc     |	 23 ++---------------------
- poppler/poppler-config.h.in |	  5 -----
- utils/pdftohtml.cc	     |	  4 +---
- utils/pdftops.cc	     |	  4 +++-
+ ChangeLog		     |	9 +++++++++
+ configure.ac		     |	1 -
+ poppler/GlobalParams.cc     | 23 ++---------------------
+ poppler/poppler-config.h.in |	5 -----
+ utils/pdftohtml.cc	     |	4 +---
+ utils/pdftops.cc	     |	4 +++-
  6 files changed, 15 insertions(+), 31 deletions(-)
 
 commit fb2054a5031d60aac3ccc9a36b3ed88a32188e33
@@ -42412,18 +45596,18 @@ Date:	Mon Jan 23 15:40:54 2006 +0000
 	    * utils/*.cc: Move config.h #include to top of #include's
 	    (#5693).
 
- ChangeLog		  |    5 +++++
- glib/test-poppler-glib.c |    5 +++--
- poppler/FontInfo.cc	  |    2 +-
- utils/HtmlOutputDev.cc   |    2 +-
- utils/ImageOutputDev.cc  |    2 +-
- utils/pdffonts.cc	  |    2 +-
- utils/pdfimages.cc	  |    2 +-
- utils/pdfinfo.cc	  |    2 +-
- utils/pdftohtml.cc	  |    4 ++--
- utils/pdftoppm.cc	  |    2 +-
- utils/pdftops.cc	  |    2 +-
- utils/pdftotext.cc	  |    2 +-
+ ChangeLog		  | 5 +++++
+ glib/test-poppler-glib.c | 5 +++--
+ poppler/FontInfo.cc	  | 2 +-
+ utils/HtmlOutputDev.cc   | 2 +-
+ utils/ImageOutputDev.cc  | 2 +-
+ utils/pdffonts.cc	  | 2 +-
+ utils/pdfimages.cc	  | 2 +-
+ utils/pdfinfo.cc	  | 2 +-
+ utils/pdftohtml.cc	  | 4 ++--
+ utils/pdftoppm.cc	  | 2 +-
+ utils/pdftops.cc	  | 2 +-
+ utils/pdftotext.cc	  | 2 +-
  12 files changed, 19 insertions(+), 13 deletions(-)
 
 commit 836af3529e827e25f20cb4710cbbf9ed0371a42c
@@ -42436,8 +45620,8 @@ Date:	Mon Jan 23 14:45:30 2006 +0000
 	    include
 	    files.
 
- ChangeLog		|    5 +++++
- splash/SplashFTFont.cc |    3 ++-
+ ChangeLog		| 5 +++++
+ splash/SplashFTFont.cc | 3 ++-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 60e13bf84e4f020a264811e4a5bf85d67e15d6df
@@ -42448,8 +45632,8 @@ Date:	Sat Jan 21 21:56:40 2006 +0000
 
 	* TODO: Add my todo list.
 
- ChangeLog |	4 ++++
- TODO	   |   10 ++++++++++
+ ChangeLog |  4 ++++
+ TODO	   | 10 ++++++++++
  2 files changed, 14 insertions(+)
 
 commit cebba06563d1b691a8bbb83828e47c9cc91e231a
@@ -42458,9 +45642,9 @@ Date:	Wed Jan 18 22:40:26 2006 +0000
 
     ok, ok, lasts files, i promise :-/
 
- qt4/tests/check_attachments.cpp   |  151
- +++++++++++++++++++++++++++++++++++++
- qt4/tests/poppler-attachments.cpp |   37 +++++++++
+ qt4/tests/check_attachments.cpp   | 151
+ ++++++++++++++++++++++++++++++++++++++
+ qt4/tests/poppler-attachments.cpp |  37 ++++++++++
  2 files changed, 188 insertions(+)
 
 commit 0b12e7cce6c6633b1d07e2902a9fa13ff52079e7
@@ -42469,8 +45653,8 @@ Date:	Wed Jan 18 22:38:59 2006 +0000
 
     YAMF = Yet Another Missing File
 
- qt4/src/poppler-embeddedfile.cc |  106
- +++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-embeddedfile.cc | 106
+ ++++++++++++++++++++++++++++++++++++++++
  1 file changed, 106 insertions(+)
 
 commit 38c8f3a53b3eb2be1fbfa360f77285037d89b719
@@ -42479,9 +45663,9 @@ Date:	Wed Jan 18 22:36:01 2006 +0000
 
     as usual i foget some files
 
- poppler/UGooString.cc |   86
- +++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/UGooString.h  |   55 +++++++++++++++++++++++++++++++
+ poppler/UGooString.cc | 86
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/UGooString.h  | 55 ++++++++++++++++++++++++++++++++
  2 files changed, 141 insertions(+)
 
 commit ad6e7d862c8fa6e10a7dbbb3391cbb0b6c922375
@@ -42491,47 +45675,47 @@ Date:	Wed Jan 18 22:32:13 2006 +0000
     Brad patch for embedded document extraction, only has Qt4 bindings
     for now, needs Qt3 and glib work
 
- ChangeLog		       |   42 +++++++++++++
- glib/poppler-action.cc        |    2 +-
- glib/poppler-document.cc      |    1 +
- poppler/Annot.cc	       |    1 +
- poppler/Catalog.cc	       |  133
- ++++++++++++++++++++++++++++++++++++++---
- poppler/Catalog.h	       |   60 +++++++++++++++++--
- poppler/Dict.cc	       |   17 +++---
- poppler/Dict.h		       |   15 ++---
- poppler/FontInfo.cc	       |    1 +
- poppler/Function.cc	       |    1 +
- poppler/Gfx.cc		       |    1 +
- poppler/GfxFont.cc	       |    5 +-
- poppler/GfxState.cc	       |    1 +
- poppler/Link.cc	       |    9 +--
- poppler/Link.h		       |    9 +--
- poppler/Makefile.am	       |    2 +
- poppler/Object.h	       |   17 +++---
- poppler/Outline.cc	       |    1 +
- poppler/PDFDoc.cc	       |    1 +
- poppler/PDFDoc.h	       |    2 +-
- poppler/PSOutputDev.cc        |    5 +-
- poppler/Page.cc	       |    1 +
- poppler/PageLabelInfo.cc      |    1 +
- poppler/Parser.cc	       |    2 +
- poppler/SecurityHandler.cc    |    1 +
- poppler/Stream.cc	       |    1 +
- poppler/XRef.cc	       |    1 +
- qt/poppler-document.cc        |    1 +
- qt/poppler-page-transition.cc |    1 +
- qt4/src/Makefile.am	       |    1 +
- qt4/src/poppler-document.cc   |   26 +++++++-
- qt4/src/poppler-private.h     |    2 +
- qt4/src/poppler-qt4.h	       |   68 +++++++++++++++++++++
- qt4/tests/.cvsignore	       |    2 +
- qt4/tests/Makefile.am	       |   16 ++++-
- utils/HtmlOutputDev.cc        |    1 +
- utils/pdffonts.cc	       |    1 +
- utils/pdfinfo.cc	       |    1 +
- utils/pdftohtml.cc	       |    1 +
- utils/pdftotext.cc	       |    1 +
+ ChangeLog		       |  42 +++++++++++++
+ glib/poppler-action.cc        |   2 +-
+ glib/poppler-document.cc      |   1 +
+ poppler/Annot.cc	       |   1 +
+ poppler/Catalog.cc	       | 133
+ +++++++++++++++++++++++++++++++++++++++---
+ poppler/Catalog.h	       |  60 +++++++++++++++++--
+ poppler/Dict.cc	       |  17 +++---
+ poppler/Dict.h		       |  15 ++---
+ poppler/FontInfo.cc	       |   1 +
+ poppler/Function.cc	       |   1 +
+ poppler/Gfx.cc		       |   1 +
+ poppler/GfxFont.cc	       |   5 +-
+ poppler/GfxState.cc	       |   1 +
+ poppler/Link.cc	       |   9 +--
+ poppler/Link.h		       |   9 +--
+ poppler/Makefile.am	       |   2 +
+ poppler/Object.h	       |  17 +++---
+ poppler/Outline.cc	       |   1 +
+ poppler/PDFDoc.cc	       |   1 +
+ poppler/PDFDoc.h	       |   2 +-
+ poppler/PSOutputDev.cc        |   5 +-
+ poppler/Page.cc	       |   1 +
+ poppler/PageLabelInfo.cc      |   1 +
+ poppler/Parser.cc	       |   2 +
+ poppler/SecurityHandler.cc    |   1 +
+ poppler/Stream.cc	       |   1 +
+ poppler/XRef.cc	       |   1 +
+ qt/poppler-document.cc        |   1 +
+ qt/poppler-page-transition.cc |   1 +
+ qt4/src/Makefile.am	       |   1 +
+ qt4/src/poppler-document.cc   |  26 ++++++++-
+ qt4/src/poppler-private.h     |   2 +
+ qt4/src/poppler-qt4.h	       |  68 +++++++++++++++++++++
+ qt4/tests/.cvsignore	       |   2 +
+ qt4/tests/Makefile.am	       |  16 ++++-
+ utils/HtmlOutputDev.cc        |   1 +
+ utils/pdffonts.cc	       |   1 +
+ utils/pdfinfo.cc	       |   1 +
+ utils/pdftohtml.cc	       |   1 +
+ utils/pdftotext.cc	       |   1 +
  40 files changed, 401 insertions(+), 54 deletions(-)
 
 commit 550fb0b617ece7951ec39aec5fa5504cc90022fc
@@ -42540,10 +45724,10 @@ Date:	Wed Jan 18 21:22:12 2006 +0000
 
     Add some more documentation to PageTransition, patch by Stefan Kebekus
 
- ChangeLog		      |    6 ++++++
- qt/poppler-page-transition.h |   40
+ ChangeLog		      |  6 ++++++
+ qt/poppler-page-transition.h | 40
  +++++++++++++++++++++++++++++++++-------
- qt4/src/Doxyfile	      |    2 +-
+ qt4/src/Doxyfile	      |  2 +-
  3 files changed, 40 insertions(+), 8 deletions(-)
 
 commit d66f3647ff1c38318d4cd056cb4d4c7a32eb6603
@@ -42556,8 +45740,8 @@ Date:	Wed Jan 18 18:54:12 2006 +0000
 	    those do not have to be took into account. Fixes
 	    http://bugs.kde.org/show_bug.cgi?id=120310
 
- ChangeLog		      |    9 ++++++++-
- poppler/CharCodeToUnicode.cc |   31 +++++++++++++++++++++++++++----
+ ChangeLog		      |  9 ++++++++-
+ poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++++++++++----
  2 files changed, 35 insertions(+), 5 deletions(-)
 
 commit d78b670339c8f92a32ab5f0a574d0e21690806f8
@@ -42567,13 +45751,13 @@ Date:	Tue Jan 17 21:35:31 2006 +0000
     When doing the parsing check with XREF we did not grow too much. Fixes
     serialata10a.pdf
 
- ChangeLog	   |   10 ++++++++++
- poppler/Lexer.cc  |   22 +++++++++++++++++++---
- poppler/Lexer.h   |	8 +++++---
- poppler/Parser.cc |	6 +++---
- poppler/Parser.h  |	2 +-
- poppler/XRef.cc   |   17 +++++++++++++++++
- poppler/XRef.h    |	3 +++
+ ChangeLog	   | 10 ++++++++++
+ poppler/Lexer.cc  | 22 +++++++++++++++++++---
+ poppler/Lexer.h   |  8 +++++---
+ poppler/Parser.cc |  6 +++---
+ poppler/Parser.h  |  2 +-
+ poppler/XRef.cc   | 17 +++++++++++++++++
+ poppler/XRef.h    |  3 +++
  7 files changed, 58 insertions(+), 10 deletions(-)
 
 commit f5db636af0cd6e05cd7ede37a8585001d51192a1
@@ -42587,7 +45771,7 @@ Date:	Tue Jan 17 20:33:08 2006 +0000
     i suck
     A file i forgot to add to make it compile :-/
 
- qt/poppler-page-transition-private.h |   28 ++++++++++++++++++++++++++++
+ qt/poppler-page-transition-private.h | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 commit 9cc97908ea67ab431e58129f589e00f41f40a143
@@ -42598,8 +45782,8 @@ Date:	Thu Jan 12 23:54:08 2006 +0000
 
 	* poppler/GlobalParams.cc: Make buildFcPattern() static.
 
- ChangeLog		 |    4 ++++
- poppler/GlobalParams.cc |    2 +-
+ ChangeLog		 | 4 ++++
+ poppler/GlobalParams.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit c7ce134fb1dadb46e2b3773d0976ea31da0a046f
@@ -42612,9 +45796,9 @@ Date:	Wed Jan 11 16:52:58 2006 +0000
 	    * poppler/Stream.cc: Merge patch to fix CVE-2005-3624,
 	    CVE-2005-3625 and CVE-2005-3627 issues.
 
- ChangeLog		|    6 ++++++
- poppler/JBIG2Stream.cc |   32 +++++++++++++++++++++++++++++++-
- poppler/Stream.cc	|    8 +++++---
+ ChangeLog		|  6 ++++++
+ poppler/JBIG2Stream.cc | 32 +++++++++++++++++++++++++++++++-
+ poppler/Stream.cc	|  8 +++++---
  3 files changed, 42 insertions(+), 4 deletions(-)
 
 commit ec7fb41725c19bc7f2aad1073fe6397ea0a8da0d
@@ -42636,16 +45820,16 @@ Date:	Tue Jan 10 21:57:28 2006 +0000
 	    renaming of
 	    PageTransition.cc
 
- ChangeLog		       |   15 +++++++++++++++
- configure.ac		       |   14 ++++----------
- m4/qt.m4		       |    5 +++++
- qt/poppler-page-transition.cc |    2 +-
- qt/poppler-page.cc	       |    1 +
- qt/poppler-private.h	       |    5 -----
- qt4/src/Makefile.am	       |    1 +
- qt4/src/poppler-page.cc       |    2 +-
- qt4/src/poppler-qt4.h	       |    2 +-
- qt4/tests/Makefile.am	       |    1 +
+ ChangeLog		       | 15 +++++++++++++++
+ configure.ac		       | 14 ++++----------
+ m4/qt.m4		       |  5 +++++
+ qt/poppler-page-transition.cc |  2 +-
+ qt/poppler-page.cc	       |  1 +
+ qt/poppler-private.h	       |  5 -----
+ qt4/src/Makefile.am	       |  1 +
+ qt4/src/poppler-page.cc       |  2 +-
+ qt4/src/poppler-qt4.h	       |  2 +-
+ qt4/tests/Makefile.am	       |  1 +
  10 files changed, 30 insertions(+), 18 deletions(-)
 
 commit d9bc53a741b3bbd2a202662c66fe70f49ac72a49
@@ -42659,9 +45843,9 @@ Date:	Tue Jan 10 17:59:51 2006 +0000
 
 	    * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Set this here.
 
- ChangeLog	    |	 7 +++++++
- Makefile.am	    |	 1 +
- splash/Makefile.am |	 4 ++++
+ ChangeLog	    | 7 +++++++
+ Makefile.am	    | 1 +
+ splash/Makefile.am | 4 ++++
  3 files changed, 12 insertions(+)
 
 commit ea6d9b97cec6fabf8a5005c565bbdb378bed7f54
@@ -42682,9 +45866,9 @@ Date:	Tue Jan 10 17:55:59 2006 +0000
 	textClipPath is used to store the appended path from each call to
 	endString(). The accumulated path is clipped in endTextObject.
 
- ChangeLog		   |   14 ++++++++++++++
- poppler/CairoOutputDev.cc |   27 +++++++++++++++++++++++----
- poppler/CairoOutputDev.h  |	1 +
+ ChangeLog		   | 14 ++++++++++++++
+ poppler/CairoOutputDev.cc | 27 +++++++++++++++++++++++----
+ poppler/CairoOutputDev.h  |  1 +
  3 files changed, 38 insertions(+), 4 deletions(-)
 
 commit 9e8a655a2bd3ca8cff1a150dce0dd378aeca047b
@@ -42696,8 +45880,8 @@ Date:	Sun Jan 8 22:59:48 2006 +0000
 	* poppler/CairoOutputDev.cc: Don't try and load type3 fonts
 	(#4030).
 
- ChangeLog		   |	6 +++++-
- poppler/CairoOutputDev.cc |	5 ++++-
+ ChangeLog		   | 6 +++++-
+ poppler/CairoOutputDev.cc | 5 ++++-
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit 25fd8e1ea87c41855a4ee702fbe47f5661a54c22
@@ -42710,8 +45894,8 @@ Date:	Sun Jan 8 22:51:17 2006 +0000
 
 	Patch by Nickolay V. Shmyrev.
 
- ChangeLog	 |    6 ++++++
- poppler/Page.cc |    6 +++---
+ ChangeLog	 | 6 ++++++
+ poppler/Page.cc | 6 +++---
  2 files changed, 9 insertions(+), 3 deletions(-)
 
 commit df73ee2ec4b65ccf611f0fd76fb456cc797693d4
@@ -42722,8 +45906,8 @@ Date:	Sat Jan 7 06:10:15 2006 +0000
 
 	* poppler/CairoOutputDev.cc: Initialize (fill|stroke)_opacity.
 
- ChangeLog		   |	4 ++++
- poppler/CairoOutputDev.cc |	2 ++
+ ChangeLog		   | 4 ++++
+ poppler/CairoOutputDev.cc | 2 ++
  2 files changed, 6 insertions(+)
 
 commit 18eb8de66749082e4aa65cc6d369a533826fab33
@@ -42761,29 +45945,29 @@ Date:	Fri Jan 6 10:05:58 2006 +0000
 	    configure.ac
 	    and acinclude.m4 to m4/qt.m4 and m4/libjpeg.m4.
 
- ChangeLog				 |   26 ++++
- acinclude.m4				 |  112 ----------------
- configure.ac				 |  223
- +++----------------------------
- glib/reference/Makefile.am		 |    2 +-
- glib/reference/tmpl/poppler-enums.sgml  |  150 ---------------------
- glib/reference/tmpl/poppler-unused.sgml |  130 ++++++++++++++++++
- goo/Makefile.am			 |    1 +
- m4/libjpeg.m4				 |  109 +++++++++++++++
- m4/qt.m4				 |  206
- ++++++++++++++++++++++++++++
- poppler/Makefile.am			 |    1 -
- poppler/PageTransition.h		 |  118 ----------------
- poppler/Private.h			 |   30 -----
- poppler/TextOutputDev.cc		 |    2 -
- qt/Makefile.am				 |    8 +-
- qt/poppler-page-transition.cc		 |  187 ++++++++++++++++++++++++++
- qt/poppler-page-transition.h		 |  117 ++++++++++++++++
- qt/poppler-page.cc			 |    1 -
- qt/poppler-private.h			 |    9 +-
- qt/poppler-qt.h			 |    2 +-
- qt4/src/Makefile.am			 |    8 +-
- utils/Makefile.am			 |   54 ++++++--
+ ChangeLog				 |  26 ++++
+ acinclude.m4				 | 112 ----------------
+ configure.ac				 | 223
+ +++-----------------------------
+ glib/reference/Makefile.am		 |   2 +-
+ glib/reference/tmpl/poppler-enums.sgml  | 150 ---------------------
+ glib/reference/tmpl/poppler-unused.sgml | 130 +++++++++++++++++++
+ goo/Makefile.am			 |   1 +
+ m4/libjpeg.m4				 | 109 ++++++++++++++++
+ m4/qt.m4				 | 206
+ +++++++++++++++++++++++++++++
+ poppler/Makefile.am			 |   1 -
+ poppler/PageTransition.h		 | 118 -----------------
+ poppler/Private.h			 |  30 -----
+ poppler/TextOutputDev.cc		 |   2 -
+ qt/Makefile.am				 |   8 +-
+ qt/poppler-page-transition.cc		 | 187 ++++++++++++++++++++++++++
+ qt/poppler-page-transition.h		 | 117 +++++++++++++++++
+ qt/poppler-page.cc			 |   1 -
+ qt/poppler-private.h			 |   9 +-
+ qt/poppler-qt.h			 |   2 +-
+ qt4/src/Makefile.am			 |   8 +-
+ utils/Makefile.am			 |  54 ++++++--
  21 files changed, 857 insertions(+), 639 deletions(-)
 
 commit 93921e77115ebe4d527f98675e438de485e84507
@@ -42795,8 +45979,8 @@ Date:	Thu Jan 5 23:53:33 2006 +0000
 
     Might be worth backporting to 0.4.x
 
- ChangeLog	      |    5 +++++
- poppler/DCTStream.cc |   26 ++++++++++++++++----------
+ ChangeLog	      |  5 +++++
+ poppler/DCTStream.cc | 26 ++++++++++++++++----------
  2 files changed, 21 insertions(+), 10 deletions(-)
 
 commit 0dc16af02071350a0dc11af4106799378c99cdad
@@ -42806,12 +45990,12 @@ Date:	Thu Jan 5 13:53:58 2006 +0000
     Introduce variants of renderTo that return a QImage and do not use
     a QPixmap so threading is possible.
 
- ChangeLog		 |    8 +++++++
- qt/poppler-page.cc	 |   18 ++++++++++-----
- qt/poppler-qt.h	 |   30 ++++++++++++++++++++----
- qt4/src/poppler-page.cc |    9 +++++++-
- qt4/src/poppler-qt4.h	 |   59
- +++++++++++++++++++++++++----------------------
+ ChangeLog		 |  8 +++++++
+ qt/poppler-page.cc	 | 18 ++++++++++-----
+ qt/poppler-qt.h	 | 30 ++++++++++++++++++++-----
+ qt4/src/poppler-page.cc |  9 +++++++-
+ qt4/src/poppler-qt4.h	 | 59
+ +++++++++++++++++++++++++++----------------------
  5 files changed, 85 insertions(+), 39 deletions(-)
 
 commit 5c2cbf5d327c6cc75c073b56c3ab1748c0d24387
@@ -42820,8 +46004,8 @@ Date:	Mon Jan 2 14:24:31 2006 +0000
 
     Use error() instead std::cerr in PageTranstion.cc
 
- ChangeLog		   |	4 ++++
- poppler/PageTransition.cc |	5 +++--
+ ChangeLog		   | 4 ++++
+ poppler/PageTransition.cc | 5 +++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit da5a4233498b56df611e1c7bca0090306cb5dbe0
@@ -42836,14 +46020,14 @@ Date:	Mon Jan 2 00:06:45 2006 +0000
 	    * gtk-doc.make:
 	    * glib/Makefile.am: enable gtk-doc support.
 
- ChangeLog	  |    8 +++
- Makefile.am	  |    2 +
- autogen.sh	  |   14 +++++
- configure.ac	  |    4 ++
- glib/Makefile.am |    1 +
- gtk-doc.make	  |  153
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- m4/gtk-doc.m4	  |   53 +++++++++++++++++++
+ ChangeLog	  |   8 +++
+ Makefile.am	  |   2 +
+ autogen.sh	  |  14 +++++
+ configure.ac	  |   4 ++
+ glib/Makefile.am |   1 +
+ gtk-doc.make	  | 153
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ m4/gtk-doc.m4	  |  53 +++++++++++++++++++
  7 files changed, 235 insertions(+)
 
 commit 372c34cc9728d7041bc4f6893c0bae50c9501c50
@@ -42856,10 +46040,10 @@ Date:	Sun Jan 1 22:35:48 2006 +0000
 	    for
 	    every splashRenderToPixmap
 
- ChangeLog		     |	  4 ++++
- qt4/src/poppler-document.cc |	  1 -
- qt4/src/poppler-page.cc     |	 18 +++++-------------
- qt4/src/poppler-private.h   |	 24 +++++++++++++++++++++++-
+ ChangeLog		     |	4 ++++
+ qt4/src/poppler-document.cc |	1 -
+ qt4/src/poppler-page.cc     | 18 +++++-------------
+ qt4/src/poppler-private.h   | 24 +++++++++++++++++++++++-
  4 files changed, 32 insertions(+), 15 deletions(-)
 
 commit 6ff83474ac594368015334db9c6b33d3a552079f
@@ -42870,9 +46054,9 @@ Date:	Sun Jan 1 22:18:47 2006 +0000
 	  * qt/poppler-private.h: Don't create a SplashOutputDev for every
 	    renderToPixmap.
 
- ChangeLog	      |    6 ++++++
- qt/poppler-page.cc   |    8 +-------
- qt/poppler-private.h |   24 +++++++++++++++++++++++-
+ ChangeLog	      |  6 ++++++
+ qt/poppler-page.cc   |  8 +-------
+ qt/poppler-private.h | 24 +++++++++++++++++++++++-
  3 files changed, 30 insertions(+), 8 deletions(-)
 
 commit 6942646d4c82327a80b021838a38aa55c1026883
@@ -42885,22 +46069,24 @@ Date:	Sun Jan 1 20:34:36 2006 +0000
 	    building
 	    by default, but filled in.
 
- .cvsignore				      |    1 +
- ChangeLog				      |    5 +
- glib/reference/.cvsignore		      |   18 ++
- glib/reference/Makefile.am		      |   87 +++++++
- glib/reference/poppler-docs.sgml	      |   17 ++
- glib/reference/poppler-sections.txt	      |  151 +++++++++++
- glib/reference/poppler.types		      |    4 +
- glib/reference/tmpl/poppler-action.sgml      |  172 +++++++++++++
- glib/reference/tmpl/poppler-document.sgml    |  354
- ++++++++++++++++++++++++++
- glib/reference/tmpl/poppler-enums.sgml       |  169 ++++++++++++
- glib/reference/tmpl/poppler-page.sgml	      |  243 ++++++++++++++++++
- glib/reference/tmpl/poppler-private.sgml     |  128 ++++++++++
- glib/reference/tmpl/poppler.sgml	      |  216 ++++++++++++++++
- glib/reference/tmpl/stamp-poppler-enums.sgml |   19 ++
- 14 files changed, 1584 insertions(+)
+ .cvsignore				      |   1 +
+ ChangeLog				      |   5 +
+ glib/reference/.cvsignore		      |  18 ++
+ glib/reference/Makefile.am		      |  87 +++++++
+ glib/reference/poppler-docs.sgml	      |  17 ++
+ glib/reference/poppler-overrides.txt	      |   0
+ glib/reference/poppler-sections.txt	      | 151 ++++++++++++
+ glib/reference/poppler.types		      |   4 +
+ glib/reference/tmpl/poppler-action.sgml      | 172 +++++++++++++
+ glib/reference/tmpl/poppler-document.sgml    | 354
+ +++++++++++++++++++++++++++
+ glib/reference/tmpl/poppler-enums.sgml       | 169 +++++++++++++
+ glib/reference/tmpl/poppler-page.sgml	      | 243 ++++++++++++++++++
+ glib/reference/tmpl/poppler-private.sgml     | 128 ++++++++++
+ glib/reference/tmpl/poppler-unused.sgml      |   0
+ glib/reference/tmpl/poppler.sgml	      | 216 ++++++++++++++++
+ glib/reference/tmpl/stamp-poppler-enums.sgml |  19 ++
+ 16 files changed, 1584 insertions(+)
 
 commit 0fab1b711f153859e113cb3b6d734ddcb58fb87a
 Author: Jonathan Blandford <jrb@redhat.com>
@@ -42911,15 +46097,15 @@ Date:	Sat Dec 31 02:10:33 2005 +0000
 	    * glib/*{cc,h}: Update inline doc comments.  This is in
 	    preparation for gtk-doc support.
 
- ChangeLog		  |    5 ++
- glib/poppler-action.cc   |   14 +++++
- glib/poppler-action.h	  |    2 -
- glib/poppler-document.cc |  151
- +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h  |    4 +-
- glib/poppler-page.cc	  |   28 +++++++++
- glib/poppler.cc	  |   16 +++++
- glib/test-poppler-glib.c |   29 +++++++++
+ ChangeLog		  |   5 ++
+ glib/poppler-action.cc   |  14 +++++
+ glib/poppler-action.h	  |   2 -
+ glib/poppler-document.cc | 151
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h  |   4 +-
+ glib/poppler-page.cc	  |  28 +++++++++
+ glib/poppler.cc	  |  16 +++++
+ glib/test-poppler-glib.c |  29 +++++++++
  8 files changed, 243 insertions(+), 6 deletions(-)
 
 commit 313530036b204eaa5ddfa150730302e855560d6a
@@ -42928,7 +46114,7 @@ Date:	Fri Dec 30 22:54:46 2005 +0000
 
     A delete that slipped from the last patch-commit
 
- qt4/src/poppler-page.cc |    1 +
+ qt4/src/poppler-page.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit cf6f8123af19aca4200b58a454652f68ce8132e2
@@ -42938,17 +46124,17 @@ Date:	Fri Dec 30 22:31:32 2005 +0000
     Puting PageTransition implementation into poppler "core", both Qt
     and Qt4 frontends use it.
 
- poppler/Makefile.am	   |	1 +
- poppler/PageTransition.cc |  188
- +++++++++++++++++++++++++++++++++++++++++++++
- poppler/PageTransition.h  |  118 ++++++++++++++++++++++++++++
- poppler/Private.h	   |   30 ++++++++
- qt/Makefile.am		   |	2 +-
- qt/poppler-page.cc	   |  111 +-------------------------
- qt/poppler-qt.h	   |   72 +----------------
- qt4/src/Makefile.am	   |	2 +-
- qt4/src/poppler-page.cc   |   17 +++-
- qt4/src/poppler-qt4.h	   |   14 +++-
+ poppler/Makefile.am	   |   1 +
+ poppler/PageTransition.cc | 188
+ ++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PageTransition.h  | 118 +++++++++++++++++++++++++++++
+ poppler/Private.h	   |  30 ++++++++
+ qt/Makefile.am		   |   2 +-
+ qt/poppler-page.cc	   | 111 +--------------------------
+ qt/poppler-qt.h	   |  72 +-----------------
+ qt4/src/Makefile.am	   |   2 +-
+ qt4/src/poppler-page.cc   |  17 ++++-
+ qt4/src/poppler-qt4.h	   |  14 +++-
  10 files changed, 374 insertions(+), 181 deletions(-)
 
 commit 56035ab199ac6deb5c1e07e745d120d1121a5960
@@ -42958,9 +46144,9 @@ Date:	Fri Dec 30 21:59:58 2005 +0000
      * utils/HtmlOutputDev.cc:
      * utils/ImageOutputDev.cc: Fix build when using --disable-libjpeg
 
- ChangeLog		 |    5 +++++
- utils/HtmlOutputDev.cc  |    2 ++
- utils/ImageOutputDev.cc |    2 ++
+ ChangeLog		 | 5 +++++
+ utils/HtmlOutputDev.cc  | 2 ++
+ utils/ImageOutputDev.cc | 2 ++
  3 files changed, 9 insertions(+)
 
 commit 8b64dafc7f1d198fb0052c0d6f0da6de97bbb48d
@@ -42969,19 +46155,19 @@ Date:	Wed Dec 28 09:23:43 2005 +0000
 
     Plug a few memory leaks in the Qt4 bindings.
 
- ChangeLog			  |   25 +++++++++++++++++++
- qt4/src/poppler-document.cc	  |    3 +++
- qt4/src/poppler-private.h	  |    7 +++++-
- qt4/src/poppler-qt4.h		  |    3 +++
- qt4/tests/check_fonts.cpp	  |    8 ++++++
- qt4/tests/check_metadata.cpp	  |   50
- +++++++++++++++++++++++++++++++++-----
- qt4/tests/check_pagelayout.cpp   |    6 +++++
- qt4/tests/check_pagemode.cpp	  |   10 ++++++++
- qt4/tests/check_permissions.cpp  |    2 ++
- qt4/tests/check_version.cpp	  |   22 -----------------
- qt4/tests/poppler-fonts.cpp	  |    1 +
- qt4/tests/stress-poppler-qt4.cpp |    2 ++
+ ChangeLog			  | 25 ++++++++++++++++++++
+ qt4/src/poppler-document.cc	  |  3 +++
+ qt4/src/poppler-private.h	  |  7 +++++-
+ qt4/src/poppler-qt4.h		  |  3 +++
+ qt4/tests/check_fonts.cpp	  |  8 +++++++
+ qt4/tests/check_metadata.cpp	  | 50
+ +++++++++++++++++++++++++++++++++++-----
+ qt4/tests/check_pagelayout.cpp   |  6 +++++
+ qt4/tests/check_pagemode.cpp	  | 10 ++++++++
+ qt4/tests/check_permissions.cpp  |  2 ++
+ qt4/tests/check_version.cpp	  | 22 ------------------
+ qt4/tests/poppler-fonts.cpp	  |  1 +
+ qt4/tests/stress-poppler-qt4.cpp |  2 ++
  12 files changed, 110 insertions(+), 29 deletions(-)
 
 commit 64c07a20a4ed844f3b3dd26e974f58d5877cf9fd
@@ -42998,14 +46184,14 @@ Date:	Tue Dec 27 06:10:01 2005 +0000
     qt4/tests/check_metadata.cpp: update to reflect UTC.
     qt4/tests/.cvsignore: suppress check_dateConversion
 
- ChangeLog			    |	 9 ++++
- qt4/src/poppler-document.cc	    |	89 +++++++++++++++++++-----------
- qt4/src/poppler-qt4.h		    |	 5 ++
- qt4/tests/.cvsignore		    |	 1 +
- qt4/tests/Makefile.am		    |	11 ++--
- qt4/tests/check_dateConversion.cpp |  105
- ++++++++++++++++++++++++++++++++++++
- qt4/tests/check_metadata.cpp	    |	 4 +-
+ ChangeLog			    |	9 ++++
+ qt4/src/poppler-document.cc	    |  89 ++++++++++++++++++++-----------
+ qt4/src/poppler-qt4.h		    |	5 ++
+ qt4/tests/.cvsignore		    |	1 +
+ qt4/tests/Makefile.am		    |  11 ++--
+ qt4/tests/check_dateConversion.cpp | 105
+ +++++++++++++++++++++++++++++++++++++
+ qt4/tests/check_metadata.cpp	    |	4 +-
  7 files changed, 188 insertions(+), 36 deletions(-)
 
 commit 4b2e3b5106b75f23c830837a886cd29beb1d1d1b
@@ -43018,10 +46204,10 @@ Date:	Tue Dec 27 05:08:34 2005 +0000
     * qt4/src/poppler-qt4.h: Update API documentation. Patch from
     Stefan Kebekus, with some changes. Removed \brief entries.
 
- ChangeLog	       |    8 +++++
- qt4/src/Doxyfile      |    2 +-
- qt4/src/poppler-qt4.h |   81
- ++++++++++++++++++++++++++++++++++++++-----------
+ ChangeLog	       |  8 +++++
+ qt4/src/Doxyfile      |  2 +-
+ qt4/src/poppler-qt4.h | 81
+ ++++++++++++++++++++++++++++++++++++++++-----------
  3 files changed, 73 insertions(+), 18 deletions(-)
 
 commit 8d9cf43aaa73d5012428a6a4c5d7e2cccbd3036e
@@ -43036,14 +46222,14 @@ Date:	Wed Dec 21 22:09:47 2005 +0000
 
 	    * poppler/Stream.cc: Apply latest CVE-2005-3191 updates.
 
- ChangeLog	      |    8 ++++
- NEWS		      |    8 ++++
- acinclude.m4	      |  112
- +++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac	      |  114
- --------------------------------------------------
- poppler/JPXStream.cc |    1 +
- poppler/Stream.cc    |   11 +++--
+ ChangeLog	      |   8 ++++
+ NEWS		      |   8 ++++
+ acinclude.m4	      | 112
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac	      | 114
+ ---------------------------------------------------
+ poppler/JPXStream.cc |   1 +
+ poppler/Stream.cc    |  11 +++--
  6 files changed, 137 insertions(+), 117 deletions(-)
 
 commit 97243286560cb4f264b875185c8768a6af09d554
@@ -43059,11 +46245,11 @@ Date:	Wed Dec 21 17:30:33 2005 +0000
 	    Ikezoe to
 	    man non-embedded CJK fonts work.
 
- ChangeLog		    |	14 +++++++++---
- configure.ac		    |	 2 +-
- poppler/CairoFontEngine.cc |	52
- +++++++++++++++++++++++++++++++++++++++-----
- utils/Makefile.am	    |	15 ++++++++-----
+ ChangeLog		    | 14 ++++++++++---
+ configure.ac		    |  2 +-
+ poppler/CairoFontEngine.cc | 52
+ +++++++++++++++++++++++++++++++++++++++++-----
+ utils/Makefile.am	    | 15 +++++++------
  4 files changed, 68 insertions(+), 15 deletions(-)
 
 commit cf887a9a9fae7272165d3aae05c85444ff5ca604
@@ -43074,8 +46260,8 @@ Date:	Sun Dec 18 22:03:30 2005 +0000
 	   and not
 	   completely. Jeff and Martin were right
 
- ChangeLog	 |    2 ++
- poppler/Page.cc |   13 ++++++++++---
+ ChangeLog	 |  2 ++
+ poppler/Page.cc | 13 ++++++++++---
  2 files changed, 12 insertions(+), 3 deletions(-)
 
 commit 495890b9cef9d5d61bb47e789add1cf2c3b8f83d
@@ -43084,7 +46270,7 @@ Date:	Sun Dec 18 21:56:15 2005 +0000
 
     + .cvsignore
 
- utils/.cvsignore |   10 ++++++++++
+ utils/.cvsignore | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
 commit 5dca860bba6918e06fab3aa56a2c75f0ac9ecdfb
@@ -43093,9 +46279,9 @@ Date:	Sun Dec 18 21:08:48 2005 +0000
 
     Fix utils building on Slackware
 
- ChangeLog	   |	3 +++
- configure.ac	   |	3 +++
- utils/Makefile.am |	3 ++-
+ ChangeLog	   | 3 +++
+ configure.ac	   | 3 +++
+ utils/Makefile.am | 3 ++-
  3 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 03e3d9164ffd71f03136b57a9941ea14fadb21aa
@@ -43107,9 +46293,9 @@ Date:	Sun Dec 18 17:12:28 2005 +0000
 	    * configure.ac: Better jpeg detection, refer to ml PCbsd
 	    problem
 
- ChangeLog    |    4 ++
- configure.ac |  131
- ++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ ChangeLog    |   4 ++
+ configure.ac | 131
+ +++++++++++++++++++++++++++++++++++++++++++++++++++--------
  2 files changed, 118 insertions(+), 17 deletions(-)
 
 commit 888d76a29c9c5ea6c90cc4299b230ca0c2c2944f
@@ -43118,8 +46304,8 @@ Date:	Mon Dec 12 20:21:08 2005 +0000
 
     * poppler/Page.cc: Ignore cropBox if it seems incorrect
 
- ChangeLog	 |    4 ++++
- poppler/Page.cc |    7 +++++++
+ ChangeLog	 | 4 ++++
+ poppler/Page.cc | 7 +++++++
  2 files changed, 11 insertions(+)
 
 commit bcc5e3afe27c8787ce7022a0701997c96eddb4fe
@@ -43200,10 +46386,10 @@ Date:	Sat Dec 10 10:52:15 2005 +0000
       defaults are provided. The test has been changed accordingly. Some
       added documentation. Patch by Stefan Kebekus
 
- ChangeLog			|    9 +++++++++
- qt4/src/poppler-page.cc	|    4 ++--
- qt4/src/poppler-qt4.h		|   31 +++++++++++++++++++++++--------
- qt4/tests/test-poppler-qt4.cpp |    2 +-
+ ChangeLog			|  9 +++++++++
+ qt4/src/poppler-page.cc	|  4 ++--
+ qt4/src/poppler-qt4.h		| 31 +++++++++++++++++++++++--------
+ qt4/tests/test-poppler-qt4.cpp |  2 +-
  4 files changed, 35 insertions(+), 11 deletions(-)
 
 commit bc6df8c41081c0c0107655cbf70ddb8b0c493c34
@@ -43218,9 +46404,9 @@ Date:	Fri Dec 9 20:49:59 2005 +0000
 
 	    * poppler/Stream.cc: Remove duplicated check (#5243).
 
- ChangeLog	     |	  5 +++++
- poppler/GfxState.cc |	  6 +++---
- poppler/Stream.cc   |	  4 ----
+ ChangeLog	     | 5 +++++
+ poppler/GfxState.cc | 6 +++---
+ poppler/Stream.cc   | 4 ----
  3 files changed, 8 insertions(+), 7 deletions(-)
 
 commit 8a2464122455311c6d16ae62bb9ac9a0ae365a28
@@ -43235,10 +46421,10 @@ Date:	Fri Dec 9 19:40:40 2005 +0000
 	    installation
 	    of xpdf header files optional.
 
- ChangeLog	     |	 10 +++++++++-
- configure.ac	     |	  8 ++++++++
- goo/Makefile.am     |	  4 ++++
- poppler/Makefile.am |	  4 ++++
+ ChangeLog	     | 10 +++++++++-
+ configure.ac	     |	8 ++++++++
+ goo/Makefile.am     |	4 ++++
+ poppler/Makefile.am |	4 ++++
  4 files changed, 25 insertions(+), 1 deletion(-)
 
 commit 830b61bfd1c985fe14ec4d0f6724c8f70e924fc1
@@ -43259,14 +46445,14 @@ Date:	Thu Dec 8 18:17:42 2005 +0000
 	    also
 	    * splash/SplashFontFile.cc: i need unistd.h on windows also
 
- ChangeLog		      |   12 ++++++++++++
- configure.ac		      |   14 +++++++++++++-
- goo/GooTimer.cc	      |    3 +++
- goo/GooTimer.h		      |    4 ++++
- poppler/Gfx.cc		      |    6 ++++++
- poppler/GlobalParams.cc      |    1 -
- splash/SplashFTFontEngine.cc |    4 +---
- splash/SplashFontFile.cc     |    4 +---
+ ChangeLog		      | 12 ++++++++++++
+ configure.ac		      | 14 +++++++++++++-
+ goo/GooTimer.cc	      |  3 +++
+ goo/GooTimer.h		      |  4 ++++
+ poppler/Gfx.cc		      |  6 ++++++
+ poppler/GlobalParams.cc      |  1 -
+ splash/SplashFTFontEngine.cc |  4 +---
+ splash/SplashFontFile.cc     |  4 +---
  8 files changed, 40 insertions(+), 8 deletions(-)
 
 commit 0a1c33ed17fd7053ed455da3444856a5dab3c9b4
@@ -43276,11 +46462,11 @@ Date:	Thu Dec 8 12:42:50 2005 +0000
     Remove -DDATADIR we are not using if for anything and it shadows a
     windows typedef
 
- ChangeLog	     |	  8 ++++++++
- glib/Makefile.am    |	  3 +--
- poppler/Makefile.am |	  3 +--
- qt/Makefile.am      |	  3 +--
- test/Makefile.am    |	  3 +--
+ ChangeLog	     | 8 ++++++++
+ glib/Makefile.am    | 3 +--
+ poppler/Makefile.am | 3 +--
+ qt/Makefile.am      | 3 +--
+ test/Makefile.am    | 3 +--
  5 files changed, 12 insertions(+), 8 deletions(-)
 
 commit adca042e666fd932f16213d0a4daba08b5021901
@@ -43289,8 +46475,8 @@ Date:	Wed Dec 7 08:42:21 2005 +0000
 
     Remove the version check. OK'd by krh.
 
- ChangeLog	   |	2 ++
- poppler/PDFDoc.cc |	6 +-----
+ ChangeLog	   | 2 ++
+ poppler/PDFDoc.cc | 6 +-----
  2 files changed, 3 insertions(+), 5 deletions(-)
 
 commit bc57f8dd73eef9a74e4a6e248ed6985c360db838
@@ -43301,10 +46487,10 @@ Date:	Wed Dec 7 08:31:09 2005 +0000
     (keys)
     for the metadata.
 
- ChangeLog		      |    7 +++++++
- qt4/src/poppler-document.cc  |   22 ++++++++++++++++++++++
- qt4/src/poppler-qt4.h	      |    7 +++++++
- qt4/tests/check_metadata.cpp |   18 ++++++++++++++++++
+ ChangeLog		      |  7 +++++++
+ qt4/src/poppler-document.cc  | 22 ++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	      |  7 +++++++
+ qt4/tests/check_metadata.cpp | 18 ++++++++++++++++++
  4 files changed, 54 insertions(+)
 
 commit 7ec41df91e6dbf792e11676d929acc2f634bd382
@@ -43313,10 +46499,10 @@ Date:	Tue Dec 6 09:58:04 2005 +0000
 
     Add more unit tests for better coverage.
 
- ChangeLog		      |    6 ++++
- qt4/tests/check_fonts.cpp    |   24 +++++++++++++++
- qt4/tests/check_metadata.cpp |   66
- ++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog		      |  6 ++++
+ qt4/tests/check_fonts.cpp    | 24 ++++++++++++++++
+ qt4/tests/check_metadata.cpp | 66
+ ++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 96 insertions(+)
 
 commit a92b10016306ac46775c9b95b52d249b233ff950
@@ -43326,8 +46512,8 @@ Date:	Mon Dec 5 20:46:22 2005 +0000
     * poppler/CairoFontEngine.cc: Correct fix for #5149, i broke it when
     merging xpdf 3.01 patches
 
- ChangeLog		    |	 5 +++++
- poppler/CairoFontEngine.cc |	 4 +---
+ ChangeLog		    | 5 +++++
+ poppler/CairoFontEngine.cc | 4 +---
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit 66096477d1a86f13fcb07ae25caff1cc02b1e7cd
@@ -43336,8 +46522,8 @@ Date:	Sun Dec 4 19:48:25 2005 +0000
 
     Add checking for Type3 fonts in the unit test.
 
- ChangeLog		   |	5 +++++
- qt4/tests/check_fonts.cpp |   24 ++++++++++++++++++++++++
+ ChangeLog		   |  5 +++++
+ qt4/tests/check_fonts.cpp | 24 ++++++++++++++++++++++++
  2 files changed, 29 insertions(+)
 
 commit 62345b0affed8e2e37728fca7f2b750879192c43
@@ -43347,8 +46533,8 @@ Date:	Sun Dec 4 18:53:40 2005 +0000
     Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz
     for notifying
 
- ChangeLog	      |    5 +++++
- poppler/JPXStream.cc |    2 --
+ ChangeLog	      | 5 +++++
+ poppler/JPXStream.cc | 2 --
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit ba4b3f88271892f197aa2ec076c80ff63a175887
@@ -43362,11 +46548,11 @@ Date:	Sun Dec 4 11:30:00 2005 +0000
      FontInfo needed
        as Q[Value]List<FontInfo> uses it when appending
 
- ChangeLog		     |	  8 ++++++++
- qt/poppler-fontinfo.cc      |	  9 +++++++++
- qt/poppler-qt.h	     |	  2 ++
- qt4/src/poppler-fontinfo.cc |	  9 +++++++++
- qt4/src/poppler-qt4.h	     |	  2 ++
+ ChangeLog		     | 8 ++++++++
+ qt/poppler-fontinfo.cc      | 9 +++++++++
+ qt/poppler-qt.h	     | 2 ++
+ qt4/src/poppler-fontinfo.cc | 9 +++++++++
+ qt4/src/poppler-qt4.h	     | 2 ++
  5 files changed, 30 insertions(+)
 
 commit e091231d98d12c19b0098ffbaec6ecda28097dff
@@ -43375,8 +46561,8 @@ Date:	Sun Dec 4 10:45:25 2005 +0000
 
     Add new unit test to .cvsignore suppressions.
 
- ChangeLog	      |    2 ++
- qt4/tests/.cvsignore |    1 +
+ ChangeLog	      | 2 ++
+ qt4/tests/.cvsignore | 1 +
  2 files changed, 3 insertions(+)
 
 commit 6a7b1eaaedbfdd3a8e6b4d899477350f2b485641
@@ -43391,12 +46577,12 @@ Date:	Sun Dec 4 10:05:21 2005 +0000
 
     * qt4/src/Mainpage.dox: Minor typo fixes.
 
- ChangeLog		     |	 11 +++++++++++
- qt4/src/Mainpage.dox	     |	  5 +++--
- qt4/src/poppler-fontinfo.cc |	 24 ++++++++++++++++++++++++
- qt4/src/poppler-qt4.h	     |	 14 +++++++++++++-
- qt4/tests/Makefile.am	     |	  5 +++++
- qt4/tests/check_fonts.cpp   |	 42
+ ChangeLog		     | 11 +++++++++++
+ qt4/src/Mainpage.dox	     |	5 +++--
+ qt4/src/poppler-fontinfo.cc | 24 ++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	     | 14 +++++++++++++-
+ qt4/tests/Makefile.am	     |	5 +++++
+ qt4/tests/check_fonts.cpp   | 42
  ++++++++++++++++++++++++++++++++++++++++++
  6 files changed, 98 insertions(+), 3 deletions(-)
 
@@ -43413,9 +46599,9 @@ Date:	Sun Dec 4 02:24:25 2005 +0000
 	    * poppler/CairoFontEngine.cc: Fix text corruption bug (#5149),
 	    a rerun of an old classic (#3340).
 
- ChangeLog		    |	 7 +++++++
- glib/poppler-page.cc	    |	 8 +++++++-
- poppler/CairoFontEngine.cc |	 2 ++
+ ChangeLog		    | 7 +++++++
+ glib/poppler-page.cc	    | 8 +++++++-
+ poppler/CairoFontEngine.cc | 2 ++
  3 files changed, 16 insertions(+), 1 deletion(-)
 
 commit 4d169c5c345cdac84a39026e759b928977643417
@@ -43428,8 +46614,8 @@ Date:	Sun Dec 4 01:42:29 2005 +0000
 	    representation causing images to show up as random pixels
 	    (#5117).
 
- ChangeLog	     |	  5 +++++
- poppler/GfxState.cc |	  6 +++---
+ ChangeLog	     | 5 +++++
+ poppler/GfxState.cc | 6 +++---
  2 files changed, 8 insertions(+), 3 deletions(-)
 
 commit 58de0458e17b1639ce0bcae45a4b09b2c0a56618
@@ -43455,14 +46641,14 @@ Date:	Sat Dec 3 23:23:53 2005 +0000
 	    * poppler/TextOutputDev.cc:
 	    * qt/poppler-qt.h: GCC-4.1 fixes (#5031).
 
- ChangeLog		   |   17 +++++++++++++++++
- glib/poppler-document.h   |	5 +----
- poppler/CairoOutputDev.cc |   35 +++++++++--------------------------
- poppler/CairoOutputDev.h  |	2 +-
- poppler/Makefile.am	   |	3 ++-
- poppler/TextOutputDev.cc  |	2 +-
- qt/Makefile.am		   |	4 ++++
- qt/poppler-qt.h	   |	6 +++---
+ ChangeLog		   | 17 +++++++++++++++++
+ glib/poppler-document.h   |  5 +----
+ poppler/CairoOutputDev.cc | 35 +++++++++--------------------------
+ poppler/CairoOutputDev.h  |  2 +-
+ poppler/Makefile.am	   |  3 ++-
+ poppler/TextOutputDev.cc  |  2 +-
+ qt/Makefile.am		   |  4 ++++
+ qt/poppler-qt.h	   |  6 +++---
  8 files changed, 38 insertions(+), 36 deletions(-)
 
 commit df45483f1437d8a96519e1428d1f4b3ffc08c2cd
@@ -43471,7 +46657,7 @@ Date:	Sat Dec 3 22:39:06 2005 +0000
 
     remove another chagne should not have gone in
 
- test/pdf-inspector.cc |    9 ++-------
+ test/pdf-inspector.cc | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
 commit 7dfe02ee112dee51346525b62d877e6591135761
@@ -43481,9 +46667,9 @@ Date:	Sat Dec 3 22:28:46 2005 +0000
     Add the font retrieveing on the qt3 backend also, based on a patch
     by Wilfried Huss
 
- ChangeLog		|    3 ++
- qt/poppler-fontinfo.cc |   75
- ++++++++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog		|  3 ++
+ qt/poppler-fontinfo.cc | 75
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 78 insertions(+)
 
 commit 655b9dd195ac9faf2f7ea0255880b8c83b249a06
@@ -43492,7 +46678,7 @@ Date:	Sat Dec 3 22:26:07 2005 +0000
 
     this should have not went in
 
- poppler/TextOutputDev.h |   10 +++++-----
+ poppler/TextOutputDev.h | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 commit ab45eb562159d5b006e658ec66723a0a47908f65
@@ -43504,18 +46690,18 @@ Date:	Sat Dec 3 22:20:54 2005 +0000
      * qt4/src/poppler-textbox.cc: Remove implementation of that classes
      from the header, use pimpl
 
- ChangeLog		     |	  9 ++++-
- poppler/TextOutputDev.h     |	 10 +++---
- qt/Makefile.am		     |	  1 +
- qt/poppler-document.cc      |	 29 ++++++++++++++++
- qt/poppler-private.h	     |	  2 ++
- qt/poppler-qt.h	     |	 80
- ++++++++++++++++++++++++++++++++++++++++++-
- qt4/src/Makefile.am	     |	  2 ++
- qt4/src/poppler-fontinfo.cc |	 69 +++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-qt4.h	     |	 43 +++++++++--------------
- qt4/src/poppler-textbox.cc  |	 49 ++++++++++++++++++++++++++
- test/pdf-inspector.cc	     |	  9 +++--
+ ChangeLog		     |	9 ++++-
+ poppler/TextOutputDev.h     | 10 +++---
+ qt/Makefile.am		     |	1 +
+ qt/poppler-document.cc      | 29 ++++++++++++++++
+ qt/poppler-private.h	     |	2 ++
+ qt/poppler-qt.h	     | 80
+ ++++++++++++++++++++++++++++++++++++++++++++-
+ qt4/src/Makefile.am	     |	2 ++
+ qt4/src/poppler-fontinfo.cc | 69 ++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	     | 43 ++++++++++--------------
+ qt4/src/poppler-textbox.cc  | 49 +++++++++++++++++++++++++++
+ test/pdf-inspector.cc	     |	9 +++--
  11 files changed, 268 insertions(+), 35 deletions(-)
 
 commit 64079ad81caf6d2cf66b1f3a3de9454146e15c6c
@@ -43545,12 +46731,12 @@ Date:	Sat Dec 3 21:55:36 2005 +0000
 	    Zero
 	    out pixbuf first.
 
- ChangeLog		   |   21 ++++++++++++++++
- glib/poppler-page.cc	   |   18 ++++++++------
- poppler/CairoOutputDev.cc |   59
- +++++++++++++++++++++++++++++++++------------
- poppler/CairoOutputDev.h  |	6 ++---
- poppler/TextOutputDev.cc  |	8 +++---
+ ChangeLog		   | 21 +++++++++++++++++
+ glib/poppler-page.cc	   | 18 +++++++++------
+ poppler/CairoOutputDev.cc | 59
+ ++++++++++++++++++++++++++++++++++-------------
+ poppler/CairoOutputDev.h  |  6 ++---
+ poppler/TextOutputDev.cc  |  8 +++----
  5 files changed, 82 insertions(+), 30 deletions(-)
 
 commit f3da21a3ecdd2694290e64af86c8e35fcb61371b
@@ -43559,14 +46745,14 @@ Date:	Sat Dec 3 21:35:45 2005 +0000
 
     More docs for the Qt4 frontend, patch by Stefan Kebekus
 
- ChangeLog			|    8 ++++
- qt4/src/.cvsignore		|    3 +-
- qt4/src/Doxyfile		|    4 +-
- qt4/src/Mainpage.dox		|   91
- ++++++++++++++++++++++++++++++++++++++++
- qt4/src/poppler-page.cc	|   20 +++------
- qt4/src/poppler-qt4.h		|   57 +++++++++++++++++--------
- qt4/tests/test-poppler-qt4.cpp |    5 ++-
+ ChangeLog			|  8 ++++
+ qt4/src/.cvsignore		|  3 +-
+ qt4/src/Doxyfile		|  4 +-
+ qt4/src/Mainpage.dox		| 91
+ ++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-page.cc	| 20 +++-------
+ qt4/src/poppler-qt4.h		| 57 ++++++++++++++++++--------
+ qt4/tests/test-poppler-qt4.cpp |  5 ++-
  7 files changed, 151 insertions(+), 37 deletions(-)
 
 commit 7b2c6e92611db9350ca5dcaf3fd730fe5e69afea
@@ -43576,10 +46762,10 @@ Date:	Thu Dec 1 22:45:10 2005 +0000
     Fix CAN-2005-3193 related bugs
     Thanks Leonard for reporting
 
- ChangeLog	      |    6 ++++++
- poppler/JPXStream.cc |    9 ++++++++-
- poppler/Stream.cc    |   33 ++++++++++++++++++++++++++++++++-
- poppler/Stream.h     |    3 +++
+ ChangeLog	      |  6 ++++++
+ poppler/JPXStream.cc |  9 ++++++++-
+ poppler/Stream.cc    | 33 ++++++++++++++++++++++++++++++++-
+ poppler/Stream.h     |  3 +++
  4 files changed, 49 insertions(+), 2 deletions(-)
 
 commit a90f076af9ebb188895e7b223bcb7e5c3f4309c4
@@ -43591,11 +46777,11 @@ Date:	Mon Nov 28 22:50:19 2005 +0000
     Use Splash backend by default in the qt4 test, added -arthur option
     to use the Arthur backend
 
- ChangeLog			|   12 +++++++--
- qt4/src/poppler-page.cc	|   47 ++++++++++++++++++++++++++---------
- qt4/src/poppler-qt4.h		|   17 +++++++++----
- qt4/tests/test-poppler-qt4.cpp |   53
- +++++++++++++++++++++++++---------------
+ ChangeLog			| 12 ++++++++--
+ qt4/src/poppler-page.cc	| 47 ++++++++++++++++++++++++++++---------
+ qt4/src/poppler-qt4.h		| 17 ++++++++++----
+ qt4/tests/test-poppler-qt4.cpp | 53
+ ++++++++++++++++++++++++++----------------
  4 files changed, 91 insertions(+), 38 deletions(-)
 
 commit b7e4f0e7d175abde7fafb1fcc7ba129468bc8c1a
@@ -43605,14 +46791,14 @@ Date:	Sun Nov 27 01:33:51 2005 +0000
     Convert Qt4 unit tests to use the new Qt4.1 QTestlib framework.
     Add a little more API documentation
 
- ChangeLog			 |    7 +++++
- qt4/src/poppler-qt4.h		 |   11 +++++---
- qt4/tests/Makefile.am		 |   12 +++++---
- qt4/tests/check_metadata.cpp	 |   58
- +++++++++++++++++++--------------------
- qt4/tests/check_pagelayout.cpp  |   14 +++++-----
- qt4/tests/check_pagemode.cpp	 |   22 +++++++--------
- qt4/tests/check_permissions.cpp |   18 ++++++------
+ ChangeLog			 |  7 +++++
+ qt4/src/poppler-qt4.h		 | 11 +++++---
+ qt4/tests/Makefile.am		 | 12 ++++++---
+ qt4/tests/check_metadata.cpp	 | 58
+ ++++++++++++++++++++---------------------
+ qt4/tests/check_pagelayout.cpp  | 14 +++++-----
+ qt4/tests/check_pagemode.cpp	 | 22 ++++++++--------
+ qt4/tests/check_permissions.cpp | 18 ++++++-------
  7 files changed, 78 insertions(+), 64 deletions(-)
 
 commit d036fa022dbb6f4421ccc8b12b8f9e4f0c8d7406
@@ -43622,10 +46808,9 @@ Date:	Fri Nov 25 22:52:56 2005 +0000
     patch from kebekus to add to the qt4 binding the same functions we
     added to the qt3 one
 
- ChangeLog		 |    5 +++++
- qt4/src/poppler-page.cc |   44
- ++++++++++++++++++++++++++++++++++++++++++--
- qt4/src/poppler-qt4.h	 |   22 ++++++++++++++++++++++
+ ChangeLog		 |  5 +++++
+ qt4/src/poppler-page.cc | 44 ++++++++++++++++++++++++++++++++++++++++++--
+ qt4/src/poppler-qt4.h	 | 22 ++++++++++++++++++++++
  3 files changed, 69 insertions(+), 2 deletions(-)
 
 commit 3c9f09d76dc70e4ba766930facee8b6f30bcd2da
@@ -43634,8 +46819,8 @@ Date:	Tue Nov 22 21:50:44 2005 +0000
 
     Fix page range in the inspector
 
- ChangeLog	       |    4 ++++
- test/pdf-inspector.cc |    2 +-
+ ChangeLog	       | 4 ++++
+ test/pdf-inspector.cc | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit e64f63416dbce497cb2167272b95491664f213e8
@@ -43644,10 +46829,10 @@ Date:	Mon Nov 21 22:12:15 2005 +0000
 
     PAtch to add some more functions to the qt binding by Stefan Kebekus
 
- ChangeLog	    |	 5 ++++
- qt/poppler-page.cc |	69
- +++++++++++++++++++++++++++++++++++++++++++++++++++-
- qt/poppler-qt.h    |	41 +++++++++++++++++++++++++++++++
+ ChangeLog	    |  5 ++++
+ qt/poppler-page.cc | 69
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ qt/poppler-qt.h    | 41 ++++++++++++++++++++++++++++++++
  3 files changed, 114 insertions(+), 1 deletion(-)
 
 commit 8bd8cb4160b73da69d058783750352fbface66dc
@@ -43656,8 +46841,8 @@ Date:	Mon Nov 21 19:44:09 2005 +0000
 
     Fix a possible build problem
 
- ChangeLog	|    4 ++++
- qt/Makefile.am |    1 +
+ ChangeLog	| 4 ++++
+ qt/Makefile.am | 1 +
  2 files changed, 5 insertions(+)
 
 commit fc59b79dc375544681032a1618e96c458515d724
@@ -43672,9 +46857,9 @@ Date:	Sun Nov 20 23:17:32 2005 +0000
 	    to work
 	    with new GfXColor type.
 
- ChangeLog	     |	 13 +++++++++++-
- poppler/GfxState.cc |	 59
- ++++++++++++++++++++++++++++++---------------------
+ ChangeLog	     | 13 +++++++++++-
+ poppler/GfxState.cc | 59
+ +++++++++++++++++++++++++++++++----------------------
  2 files changed, 47 insertions(+), 25 deletions(-)
 
 commit 6fe2cb0fcd53211143dcd0c47bf8c8c7a8c11a39
@@ -43683,8 +46868,8 @@ Date:	Thu Nov 17 21:37:34 2005 +0000
 
     make it compile with freetype 2.2.0 preversions
 
- ChangeLog		|    4 ++++
- splash/SplashFTFont.cc |   42 +++++++++++++++++++++++++++++++++++++-----
+ ChangeLog		|  4 ++++
+ splash/SplashFTFont.cc | 42 +++++++++++++++++++++++++++++++++++++-----
  2 files changed, 41 insertions(+), 5 deletions(-)
 
 commit 429d3521d788be702a3944bc290569f90ae04892
@@ -43693,9 +46878,9 @@ Date:	Fri Nov 4 19:03:55 2005 +0000
 
     Make it compile using --disable-cairo-output
 
- ChangeLog		  |    4 ++++
- glib/poppler-document.cc |    6 ++++--
- glib/poppler-page.cc	  |   27 +++++++++++++--------------
+ ChangeLog		  |  4 ++++
+ glib/poppler-document.cc |  6 ++++--
+ glib/poppler-page.cc	  | 27 +++++++++++++--------------
  3 files changed, 21 insertions(+), 16 deletions(-)
 
 commit b96c118eb08d478914c2981204d749a95957cbb3
@@ -43705,10 +46890,10 @@ Date:	Tue Nov 1 15:29:32 2005 +0000
     Comment some unused parameters to calm down compiler warnings when
     using these heders on external projects with higher warning verbosity
 
- ChangeLog	     |	  5 +++
- poppler/OutputDev.h |	125
- ++++++++++++++++++++++++++-------------------------
- poppler/Stream.h    |	 24 +++++-----
+ ChangeLog	     |	 5 +++
+ poppler/OutputDev.h | 125
+ ++++++++++++++++++++++++++--------------------------
+ poppler/Stream.h    |	24 +++++-----
  3 files changed, 80 insertions(+), 74 deletions(-)
 
 commit 51670972777510a3ec64a56649716b31167b9d0e
@@ -43768,8 +46953,8 @@ Date:	Mon Oct 17 02:17:51 2005 +0000
 	    Fix another
 	    off-by-one page number error (#4555).
 
- ChangeLog		     |	  6 +++++-
- poppler/poppler-config.h.in |	  2 +-
+ ChangeLog		     | 6 +++++-
+ poppler/poppler-config.h.in | 2 +-
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 9830f0ea41f09fefada740e9429c491e067a5082
@@ -43778,9 +46963,9 @@ Date:	Sun Oct 16 15:11:32 2005 +0000
 
     GfxFont merges from xpdf 3.01
 
- ChangeLog	    |	 1 +
- poppler/GfxFont.cc |  109
- +++++++++++++++++++++++++++++++++++-----------------
+ ChangeLog	    |	1 +
+ poppler/GfxFont.cc | 109
+ ++++++++++++++++++++++++++++++++++++-----------------
  2 files changed, 75 insertions(+), 35 deletions(-)
 
 commit 62b5ba221aca8c320e964916b0c0329efc8da572
@@ -43789,10 +46974,10 @@ Date:	Sun Oct 16 15:04:39 2005 +0000
 
     Stream[cc|h] merges from xpdf 3.01
 
- ChangeLog	   |	1 +
- poppler/Stream.cc |  714
- ++++++++++++++++++++++++++++++++++++++++++++++++-----
- poppler/Stream.h  |   19 +-
+ ChangeLog	   |   1 +
+ poppler/Stream.cc | 714
+ +++++++++++++++++++++++++++++++++++++++++++++++++-----
+ poppler/Stream.h  |  19 +-
  3 files changed, 658 insertions(+), 76 deletions(-)
 
 commit b9fab51179f38e9798b10366be672f0432c874da
@@ -43801,10 +46986,10 @@ Date:	Sun Oct 16 14:58:14 2005 +0000
 
     Function.cc|h merges from xpdf 3.01
 
- ChangeLog	     |	  1 +
- poppler/Function.cc |	 76
- +++++++++++++++++++++++++++++----------------------
- poppler/Function.h  |	 42 ++++++++++++++++++++++++++++
+ ChangeLog	     |	1 +
+ poppler/Function.cc | 76
+ ++++++++++++++++++++++++++++++-----------------------
+ poppler/Function.h  | 42 +++++++++++++++++++++++++++++
  3 files changed, 86 insertions(+), 33 deletions(-)
 
 commit c6e0242200f818c67508041763ff317e79daadd6
@@ -43813,13 +46998,13 @@ Date:	Sun Oct 16 14:54:17 2005 +0000
 
     Annot.[cc|h] and related merges from xpdf 3.01
 
- ChangeLog		|    7 +-
- poppler/Annot.cc	|  234
- ++++++++++++++++++++++++++++++++++++++++++------
- poppler/Annot.h	|   20 ++---
- poppler/FontInfo.cc	|    2 +-
- poppler/PSOutputDev.cc |    2 +-
- poppler/Page.cc	|    2 +-
+ ChangeLog		|   7 +-
+ poppler/Annot.cc	| 234
+ +++++++++++++++++++++++++++++++++++++++++++------
+ poppler/Annot.h	|  20 ++---
+ poppler/FontInfo.cc	|   2 +-
+ poppler/PSOutputDev.cc |   2 +-
+ poppler/Page.cc	|   2 +-
  6 files changed, 221 insertions(+), 46 deletions(-)
 
 commit 65d574fdc009e45ad66d1d402d5e805e4e94f427
@@ -43828,9 +47013,9 @@ Date:	Sun Oct 16 14:30:16 2005 +0000
 
     Merge SplashFTFont.cc with xpdf 3.01 changes
 
- ChangeLog		|    1 +
- splash/SplashFTFont.cc |   64
- +++++++++++++++++++++++++++++++++---------------
+ ChangeLog		|  1 +
+ splash/SplashFTFont.cc | 64
+ ++++++++++++++++++++++++++++++++++----------------
  2 files changed, 45 insertions(+), 20 deletions(-)
 
 commit f9d208e86433b213b21a75089f82fd00dcd746fc
@@ -43839,10 +47024,10 @@ Date:	Sun Oct 16 14:25:32 2005 +0000
 
     Merge SplashScreen.[cc|h] from xpdf 3.01
 
- ChangeLog		|    4 ++
- splash/SplashScreen.cc |  110
- +++++++++++++++++++++++++++++++-----------------
- splash/SplashScreen.h	|   12 +++++-
+ ChangeLog		|   4 ++
+ splash/SplashScreen.cc | 110
+ ++++++++++++++++++++++++++++++++-----------------
+ splash/SplashScreen.h	|  12 +++++-
  3 files changed, 87 insertions(+), 39 deletions(-)
 
 commit 7d46ac000316566503a27b5e5c68621be9c081d0
@@ -43851,8 +47036,8 @@ Date:	Sun Oct 16 14:19:47 2005 +0000
 
     Merging SplashXPathScanner.cc changes from xpdf 3.01
 
- splash/SplashXPathScanner.cc |   80
- +++++++++++++++++++++++-------------------
+ splash/SplashXPathScanner.cc | 80
+ ++++++++++++++++++++++++--------------------
  1 file changed, 43 insertions(+), 37 deletions(-)
 
 commit e34713a2187e05358f98e749ec2923210a40a862
@@ -43865,8 +47050,8 @@ Date:	Wed Oct 5 15:57:17 2005 +0000
 	    Fix another
 	    off-by-one page number error (#4555).
 
- ChangeLog	      |    5 +++++
- glib/poppler-page.cc |    2 +-
+ ChangeLog	      | 5 +++++
+ glib/poppler-page.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit fdd0934430ed251f9aeb45158b6ec95684b3e7b4
@@ -43879,8 +47064,8 @@ Date:	Mon Sep 26 19:29:45 2005 +0000
 
 	    Initialize window title even if the action is unknown
 
- ChangeLog		|    6 ++++++
- glib/poppler-action.cc |    5 +++--
+ ChangeLog		| 6 ++++++
+ glib/poppler-action.cc | 5 +++--
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 commit e9753049ddfbdf28df7a222d35eccdbcbcbc848d
@@ -43894,9 +47079,9 @@ Date:	Mon Sep 26 10:42:38 2005 +0000
 
 	    Implement launch action
 
- ChangeLog		|    7 +++++++
- glib/poppler-action.cc |   11 ++++++++---
- glib/poppler-action.h	|    1 +
+ ChangeLog		|  7 +++++++
+ glib/poppler-action.cc | 11 ++++++++---
+ glib/poppler-action.h	|  1 +
  3 files changed, 16 insertions(+), 3 deletions(-)
 
 commit ab18b2cb6d1c62bb91173d105e8631fe4ef1bcfb
@@ -43905,8 +47090,8 @@ Date:	Tue Sep 20 15:27:31 2005 +0000
 
     Parser.cc merges from xpdf 3.01
 
- ChangeLog	   |	1 +
- poppler/Parser.cc |   19 +++++++++++--------
+ ChangeLog	   |  1 +
+ poppler/Parser.cc | 19 +++++++++++--------
  2 files changed, 12 insertions(+), 8 deletions(-)
 
 commit cf6723caaed24615c3b8965cee9c433007f80d77
@@ -43915,9 +47100,9 @@ Date:	Tue Sep 20 15:08:52 2005 +0000
 
     TextPage *TextOutpudDev::takeText() from xpdf 3.01
 
- ChangeLog		  |    1 +
- poppler/TextOutputDev.cc |    8 ++++++++
- poppler/TextOutputDev.h  |    4 ++++
+ ChangeLog		  | 1 +
+ poppler/TextOutputDev.cc | 8 ++++++++
+ poppler/TextOutputDev.h  | 4 ++++
  3 files changed, 13 insertions(+)
 
 commit e0cbb0ca2c611ad5ac0267e46279c9d61450902a
@@ -43926,8 +47111,8 @@ Date:	Tue Sep 20 14:59:43 2005 +0000
 
     more 3.00 -> 3.01 merging
 
- ChangeLog	 |    1 +
- poppler/XRef.cc |    1 -
+ ChangeLog	 | 1 +
+ poppler/XRef.cc | 1 -
  2 files changed, 1 insertion(+), 1 deletion(-)
 
 commit 9c7adb318d395ff674c6febf6406a8d47e9e5bf6
@@ -43937,9 +47122,9 @@ Date:	Tue Sep 20 14:43:15 2005 +0000
 	    * poppler/UnicodeMap.cc: More grealloc -> greallocn
 	    * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01
 
- ChangeLog		     |	  2 ++
- poppler/UnicodeMap.cc	     |	  4 ++--
- poppler/UnicodeTypeTable.cc |	  4 ++--
+ ChangeLog		     | 2 ++
+ poppler/UnicodeMap.cc	     | 4 ++--
+ poppler/UnicodeTypeTable.cc | 4 ++--
  3 files changed, 6 insertions(+), 4 deletions(-)
 
 commit 2c4c9b855b0df1dc0836d4f44e9471215a419ea6
@@ -43948,9 +47133,9 @@ Date:	Tue Sep 20 14:34:31 2005 +0000
 
     Merge link.cc changes from xpdf 3.00 -> 3.01
 
- ChangeLog	 |    1 +
- poppler/Link.cc |   64
- ++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ ChangeLog	 |  1 +
+ poppler/Link.cc | 64
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
  2 files changed, 62 insertions(+), 3 deletions(-)
 
 commit 4e9490c0219dd9c99ba0e5533c96663b8570a87b
@@ -43963,10 +47148,10 @@ Date:	Tue Sep 20 14:00:43 2005 +0000
     Remove a setEncryption from the Xref.h marco probably forgot to
     remove when merging
 
- ChangeLog		 |    3 +++
- poppler/GlobalParams.cc |   41 +++++++++++++++++++++++++++++++++++++++++
- poppler/GlobalParams.h  |   22 ++++++++++++++++------
- poppler/XRef.h		 |    4 ----
+ ChangeLog		 |  3 +++
+ poppler/GlobalParams.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ poppler/GlobalParams.h  | 22 ++++++++++++++++------
+ poppler/XRef.h		 |  4 ----
  4 files changed, 60 insertions(+), 10 deletions(-)
 
 commit 22da021bf69d83d641e3f30cc0e1bd62394e56a4
@@ -43979,8 +47164,8 @@ Date:	Tue Sep 20 13:23:08 2005 +0000
 
 	    Remove duplicated initialization
 
- ChangeLog	 |    6 ++++++
- poppler/XRef.cc |    4 ----
+ ChangeLog	 | 6 ++++++
+ poppler/XRef.cc | 4 ----
  2 files changed, 6 insertions(+), 4 deletions(-)
 
 commit 2a8778147938e3ed2af177226a9c35655f898c95
@@ -43993,8 +47178,8 @@ Date:	Tue Sep 20 10:18:57 2005 +0000
 
 	    s/G/Goo in not yet compiled plugins code
 
- ChangeLog		 |    6 ++++++
- poppler/GlobalParams.cc |    8 ++++----
+ ChangeLog		 | 6 ++++++
+ poppler/GlobalParams.cc | 8 ++++----
  2 files changed, 10 insertions(+), 4 deletions(-)
 
 commit 16f720b87cfc491db585dbdc99236cf492ffe85b
@@ -44011,9 +47196,9 @@ Date:	Tue Sep 20 09:57:41 2005 +0000
 
 	    Fixup
 
- ChangeLog		  |   10 ++++++++++
- poppler/Makefile.am	  |    4 +++-
- poppler/XpdfPluginAPI.cc |    2 +-
+ ChangeLog		  | 10 ++++++++++
+ poppler/Makefile.am	  |  4 +++-
+ poppler/XpdfPluginAPI.cc |  2 +-
  3 files changed, 14 insertions(+), 2 deletions(-)
 
 commit 5f30791c3d87315ad1f742de64d2c1351ca70cb7
@@ -44022,7 +47207,7 @@ Date:	Fri Sep 16 19:33:28 2005 +0000
 
     *** empty log message ***
 
- ChangeLog |	9 +++++++++
+ ChangeLog | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit db62e07fcf57f45951b21f8aab44b0d943efe5d0
@@ -44038,10 +47223,10 @@ Date:	Fri Sep 16 19:33:05 2005 +0000
 
 	    Merge more from 3.01
 
- poppler/PDFDoc.cc |   20 ++++++++++++++++----
- poppler/PDFDoc.h  |   19 +++++++++----------
- poppler/XRef.cc   |   13 +++++++++++--
- poppler/XRef.h    |	7 +++++--
+ poppler/PDFDoc.cc | 20 ++++++++++++++++----
+ poppler/PDFDoc.h  | 19 +++++++++----------
+ poppler/XRef.cc   | 13 +++++++++++--
+ poppler/XRef.h    |  7 +++++--
  4 files changed, 41 insertions(+), 18 deletions(-)
 
 commit 3acc7be594712fd0ce7ac07b7188d5b38b382782
@@ -44054,8 +47239,8 @@ Date:	Fri Sep 16 19:05:00 2005 +0000
 
 	    Merge some initialization that I lost before
 
- ChangeLog	 |    6 ++++++
- poppler/XRef.cc |    4 ++++
+ ChangeLog	 | 6 ++++++
+ poppler/XRef.cc | 4 ++++
  2 files changed, 10 insertions(+)
 
 commit 3badd82b72b2768be27e309b048cd8dcb1c80038
@@ -44068,8 +47253,8 @@ Date:	Fri Sep 16 18:46:37 2005 +0000
 
 	    Merge change from 3.01
 
- ChangeLog	 |    6 ++++++
- poppler/XRef.cc |    8 --------
+ ChangeLog	 | 6 ++++++
+ poppler/XRef.cc | 8 --------
  2 files changed, 6 insertions(+), 8 deletions(-)
 
 commit 5474583e20ca773befa17242d4ad7b8f81d5bf99
@@ -44083,9 +47268,9 @@ Date:	Fri Sep 16 18:38:58 2005 +0000
 
 	    Improvements from xpdf 3.01
 
- ChangeLog		      |    7 +++++++
- poppler/CharCodeToUnicode.cc |   31 +++++++++++++++++++------------
- poppler/CharCodeToUnicode.h  |    4 ++++
+ ChangeLog		      |  7 +++++++
+ poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++------------
+ poppler/CharCodeToUnicode.h  |  4 ++++
  3 files changed, 30 insertions(+), 12 deletions(-)
 
 commit b2a6eab113fecd3823885c64f3302bea4f372a9f
@@ -44098,8 +47283,8 @@ Date:	Fri Sep 16 18:37:29 2005 +0000
 
 	    Improvements from xpdf 3.01
 
- ChangeLog	 |    6 ++++++
- poppler/CMap.cc |   30 +++++++++++++++++++++++++++---
+ ChangeLog	 |  6 ++++++
+ poppler/CMap.cc | 30 +++++++++++++++++++++++++++---
  2 files changed, 33 insertions(+), 3 deletions(-)
 
 commit 3f69f2158453b9dab9efc280ed1578ac3d0cebe8
@@ -44114,11 +47299,11 @@ Date:	Fri Sep 16 18:35:29 2005 +0000
 
 	    Merge some unicode table changes from xpdf 3.01
 
- ChangeLog		      |    8 +
- poppler/NameToUnicodeTable.h |  168 +++++-----
- poppler/UnicodeTypeTable.cc  |  690
- ++++++++++++++++++++++++++++++++++++++++--
- poppler/UnicodeTypeTable.h   |    2 +
+ ChangeLog		      |   8 +
+ poppler/NameToUnicodeTable.h | 168 +++++------
+ poppler/UnicodeTypeTable.cc  | 690
+ +++++++++++++++++++++++++++++++++++++++++--
+ poppler/UnicodeTypeTable.h   |   2 +
  4 files changed, 764 insertions(+), 104 deletions(-)
 
 commit 6cbe76bc55d557fe5fca0f8f1b33bda95acdc0e9
@@ -44133,10 +47318,10 @@ Date:	Fri Sep 16 18:32:29 2005 +0000
 
 	    Modified region support from xpdf 3.01
 
- ChangeLog		   |	8 ++++++++
- poppler/SplashOutputDev.h |	5 +++++
- splash/Splash.cc	   |   31 +++++++++++++++++++++++++++++++
- splash/Splash.h	   |   11 +++++++++++
+ ChangeLog		   |  8 ++++++++
+ poppler/SplashOutputDev.h |  5 +++++
+ splash/Splash.cc	   | 31 +++++++++++++++++++++++++++++++
+ splash/Splash.h	   | 11 +++++++++++
  4 files changed, 55 insertions(+)
 
 commit a9df3f3203c14161e5d6bc6048ec7e123536e6d3
@@ -44165,32 +47350,31 @@ Date:	Fri Sep 16 18:29:18 2005 +0000
 
 	    Merge security plugins support from xpdf 3.01
 
- ChangeLog		     |	 24 +++
- goo/FixedPoint.cc	     |	 95 +++++++++++
- goo/FixedPoint.h	     |	150 +++++++++++++++++
- goo/Makefile.am	     |	  6 +-
- poppler/DCTStream.h	     |	  2 -
- poppler/Decrypt.cc	     |	 23 ++-
- poppler/Decrypt.h	     |	  6 +-
- poppler/FlateStream.h	     |	  2 -
- poppler/GlobalParams.cc     |	229 ++++++++++++++++++++++++++
- poppler/GlobalParams.h      |	 16 ++
- poppler/Makefile.am	     |	  5 +-
- poppler/PDFDoc.cc	     |	 36 +++++
- poppler/PDFDoc.h	     |	  1 +
- poppler/Parser.cc	     |	 20 ---
- poppler/Parser.h	     |	  4 -
- poppler/SecurityHandler.cc  |	376
- +++++++++++++++++++++++++++++++++++++++++++
- poppler/SecurityHandler.h   |	157 ++++++++++++++++++
- poppler/Stream.cc	     |	 18 ---
- poppler/Stream.h	     |	  8 -
- poppler/XRef.cc	     |	162 ++-----------------
- poppler/XRef.h		     |	 13 +-
- poppler/XpdfPluginAPI.cc    |	262 ++++++++++++++++++++++++++++++
- poppler/XpdfPluginAPI.h     |	341
- +++++++++++++++++++++++++++++++++++++++
- poppler/poppler-config.h.in |	  2 -
+ ChangeLog		     |	24 +++
+ goo/FixedPoint.cc	     |	95 +++++++++++
+ goo/FixedPoint.h	     | 150 ++++++++++++++++++
+ goo/Makefile.am	     |	 6 +-
+ poppler/DCTStream.h	     |	 2 -
+ poppler/Decrypt.cc	     |	23 ++-
+ poppler/Decrypt.h	     |	 6 +-
+ poppler/FlateStream.h	     |	 2 -
+ poppler/GlobalParams.cc     | 229 +++++++++++++++++++++++++++
+ poppler/GlobalParams.h      |	16 ++
+ poppler/Makefile.am	     |	 5 +-
+ poppler/PDFDoc.cc	     |	36 +++++
+ poppler/PDFDoc.h	     |	 1 +
+ poppler/Parser.cc	     |	20 ---
+ poppler/Parser.h	     |	 4 -
+ poppler/SecurityHandler.cc  | 376
+ ++++++++++++++++++++++++++++++++++++++++++++
+ poppler/SecurityHandler.h   | 157 ++++++++++++++++++
+ poppler/Stream.cc	     |	18 ---
+ poppler/Stream.h	     |	 8 -
+ poppler/XRef.cc	     | 162 ++-----------------
+ poppler/XRef.h		     |	13 +-
+ poppler/XpdfPluginAPI.cc    | 262 ++++++++++++++++++++++++++++++
+ poppler/XpdfPluginAPI.h     | 341 +++++++++++++++++++++++++++++++++++++++
+ poppler/poppler-config.h.in |	 2 -
  24 files changed, 1737 insertions(+), 221 deletions(-)
 
 commit a777e5c26483b90d0910e85c2be666640835d0bf
@@ -44208,12 +47392,12 @@ Date:	Fri Sep 16 18:21:38 2005 +0000
 
 	    Merge support for fixed point
 
- ChangeLog		|   11 +++++++++++
- configure.ac		|    4 ++++
- splash/Makefile.am	|    1 +
- splash/SplashFTFont.cc |    7 +++++++
- splash/SplashMath.h	|   34 +++++++++++++++++++++++++++++++++-
- splash/SplashTypes.h	|    5 +++++
+ ChangeLog		| 11 +++++++++++
+ configure.ac		|  4 ++++
+ splash/Makefile.am	|  1 +
+ splash/SplashFTFont.cc |  7 +++++++
+ splash/SplashMath.h	| 34 +++++++++++++++++++++++++++++++++-
+ splash/SplashTypes.h	|  5 +++++
  6 files changed, 61 insertions(+), 1 deletion(-)
 
 commit 00457c5f44a246c9f867a114a72be9f7b2dc1cf5
@@ -44229,11 +47413,11 @@ Date:	Fri Sep 16 18:11:14 2005 +0000
 
 	    Use mallocn when possible
 
- ChangeLog		    |	 9 +++++++++
- poppler/ArthurOutputDev.cc |	 2 +-
- poppler/CairoFontEngine.cc |	 4 ++--
- poppler/TextOutputDev.cc   |	 2 +-
- poppler/UnicodeMap.cc	    |	 2 +-
+ ChangeLog		    | 9 +++++++++
+ poppler/ArthurOutputDev.cc | 2 +-
+ poppler/CairoFontEngine.cc | 4 ++--
+ poppler/TextOutputDev.cc   | 2 +-
+ poppler/UnicodeMap.cc	    | 2 +-
  5 files changed, 14 insertions(+), 5 deletions(-)
 
 commit 09c9ff67ceae5753811a2f625e3ad810628c782e
@@ -44242,9 +47426,9 @@ Date:	Fri Sep 16 18:00:43 2005 +0000
 
     SplashXPath.cc merges from xpdf 3.00 -> 3.01
 
- ChangeLog	       |    3 ++
- splash/SplashXPath.cc |   81
- ++++++++++++++++++++++++-------------------------
+ ChangeLog	       |  3 ++
+ splash/SplashXPath.cc | 81
+ +++++++++++++++++++++++++--------------------------
  2 files changed, 42 insertions(+), 42 deletions(-)
 
 commit 0555ba861d3b84d88c80da4fa247274338ff7817
@@ -44253,7 +47437,7 @@ Date:	Fri Sep 16 17:42:56 2005 +0000
 
     SplashFontEngine.cc merge from xpdf 3.00 -> 3.01
 
- splash/SplashFontEngine.cc |	 8 ++++++++
+ splash/SplashFontEngine.cc | 8 ++++++++
  1 file changed, 8 insertions(+)
 
 commit ddc72bd8354168d992631d1ef8cd0939b428966c
@@ -44262,8 +47446,8 @@ Date:	Thu Sep 15 22:24:55 2005 +0000
 
     Merge xpdf 3.00 -> 3.01 changes in SplashT1Font.* files
 
- splash/SplashT1Font.cc |   23 ++++++++++++++++++-----
- splash/SplashT1Font.h	|    2 ++
+ splash/SplashT1Font.cc | 23 ++++++++++++++++++-----
+ splash/SplashT1Font.h	|  2 ++
  2 files changed, 20 insertions(+), 5 deletions(-)
 
 commit ba409db3157105f326b4bbc342ca7af859a44ce9
@@ -44272,8 +47456,8 @@ Date:	Thu Sep 15 22:20:37 2005 +0000
 
     Merge xpdf 3.00 -> 3.01 changes in SplashPath.* files
 
- splash/SplashPath.cc |    3 ++-
- splash/SplashPath.h  |    5 +++++
+ splash/SplashPath.cc | 3 ++-
+ splash/SplashPath.h  | 5 +++++
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 3ea00e853049d8c26ee88aaef8ea6c47c8d46956
@@ -44282,8 +47466,8 @@ Date:	Thu Sep 15 22:15:47 2005 +0000
 
     Merge xpdf 3.00 -> 3.01 changes in SplashFont.* files
 
- splash/SplashFont.cc |    6 ++++++
- splash/SplashFont.h  |   10 +++++++++-
+ splash/SplashFont.cc |  6 ++++++
+ splash/SplashFont.h  | 10 +++++++++-
  2 files changed, 15 insertions(+), 1 deletion(-)
 
 commit e571dcbfd0c77a28e41710577859f632cc989de5
@@ -44293,12 +47477,12 @@ Date:	Thu Sep 15 22:09:50 2005 +0000
     Merge the xpdf 3.01 change that uses runtime detection of freetype
     version
 
- ChangeLog		      |    6 ++++++
- configure.ac		      |   14 +++-----------
- poppler/CairoFontEngine.cc   |   21 ++++++++++++++-------
- poppler/CairoFontEngine.h    |    3 ++-
- splash/SplashFTFontEngine.cc |   19 +++++++++++--------
- splash/SplashFTFontEngine.h  |    1 +
+ ChangeLog		      |  6 ++++++
+ configure.ac		      | 14 +++-----------
+ poppler/CairoFontEngine.cc   | 21 ++++++++++++++-------
+ poppler/CairoFontEngine.h    |  3 ++-
+ splash/SplashFTFontEngine.cc | 19 +++++++++++--------
+ splash/SplashFTFontEngine.h  |  1 +
  6 files changed, 37 insertions(+), 27 deletions(-)
 
 commit 59fe2937db192dc7b59bf28c3f29909faf11aae3
@@ -44307,7 +47491,7 @@ Date:	Thu Sep 15 21:51:16 2005 +0000
 
     Merge xpdf 3.00 -> 3.01 changes for that file
 
- splash/SplashClip.h |	  9 +++++++++
+ splash/SplashClip.h | 9 +++++++++
  1 file changed, 9 insertions(+)
 
 commit b2f94635249f2c5f0c876a1005826fe4c6eb6025
@@ -44316,8 +47500,8 @@ Date:	Thu Sep 15 12:52:36 2005 +0000
 
     Merge xpdf 3.00 -> xpdf 3.01 changes for Catalog.[cc|h]
 
- poppler/Catalog.cc |	 5 ++++-
- poppler/Catalog.h  |	 3 +++
+ poppler/Catalog.cc | 5 ++++-
+ poppler/Catalog.h  | 3 +++
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 0fc2e70576b1c48cf47a686e8aa7e202a802bc9d
@@ -44326,8 +47510,8 @@ Date:	Thu Sep 15 12:32:25 2005 +0000
 
     Another small merge from xpdf 3.01
 
- ChangeLog	    |	 3 +++
- poppler/Outline.cc |	 6 +++---
+ ChangeLog	    | 3 +++
+ poppler/Outline.cc | 6 +++---
  2 files changed, 6 insertions(+), 3 deletions(-)
 
 commit f8983ceb3c55df72c94870806d71db139c11bdeb
@@ -44336,7 +47520,7 @@ Date:	Thu Sep 15 12:28:34 2005 +0000
 
     Another small xpdf 3.00 -> xpdf 3.01 merge
 
- poppler/Object.cc |	2 +-
+ poppler/Object.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 52efe9845cf3eb1dd836f90bfa203760baa2f87c
@@ -44346,7 +47530,7 @@ Date:	Thu Sep 15 11:46:56 2005 +0000
     bradh forgot to remove the two returns when merging xpdf 3.00 ->
     xpdf 3.01 changes of this file
 
- poppler/JPXStream.cc |    2 --
+ poppler/JPXStream.cc | 2 --
  1 file changed, 2 deletions(-)
 
 commit 4b4fc5c017bf147c9069bbce32fc14467bd2a81a
@@ -44358,15 +47542,15 @@ Date:	Wed Sep 14 21:20:36 2005 +0000
     that uses this api not the whole file). All our fixes in that dir
     are included in the upgrade.
 
- ChangeLog		|    4 +
- fofi/FoFiTrueType.cc	|  406
- ++++++++++++++++++++++++++++++++++++++++++------
- fofi/FoFiTrueType.h	|   15 +-
- fofi/FoFiType1.cc	|   25 ++-
- fofi/FoFiType1C.cc	|  134 +++++++++++++---
- fofi/FoFiType1C.h	|    6 +
- poppler/PSOutputDev.cc |    7 +-
- poppler/PSOutputDev.h	|    3 +-
+ ChangeLog		|   4 +
+ fofi/FoFiTrueType.cc	| 406
+ +++++++++++++++++++++++++++++++++++++++++++------
+ fofi/FoFiTrueType.h	|  15 +-
+ fofi/FoFiType1.cc	|  25 ++-
+ fofi/FoFiType1C.cc	| 134 +++++++++++++---
+ fofi/FoFiType1C.h	|   6 +
+ poppler/PSOutputDev.cc |   7 +-
+ poppler/PSOutputDev.h	|   3 +-
  8 files changed, 515 insertions(+), 85 deletions(-)
 
 commit a68e8e6330418b1f623867973b9c128a9a139c0c
@@ -44382,9 +47566,9 @@ Date:	Wed Sep 7 03:00:36 2005 +0000
 
 	    * test/Makefile.am (EXTRA_DIST): Add pdf-operators.c
 
- ChangeLog	  |    8 ++++++++
- configure.ac	  |   17 ++---------------
- test/Makefile.am |    3 +++
+ ChangeLog	  |  8 ++++++++
+ configure.ac	  | 17 ++---------------
+ test/Makefile.am |  3 +++
  3 files changed, 13 insertions(+), 15 deletions(-)
 
 commit b6490944c081ff53f623acea7ab7a600c3e54816
@@ -44393,27 +47577,27 @@ Date:	Sat Sep 3 11:53:44 2005 +0000
 
     Switch the qt4/tests unittests to use QtTestLib.
 
- ChangeLog				 |    6 ++
- configure.ac				 |   66 ++++++++++++++++++++
- qt4/tests/.cvsignore			 |   17 ++----
- qt4/tests/Makefile.am			 |   71 +++++++---------------
- qt4/tests/README.unittest		 |   23 +++++++
- qt4/tests/check_author.cpp		 |   25 --------
- qt4/tests/check_linearised.cpp		 |   23 -------
- qt4/tests/check_metadata.cpp		 |  101
- +++++++++++++++++++++++++++++++
- qt4/tests/check_orientation.cpp	 |   40 ------------
- qt4/tests/check_pagelayout.cpp		 |   44 ++++++++++++++
- qt4/tests/check_pagelayout_facing.cpp	 |   22 -------
- qt4/tests/check_pagelayout_none.cpp	 |   22 -------
- qt4/tests/check_pagelayout_single.cpp	 |   22 -------
- qt4/tests/check_pagemode.cpp		 |   64 ++++++++++++++++++++
- qt4/tests/check_pagemode_attach.cpp	 |   22 -------
- qt4/tests/check_pagemode_fullscreen.cpp |   22 -------
- qt4/tests/check_pagemode_none.cpp	 |   22 -------
- qt4/tests/check_pagemode_oc.cpp	 |   22 -------
- qt4/tests/check_pagemode_thumbs.cpp	 |   22 -------
- qt4/tests/check_permissions.cpp	 |   60 +++++++-----------
+ ChangeLog				 |   6 ++
+ configure.ac				 |  66 +++++++++++++++++++++
+ qt4/tests/.cvsignore			 |  17 ++----
+ qt4/tests/Makefile.am			 |  71 ++++++++--------------
+ qt4/tests/README.unittest		 |  23 ++++++++
+ qt4/tests/check_author.cpp		 |  25 --------
+ qt4/tests/check_linearised.cpp		 |  23 --------
+ qt4/tests/check_metadata.cpp		 | 101
+ ++++++++++++++++++++++++++++++++
+ qt4/tests/check_orientation.cpp	 |  40 -------------
+ qt4/tests/check_pagelayout.cpp		 |  44 ++++++++++++++
+ qt4/tests/check_pagelayout_facing.cpp	 |  22 -------
+ qt4/tests/check_pagelayout_none.cpp	 |  22 -------
+ qt4/tests/check_pagelayout_single.cpp	 |  22 -------
+ qt4/tests/check_pagemode.cpp		 |  64 ++++++++++++++++++++
+ qt4/tests/check_pagemode_attach.cpp	 |  22 -------
+ qt4/tests/check_pagemode_fullscreen.cpp |  22 -------
+ qt4/tests/check_pagemode_none.cpp	 |  22 -------
+ qt4/tests/check_pagemode_oc.cpp	 |  22 -------
+ qt4/tests/check_pagemode_thumbs.cpp	 |  22 -------
+ qt4/tests/check_permissions.cpp	 |  60 +++++++------------
  20 files changed, 354 insertions(+), 362 deletions(-)
 
 commit 3725841417871d1051772068833dc908ca70b7ce
@@ -44424,8 +47608,8 @@ Date:	Fri Sep 2 14:47:24 2005 +0000
 
 	    * glib/poppler-page.cc: Apply Marcos rotation fix.
 
- ChangeLog	      |    4 ++++
- glib/poppler-page.cc |    5 ++++-
+ ChangeLog	      | 4 ++++
+ glib/poppler-page.cc | 5 ++++-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit ecf3dcadb948013cbc987e464952933daf78e4bf
@@ -44435,14 +47619,14 @@ Date:	Wed Aug 31 15:28:46 2005 +0000
     Merge some missing parts of previous patches, and some other minor
     cleanups from xpdf 3.0.1
 
- poppler/Catalog.cc	|   16 +-
- poppler/JPXStream.cc	|  380
- ++++++++++++++++++++++++++++++++----------------
- poppler/JPXStream.h	|   25 +++-
- poppler/Lexer.cc	|   11 ++
- poppler/Lexer.h	|    3 +
- poppler/PSOutputDev.cc |   31 ++--
- poppler/Stream.h	|    7 +
+ poppler/Catalog.cc	|  16 +--
+ poppler/JPXStream.cc	| 380
+ +++++++++++++++++++++++++++++++++----------------
+ poppler/JPXStream.h	|  25 ++--
+ poppler/Lexer.cc	|  11 ++
+ poppler/Lexer.h	|   3 +
+ poppler/PSOutputDev.cc |  31 ++--
+ poppler/Stream.h	|   7 +
  7 files changed, 309 insertions(+), 164 deletions(-)
 
 commit de78738164319b733e54a9abfb5957870facd6cd
@@ -44455,12 +47639,12 @@ Date:	Wed Aug 31 09:51:41 2005 +0000
     poppler/JBIG2Stream.h: merge in some of the JBIG2 changes from
     xpdf 3.0.1.
 
- ChangeLog		       |    9 ++
- poppler/JArithmeticDecoder.cc |   42 ++++++--
- poppler/JArithmeticDecoder.h  |   22 +++-
- poppler/JBIG2Stream.cc        |  227
- +++++++++++++++++++++++++----------------
- poppler/JBIG2Stream.h	       |    4 +-
+ ChangeLog		       |   9 ++
+ poppler/JArithmeticDecoder.cc |  42 ++++++--
+ poppler/JArithmeticDecoder.h  |  22 +++-
+ poppler/JBIG2Stream.cc        | 227
+ +++++++++++++++++++++++++-----------------
+ poppler/JBIG2Stream.h	       |   4 +-
  5 files changed, 201 insertions(+), 103 deletions(-)
 
 commit 55952feb637e300b073691ae95d68e766521a769
@@ -44474,8 +47658,8 @@ Date:	Mon Aug 29 15:24:32 2005 +0000
 	    HAVE_FREETYPE_217_OR_OLDER to 0 if we found freetype using
 	    pkg-config (#4223).
 
- ChangeLog    |    6 ++++++
- configure.ac |    2 +-
+ ChangeLog    | 6 ++++++
+ configure.ac | 2 +-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 244e5c1f8f65da41ba6314028766dfe5973f6132
@@ -44487,17 +47671,17 @@ Date:	Sun Aug 28 09:43:18 2005 +0000
     tweaking
     by me.
 
- ChangeLog	      |   13 ++++++++
- fofi/FoFiTrueType.cc |    1 +
- goo/GooHash.cc       |   24 ++++++++++++++
- goo/GooHash.h	      |    2 ++
- goo/GooList.cc       |    5 +++
- goo/GooList.h	      |    5 +++
- goo/GooString.cc     |   85
- +++++++++++++++++++++++++++++++++++++++++++++++++-
- goo/GooString.h      |   11 +++----
- goo/gmem.c	      |    3 ++
- poppler/Decrypt.cc   |    1 +
+ ChangeLog	      | 13 ++++++++
+ fofi/FoFiTrueType.cc |  1 +
+ goo/GooHash.cc       | 24 +++++++++++++++
+ goo/GooHash.h	      |  2 ++
+ goo/GooList.cc       |  5 ++++
+ goo/GooList.h	      |  5 ++++
+ goo/GooString.cc     | 85
+ +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ goo/GooString.h      | 11 +++----
+ goo/gmem.c	      |  3 ++
+ poppler/Decrypt.cc   |  1 +
  10 files changed, 142 insertions(+), 8 deletions(-)
 
 commit eb91b274245b4f5f5389bc9ddfde2c2806557665
@@ -44506,8 +47690,8 @@ Date:	Sun Aug 28 09:31:53 2005 +0000
 
     This part of my previous gmallocn merge patch was missing.
 
- goo/GooHash.cc |    4 ++--
- goo/GooList.cc |    8 ++++----
+ goo/GooHash.cc | 4 ++--
+ goo/GooList.cc | 8 ++++----
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 commit b3474fd5e0efc96b5814d86e0cdedf39387e7ae3
@@ -44516,7 +47700,7 @@ Date:	Sun Aug 28 03:26:53 2005 +0000
 
     add note about related bug
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit ace2eb6ba518b970b96f30f61c4795c161e0cb79
@@ -44527,8 +47711,8 @@ Date:	Sun Aug 28 03:22:04 2005 +0000
 
 	* poppler/FlateStream.cc: Fix predictor leak.
 
- ChangeLog		|    4 ++++
- poppler/FlateStream.cc |    1 +
+ ChangeLog		| 4 ++++
+ poppler/FlateStream.cc | 1 +
  2 files changed, 5 insertions(+)
 
 commit 96657c5480bf2ecf445ad5a105b8e7393ae53c8b
@@ -44539,8 +47723,8 @@ Date:	Sun Aug 28 03:19:55 2005 +0000
 
 	* configure.ac: Disable the zlib-based decoder by default.
 
- ChangeLog    |    4 ++++
- configure.ac |    2 +-
+ ChangeLog    | 4 ++++
+ configure.ac | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit d1d715158223c7ca3ae279cea420a948cfdb0428
@@ -44552,42 +47736,42 @@ Date:	Sat Aug 27 08:43:42 2005 +0000
     tweaking by me. There may be some residual gmallocn changes still to
     be merged.
 
- ChangeLog		       |    7 ++++++
- fofi/FoFiTrueType.cc	       |   12 ++++-----
- fofi/FoFiType1.cc	       |    2 +-
- fofi/FoFiType1C.cc	       |   14 +++++------
- goo/gmem.c		       |   22 +++++++++++++++++
- goo/gmem.h		       |    9 +++++++
- poppler/Annot.cc	       |    2 +-
- poppler/Array.cc	       |    2 +-
- poppler/BuiltinFont.cc        |    2 +-
- poppler/CMap.cc	       |    6 ++---
- poppler/Catalog.cc	       |    8 +++---
- poppler/CharCodeToUnicode.cc  |   22 ++++++++---------
- poppler/Dict.cc	       |    2 +-
- poppler/Function.cc	       |   20 +++++++--------
- poppler/Gfx.cc		       |    2 +-
- poppler/GfxFont.cc	       |   24 +++++++++---------
- poppler/GfxState.cc	       |   54
- ++++++++++++++++++++---------------------
- poppler/JArithmeticDecoder.cc |    2 +-
- poppler/JBIG2Stream.cc        |   30 +++++++++++------------
- poppler/Link.cc	       |    6 ++---
- poppler/NameToCharCode.cc     |    4 +--
- poppler/Outline.cc	       |    4 +--
- poppler/SplashOutputDev.cc    |    8 +++---
- poppler/Stream.cc	       |   12 ++++-----
- poppler/TextOutputDev.cc      |   48 ++++++++++++++++++------------------
- poppler/XRef.cc	       |   18 +++++++-------
- splash/SplashClip.cc	       |   12 ++++-----
- splash/SplashFTFontFile.cc    |    2 +-
- splash/SplashFont.cc	       |    6 ++---
- splash/SplashPath.cc	       |    8 +++---
- splash/SplashScreen.cc        |    4 +--
- splash/SplashState.cc	       |    4 +--
- splash/SplashT1FontFile.cc    |    4 +--
- splash/SplashXPath.cc	       |    4 +--
- splash/SplashXPathScanner.cc  |    4 +--
+ ChangeLog		       |  7 ++++++
+ fofi/FoFiTrueType.cc	       | 12 +++++-----
+ fofi/FoFiType1.cc	       |  2 +-
+ fofi/FoFiType1C.cc	       | 14 +++++------
+ goo/gmem.c		       | 22 ++++++++++++++++++
+ goo/gmem.h		       |  9 ++++++++
+ poppler/Annot.cc	       |  2 +-
+ poppler/Array.cc	       |  2 +-
+ poppler/BuiltinFont.cc        |  2 +-
+ poppler/CMap.cc	       |  6 ++---
+ poppler/Catalog.cc	       |  8 +++----
+ poppler/CharCodeToUnicode.cc  | 22 +++++++++---------
+ poppler/Dict.cc	       |  2 +-
+ poppler/Function.cc	       | 20 ++++++++--------
+ poppler/Gfx.cc		       |  2 +-
+ poppler/GfxFont.cc	       | 24 +++++++++----------
+ poppler/GfxState.cc	       | 54
+ +++++++++++++++++++++----------------------
+ poppler/JArithmeticDecoder.cc |  2 +-
+ poppler/JBIG2Stream.cc        | 30 ++++++++++++------------
+ poppler/Link.cc	       |  6 ++---
+ poppler/NameToCharCode.cc     |  4 ++--
+ poppler/Outline.cc	       |  4 ++--
+ poppler/SplashOutputDev.cc    |  8 +++----
+ poppler/Stream.cc	       | 12 +++++-----
+ poppler/TextOutputDev.cc      | 48 +++++++++++++++++++-------------------
+ poppler/XRef.cc	       | 18 +++++++--------
+ splash/SplashClip.cc	       | 12 +++++-----
+ splash/SplashFTFontFile.cc    |  2 +-
+ splash/SplashFont.cc	       |  6 ++---
+ splash/SplashPath.cc	       |  8 +++----
+ splash/SplashScreen.cc        |  4 ++--
+ splash/SplashState.cc	       |  4 ++--
+ splash/SplashT1FontFile.cc    |  4 ++--
+ splash/SplashXPath.cc	       |  4 ++--
+ splash/SplashXPathScanner.cc  |  4 ++--
  35 files changed, 214 insertions(+), 176 deletions(-)
 
 commit feb82c60b1f86a9d1260db57534d98c54ee615c4
@@ -44600,9 +47784,9 @@ Date:	Wed Aug 24 19:41:27 2005 +0000
 
     * test/.cvsignore: ignore pdf_inspector binary.
 
- ChangeLog	 |    8 ++++++++
- configure.ac	 |    2 +-
- test/.cvsignore |    7 ++++---
+ ChangeLog	 | 8 ++++++++
+ configure.ac	 | 2 +-
+ test/.cvsignore | 7 ++++---
  3 files changed, 13 insertions(+), 4 deletions(-)
 
 commit 8dce80eb74f24f07ac7668905f1631e04a9c5841
@@ -44620,11 +47804,11 @@ Date:	Wed Aug 24 18:57:46 2005 +0000
 	    (poppler_page_prepare_output_dev): Patch from Marco to fix
 	    rotation using the cairo backend.
 
- ChangeLog		  |   10 ++++++++++
- glib/poppler-page.cc	  |   22 ++++++++++++++++------
- glib/poppler-page.h	  |    1 +
- poppler/TextOutputDev.cc |   11 ++++++++---
- poppler/TextOutputDev.h  |    4 +++-
+ ChangeLog		  | 10 ++++++++++
+ glib/poppler-page.cc	  | 22 ++++++++++++++++------
+ glib/poppler-page.h	  |  1 +
+ poppler/TextOutputDev.cc | 11 ++++++++---
+ poppler/TextOutputDev.h  |  4 +++-
  5 files changed, 38 insertions(+), 10 deletions(-)
 
 commit b909b5ae98bc3e557ef6e658e2b9120e82951259
@@ -44636,8 +47820,8 @@ Date:	Wed Aug 24 03:21:20 2005 +0000
 	    * test/Makefile.am (gtk_cairo_test_LDADD): add
 	    FREETYPE_{CFLAGS,LIBS} to the cairo deps
 
- ChangeLog	  |    5 +++++
- test/Makefile.am |    4 +++-
+ ChangeLog	  | 5 +++++
+ test/Makefile.am | 4 +++-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit da3aac379f07ffedd6078707ec9923800fc0c0a5
@@ -44662,22 +47846,22 @@ Date:	Tue Aug 23 18:20:45 2005 +0000
 	    * test/pdf-operators.c: Initial cut at a pdf inspector.  This
 	    should help us look at PDF files.
 
- ChangeLog		  |   18 ++
- configure.ac		  |    4 +-
- poppler/Gfx.cc		  |   30 ++++
- poppler/Gfx.h		  |    1 +
- poppler/GlobalParams.cc  |   16 ++
- poppler/GlobalParams.h   |    3 +
- poppler/Makefile.am	  |    2 +
- poppler/OutputDev.cc	  |   17 ++
- poppler/OutputDev.h	  |   10 +-
- poppler/ProfileData.cc   |   44 +++++
- poppler/ProfileData.h	  |   41 +++++
- test/Makefile.am	  |   13 +-
- test/pdf-inspector.cc	  |  358 ++++++++++++++++++++++++++++++++++++++
- test/pdf-inspector.glade |  434
- ++++++++++++++++++++++++++++++++++++++++++++++
- test/pdf-operators.c	  |   81 +++++++++
+ ChangeLog		  |  18 ++
+ configure.ac		  |   4 +-
+ poppler/Gfx.cc		  |  30 ++++
+ poppler/Gfx.h		  |   1 +
+ poppler/GlobalParams.cc  |  16 ++
+ poppler/GlobalParams.h   |   3 +
+ poppler/Makefile.am	  |   2 +
+ poppler/OutputDev.cc	  |  17 ++
+ poppler/OutputDev.h	  |  10 +-
+ poppler/ProfileData.cc   |  44 +++++
+ poppler/ProfileData.h	  |  41 +++++
+ test/Makefile.am	  |  13 +-
+ test/pdf-inspector.cc	  | 358 ++++++++++++++++++++++++++++++++++++++
+ test/pdf-inspector.glade | 434
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ test/pdf-operators.c	  |  81 +++++++++
  15 files changed, 1068 insertions(+), 4 deletions(-)
 
 commit 1aad886c6c19a964a3fc9e18f31acc8e115478e0
@@ -44693,12 +47877,12 @@ Date:	Mon Aug 22 18:20:12 2005 +0000
 	    the glib
 	    rotation API.
 
- ChangeLog		  |    8 +++
- glib/poppler-page.cc	  |  136
- ++++++----------------------------------------
- glib/poppler-page.h	  |    4 +-
- glib/poppler-private.h   |    1 -
- glib/test-poppler-glib.c |    2 +-
+ ChangeLog		  |   8 +++
+ glib/poppler-page.cc	  | 136
+ +++++++----------------------------------------
+ glib/poppler-page.h	  |   4 +-
+ glib/poppler-private.h   |   1 -
+ glib/test-poppler-glib.c |   2 +-
  5 files changed, 28 insertions(+), 123 deletions(-)
 
 commit 6070b1dc4b76c236f3100fbd255c2d906e61c3c2
@@ -44712,9 +47896,9 @@ Date:	Sun Aug 21 23:14:04 2005 +0000
 	    * configure.ac: Make freetype check use pkg-config if
 	    possible.
 
- ChangeLog	     |	  6 ++++++
- configure.ac	     |	 34 ++++++++++++++++++++++++----------
- poppler/Makefile.am |	  1 +
+ ChangeLog	     |	6 ++++++
+ configure.ac	     | 34 ++++++++++++++++++++++++----------
+ poppler/Makefile.am |	1 +
  3 files changed, 31 insertions(+), 10 deletions(-)
 
 commit 2698ca6fa107ea91dc01eb8cfb0c93383fbca125
@@ -44729,8 +47913,8 @@ Date:	Wed Aug 17 16:54:01 2005 +0000
 	    specifies
 	    /MacRoman.
 
- ChangeLog	    |	 6 ++++++
- poppler/GfxFont.cc |	 1 -
+ ChangeLog	    | 6 ++++++
+ poppler/GfxFont.cc | 1 -
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 5dc9b14b99f2efa2fe018e9267dd363d1bcd78b1
@@ -44739,8 +47923,8 @@ Date:	Sun Aug 7 23:58:12 2005 +0000
 
     Fix EOF checking
 
- ChangeLog	   |	4 ++++
- poppler/PDFDoc.cc |   10 +++++++++-
+ ChangeLog	   |  4 ++++
+ poppler/PDFDoc.cc | 10 +++++++++-
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 commit 155d019d7b474f244a3e4bf64d192015f6a266c4
@@ -44753,9 +47937,9 @@ Date:	Sat Aug 6 18:09:51 2005 +0000
 	    * glib/poppler-page.h: Use GdkColor for specifying selection
 	    colors, we alreay depend on GDK anyway.
 
- ChangeLog	      |    6 ++++++
- glib/poppler-page.cc |   20 +++++++++-----------
- glib/poppler-page.h  |    5 +++--
+ ChangeLog	      |  6 ++++++
+ glib/poppler-page.cc | 20 +++++++++-----------
+ glib/poppler-page.h  |  5 +++--
  3 files changed, 18 insertions(+), 13 deletions(-)
 
 commit c710b645c8297d356c101b13a9889bcaba691176
@@ -44764,7 +47948,7 @@ Date:	Sat Aug 6 11:58:59 2005 +0000
 
     Update comment
 
- poppler/PDFDoc.cc |	2 +-
+ poppler/PDFDoc.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit de7953c8a8360d8bfc99298906c5fc1094684fc3
@@ -44773,8 +47957,8 @@ Date:	Sat Aug 6 11:47:37 2005 +0000
 
     Increase EOF searching up to last 1024 characters
 
- ChangeLog	   |	7 +++++++
- poppler/PDFDoc.cc |   23 +++++++++++++----------
+ ChangeLog	   |  7 +++++++
+ poppler/PDFDoc.cc | 23 +++++++++++++----------
  2 files changed, 20 insertions(+), 10 deletions(-)
 
 commit 5dd72618688763b50d5f5738d857c9294ef1b1c2
@@ -44783,9 +47967,9 @@ Date:	Sat Aug 6 02:15:58 2005 +0000
 
     Add password arguments to document constructor.
 
- ChangeLog		     |	  4 ++++
- qt4/src/poppler-document.cc |	  8 ++++++--
- qt4/src/poppler-qt4.h	     |	  4 +++-
+ ChangeLog		     | 4 ++++
+ qt4/src/poppler-document.cc | 8 ++++++--
+ qt4/src/poppler-qt4.h	     | 4 +++-
  3 files changed, 13 insertions(+), 3 deletions(-)
 
 commit edbd7957b393eb63f48df7db6b220b355d4fc461
@@ -44794,8 +47978,8 @@ Date:	Sat Aug 6 02:07:55 2005 +0000
 
     Make API extraction work again.
 
- ChangeLog	  |    3 +++
- qt4/src/Doxyfile |    2 +-
+ ChangeLog	  | 3 +++
+ qt4/src/Doxyfile | 2 +-
  2 files changed, 4 insertions(+), 1 deletion(-)
 
 commit f43a6f1d1c27c042f5736746c94430083baa4c1d
@@ -44804,11 +47988,11 @@ Date:	Sat Aug 6 01:53:06 2005 +0000
 
     Add new test code for encrypted files.
 
- ChangeLog			 |    5 ++
- qt4/tests/.cvsignore		 |    1 +
- qt4/tests/Makefile.am		 |    7 +-
- qt4/tests/test-password-qt4.cpp |  135
- +++++++++++++++++++++++++++++++++++++++
+ ChangeLog			 |   5 ++
+ qt4/tests/.cvsignore		 |   1 +
+ qt4/tests/Makefile.am		 |   7 ++-
+ qt4/tests/test-password-qt4.cpp | 135
+ ++++++++++++++++++++++++++++++++++++++++
  4 files changed, 147 insertions(+), 1 deletion(-)
 
 commit 2ec26afaf80864b023899b890b8e229448da9bed
@@ -44823,11 +48007,11 @@ Date:	Fri Aug 5 22:30:20 2005 +0000
 	    * poppler/GfxState.cc:
 	    * poppler/GfxState.h: Add simple Matrix class.
 
- ChangeLog		   |	8 ++++++++
- poppler/CairoOutputDev.cc |	6 +++---
- poppler/GfxState.cc	   |   26 ++++++++++++++++++++++++++
- poppler/GfxState.h	   |   10 ++++++++++
- poppler/TextOutputDev.cc  |   14 ++++++++++++++
+ ChangeLog		   |  8 ++++++++
+ poppler/CairoOutputDev.cc |  6 +++---
+ poppler/GfxState.cc	   | 26 ++++++++++++++++++++++++++
+ poppler/GfxState.h	   | 10 ++++++++++
+ poppler/TextOutputDev.cc  | 14 ++++++++++++++
  5 files changed, 61 insertions(+), 3 deletions(-)
 
 commit ccba4f0773047eea5e4ad0ac736450160dd97664
@@ -44842,12 +48026,12 @@ Date:	Fri Aug 5 19:04:36 2005 +0000
 	    * poppler/TextOutputDev.h: Propagate selection colors to
 	    the glib API.
 
- ChangeLog		  |    7 ++++++
- glib/poppler-page.cc	  |   63
- ++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h	  |    4 ++-
- poppler/TextOutputDev.cc |   25 +++++++++---------
- poppler/TextOutputDev.h  |    7 ++++--
+ ChangeLog		  |  7 ++++++
+ glib/poppler-page.cc	  | 63
+ ++++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h	  |  4 ++-
+ poppler/TextOutputDev.cc | 25 +++++++++----------
+ poppler/TextOutputDev.h  |  7 ++++--
  5 files changed, 82 insertions(+), 24 deletions(-)
 
 commit 43e97129393f403c41f191ceae9a54793ece005f
@@ -44857,8 +48041,8 @@ Date:	Thu Aug 4 10:15:23 2005 +0000
     Fix problem with drawing filled objects that was introduced in
     Rev 1.4.
 
- ChangeLog		    |	 5 +++++
- poppler/ArthurOutputDev.cc |	13 +++++++++++--
+ ChangeLog		    |  5 +++++
+ poppler/ArthurOutputDev.cc | 13 +++++++++++--
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 commit a75d80333a70d2e1ac7c9032d316034eebed9dd6
@@ -44873,9 +48057,9 @@ Date:	Wed Aug 3 11:44:55 2005 +0000
 
     What more could you want from a PDF viewer :-)
 
- ChangeLog			|    6 +++++
- qt4/tests/test-poppler-qt4.cpp |   47
- +++++++++++++++++++++++++++++++---------
+ ChangeLog			|  6 ++++++
+ qt4/tests/test-poppler-qt4.cpp | 47
+ +++++++++++++++++++++++++++++++++---------
  2 files changed, 43 insertions(+), 10 deletions(-)
 
 commit f3e0a163b098da1cc389c2c4f47e28358b1bec77
@@ -44884,9 +48068,9 @@ Date:	Mon Aug 1 19:15:40 2005 +0000
 
     Fix problem in the patch to fix #3299
 
- ChangeLog	      |    4 ++++
- poppler/DCTStream.cc |   15 ++++++++++-----
- poppler/DCTStream.h  |    1 +
+ ChangeLog	      |  4 ++++
+ poppler/DCTStream.cc | 15 ++++++++++-----
+ poppler/DCTStream.h  |  1 +
  3 files changed, 15 insertions(+), 5 deletions(-)
 
 commit 5f7bd81bedd8c90e3312190256488ff0c15502e1
@@ -44901,8 +48085,8 @@ Date:	Mon Aug 1 15:21:19 2005 +0000
 	    alpha to
 	    0xff (opaque), not 0x00.
 
- ChangeLog	      |    7 +++++++
- glib/poppler-page.cc |    2 +-
+ ChangeLog	      | 7 +++++++
+ glib/poppler-page.cc | 2 +-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit 22f509e60f60ccaea1f91d9ec1ef7ba8200bee8a
@@ -44915,8 +48099,8 @@ Date:	Mon Aug 1 08:09:00 2005 +0000
     debugging
     code. The glyphs are still ugly though.
 
- ChangeLog		    |	 7 +++++++
- poppler/ArthurOutputDev.cc |	13 +------------
+ ChangeLog		    |  7 +++++++
+ poppler/ArthurOutputDev.cc | 13 +------------
  2 files changed, 8 insertions(+), 12 deletions(-)
 
 commit 7bf5d10c1f6edd538769c3a83a3b3d5df56d604b
@@ -44928,12 +48112,12 @@ Date:	Sun Jul 31 09:54:04 2005 +0000
     SplashPath. In the longer term, Arthur should use FreeType paths
     directly - hopefully that will be less ugly, and not fill everything.
 
- ChangeLog		    |	 8 +
- poppler/ArthurOutputDev.cc |  401
- ++++++++++++++++++++++++++++++++------------
- poppler/ArthurOutputDev.h  |	15 +-
- qt4/src/poppler-page.cc    |	 2 +-
- splash/SplashPath.h	    |	 2 +
+ ChangeLog		    |	8 +
+ poppler/ArthurOutputDev.cc | 401
+ ++++++++++++++++++++++++++++++++-------------
+ poppler/ArthurOutputDev.h  |  15 +-
+ qt4/src/poppler-page.cc    |	2 +-
+ splash/SplashPath.h	    |	2 +
  5 files changed, 314 insertions(+), 114 deletions(-)
 
 commit 8567b794628786b82e8db2a7daf75e4ad2398960
@@ -44942,11 +48126,11 @@ Date:	Fri Jul 29 12:15:19 2005 +0000
 
     Add some more test cases.
 
- ChangeLog			       |    4 ++++
- qt4/tests/.cvsignore		       |    4 ++++
- qt4/tests/Makefile.am		       |   10 +++++++++-
- qt4/tests/check_pagelayout_facing.cpp |   22 ++++++++++++++++++++++
- qt4/tests/check_version.cpp	       |   22 ++++++++++++++++++++++
+ ChangeLog			       |  4 ++++
+ qt4/tests/.cvsignore		       |  4 ++++
+ qt4/tests/Makefile.am		       | 10 +++++++++-
+ qt4/tests/check_pagelayout_facing.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_version.cpp	       | 22 ++++++++++++++++++++++
  5 files changed, 61 insertions(+), 1 deletion(-)
 
 commit 59d660cf4d614fdea09d6a62b8889f7682c2b4f9
@@ -44955,7 +48139,7 @@ Date:	Fri Jul 29 11:41:14 2005 +0000
 
     Compile fix associated with last change.
 
- poppler/ArthurOutputDev.cc |	 2 --
+ poppler/ArthurOutputDev.cc | 2 --
  1 file changed, 2 deletions(-)
 
 commit 88c57c73f57820d6a57e26825093fbc688845e67
@@ -44964,8 +48148,8 @@ Date:	Fri Jul 29 11:24:42 2005 +0000
 
     A couple of minor changes to the Arthur backend.
 
- ChangeLog		    |	 9 +++++++++
- poppler/ArthurOutputDev.cc |	18 ++++++++++++++----
+ ChangeLog		    |  9 +++++++++
+ poppler/ArthurOutputDev.cc | 18 ++++++++++++++----
  2 files changed, 23 insertions(+), 4 deletions(-)
 
 commit 481db9d9eae5ea16e5b382f4ad21e6e624a70dcf
@@ -44991,12 +48175,12 @@ Date:	Fri Jul 29 05:48:33 2005 +0000
 	    missing
 	    sentinel.
 
- ChangeLog		  |   16 +++++
- glib/poppler-document.cc |    2 +-
- glib/poppler-page.cc	  |   31 +++++----
- poppler/TextOutputDev.cc |  164
- +++++++++++++++++++++++++++++++++++-----------
- poppler/TextOutputDev.h  |    8 +++
+ ChangeLog		  |  16 +++++
+ glib/poppler-document.cc |   2 +-
+ glib/poppler-page.cc	  |  31 +++++----
+ poppler/TextOutputDev.cc | 164
+ +++++++++++++++++++++++++++++++++++------------
+ poppler/TextOutputDev.h  |   8 +++
  5 files changed, 164 insertions(+), 57 deletions(-)
 
 commit ad312dbded4e8f70c3a2eac9a0964fa00ecb6b2c
@@ -45005,9 +48189,9 @@ Date:	Thu Jul 28 22:56:17 2005 +0000
 
     Fix memory leaks in PageLabelInfo.cc
 
- ChangeLog		  |    4 ++++
- poppler/PageLabelInfo.cc |   11 +++++++++++
- poppler/PageLabelInfo.h  |    2 ++
+ ChangeLog		  |  4 ++++
+ poppler/PageLabelInfo.cc | 11 +++++++++++
+ poppler/PageLabelInfo.h  |  2 ++
  3 files changed, 17 insertions(+)
 
 commit b45ad9f3409d7b1ed147135a70553e5255913c61
@@ -45021,7 +48205,7 @@ Date:	Thu Jul 28 20:53:36 2005 +0000
     When assigning family if the font had "the proper info" and family
     had to be deleted, do it.
 
- poppler/GlobalParams.cc |    9 +++++++--
+ poppler/GlobalParams.cc | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 commit f93dfc5c5133e0b1bd9f4786cfe18bd796cbac2a
@@ -45030,7 +48214,7 @@ Date:	Thu Jul 28 18:51:17 2005 +0000
 
     Remove the debugging
 
- poppler/GlobalParams.cc |    5 -----
+ poppler/GlobalParams.cc | 5 -----
  1 file changed, 5 deletions(-)
 
 commit 8022315004e1623c0be320f7671fcd72c15c0de3
@@ -45039,7 +48223,7 @@ Date:	Thu Jul 28 18:37:17 2005 +0000
 
     Wonder how that slipped here
 
- poppler/GlobalParams.cc |    3 +--
+ poppler/GlobalParams.cc | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 commit 82638babe89e402c0348619ec3205059b977c7e9
@@ -45048,20 +48232,20 @@ Date:	Thu Jul 28 17:34:19 2005 +0000
 
     Fontconfig patch is here, rejoice
 
- ChangeLog		     |	 15 +-
- glib/poppler-document.cc    |	  1 -
- poppler/CairoFontEngine.cc  |	 95 +--------
- poppler/CairoFontEngine.h   |	  2 -
- poppler/CairoOutputDev.cc   |	  4 -
- poppler/GlobalParams.cc     |	473
- ++++++++++++++++++++-----------------------
- poppler/GlobalParams.h      |	 17 +-
- poppler/SplashOutputDev.cc  |	132 +-----------
- poppler/SplashOutputDev.h   |	  3 -
- qt/poppler-document.cc      |	  1 -
- qt4/src/poppler-document.cc |	  1 -
- test/gtk-cairo-test.cc      |	  1 -
- test/gtk-splash-test.cc     |	  1 -
+ ChangeLog		     |	15 +-
+ glib/poppler-document.cc    |	 1 -
+ poppler/CairoFontEngine.cc  |	95 +--------
+ poppler/CairoFontEngine.h   |	 2 -
+ poppler/CairoOutputDev.cc   |	 4 -
+ poppler/GlobalParams.cc     | 473
+ ++++++++++++++++++++------------------------
+ poppler/GlobalParams.h      |	17 +-
+ poppler/SplashOutputDev.cc  | 132 +------------
+ poppler/SplashOutputDev.h   |	 3 -
+ qt/poppler-document.cc      |	 1 -
+ qt4/src/poppler-document.cc |	 1 -
+ test/gtk-cairo-test.cc      |	 1 -
+ test/gtk-splash-test.cc     |	 1 -
  13 files changed, 241 insertions(+), 505 deletions(-)
 
 commit e9015531b1d0e5f2c8d8ca2bc50d5f14aaf954bc
@@ -45081,13 +48265,13 @@ Date:	Thu Jul 28 06:31:57 2005 +0000
 	    * poppler/PSOutputDev.cc, poppler/GlobalParams.cc: Quiet new
 	    printf warnings.
 
- ChangeLog		     |	 11 +++++++++++
- poppler/Error.h	     |	  2 +-
- poppler/GlobalParams.cc     |	  3 ++-
- poppler/PSOutputDev.cc      |	  3 +--
- poppler/PSOutputDev.h	     |	  2 +-
- poppler/TextOutputDev.cc    |	 13 ++++++++++++-
- poppler/poppler-config.h.in |	 12 ++++++++++++
+ ChangeLog		     | 11 +++++++++++
+ poppler/Error.h	     |	2 +-
+ poppler/GlobalParams.cc     |	3 ++-
+ poppler/PSOutputDev.cc      |	3 +--
+ poppler/PSOutputDev.h	     |	2 +-
+ poppler/TextOutputDev.cc    | 13 ++++++++++++-
+ poppler/poppler-config.h.in | 12 ++++++++++++
  7 files changed, 40 insertions(+), 6 deletions(-)
 
 commit 9df89c495683e229b771b3d008ed25d478465c35
@@ -45107,10 +48291,10 @@ Date:	Thu Jul 28 05:52:43 2005 +0000
 	    selection trigger; now midpoint of glyph must be included in
 	    selection area for glyph to be in selection.
 
- ChangeLog		   |   12 +++++
- poppler/CairoOutputDev.cc |	2 +-
- poppler/TextOutputDev.cc  |  113
- ++++++++++++++++++++++-----------------------
+ ChangeLog		   |  12 +++++
+ poppler/CairoOutputDev.cc |   2 +-
+ poppler/TextOutputDev.cc  | 113
+ ++++++++++++++++++++++------------------------
  3 files changed, 67 insertions(+), 60 deletions(-)
 
 commit a3d9b5849cedf1316c6fc5859872e957f3f7b593
@@ -45138,14 +48322,14 @@ Date:	Wed Jul 27 19:21:08 2005 +0000
 
     * glib/poppler-document.h: add prototypes.
 
- ChangeLog		  |   23 ++++++++++++++++++++++
- glib/poppler-document.cc |   49
- +++++++++++++++++++++++++++++++++++++++-------
- glib/poppler-document.h  |   15 +++++++++-----
- glib/poppler-page.cc	  |   10 ++++++++++
- glib/poppler-private.h   |    6 ++++++
- poppler/PSOutputDev.cc   |   23 +++++++++++++---------
- poppler/PSOutputDev.h	  |    9 +++++++--
+ ChangeLog		  | 23 +++++++++++++++++++++++
+ glib/poppler-document.cc | 49
+ +++++++++++++++++++++++++++++++++++++++++-------
+ glib/poppler-document.h  | 15 ++++++++++-----
+ glib/poppler-page.cc	  | 10 ++++++++++
+ glib/poppler-private.h   |  6 ++++++
+ poppler/PSOutputDev.cc   | 23 ++++++++++++++---------
+ poppler/PSOutputDev.h	  |  9 +++++++--
  7 files changed, 112 insertions(+), 23 deletions(-)
 
 commit 7be920ecf13698c3cf4ab8df09c8c67f1a04bfa2
@@ -45154,8 +48338,8 @@ Date:	Tue Jul 26 21:52:09 2005 +0000
 
     Fix mem leak in qt test app
 
- ChangeLog		|    4 ++++
- qt/test-poppler-qt.cpp |    2 ++
+ ChangeLog		| 4 ++++
+ qt/test-poppler-qt.cpp | 2 ++
  2 files changed, 6 insertions(+)
 
 commit 2bc26dffd9f296799617d319055648c20f748c8a
@@ -45169,8 +48353,8 @@ Date:	Tue Jul 26 20:34:13 2005 +0000
 	    more liberal so we don't crash on complex encoding arrays
 	    (#3344).
 
- ChangeLog	   |	5 +++++
- fofi/FoFiType1.cc |   21 +++++++--------------
+ ChangeLog	   |  5 +++++
+ fofi/FoFiType1.cc | 21 +++++++--------------
  2 files changed, 12 insertions(+), 14 deletions(-)
 
 commit 07911274e4e850a628b1e587cafc2a73c05f93fe
@@ -45180,8 +48364,8 @@ Date:	Mon Jul 25 20:40:37 2005 +0000
     Work on bad jpeg data that have garbage before the start marker. Fixes
     bug #3299
 
- ChangeLog	      |    5 +++++
- poppler/DCTStream.cc |   38 ++++++++++++++++++++++++++++++++++++++
+ ChangeLog	      |  5 +++++
+ poppler/DCTStream.cc | 38 ++++++++++++++++++++++++++++++++++++++
  2 files changed, 43 insertions(+)
 
 commit a1869eca39172fcb42f036a5846b19548be53568
@@ -45190,8 +48374,8 @@ Date:	Fri Jul 22 11:01:25 2005 +0000
 
     Fix bug #3586
 
- ChangeLog		    |	 5 +++++
- poppler/CairoFontEngine.cc |	 2 ++
+ ChangeLog		    | 5 +++++
+ poppler/CairoFontEngine.cc | 2 ++
  2 files changed, 7 insertions(+)
 
 commit 95529b41272484f08fb54393e1886bf7ff3e02c8
@@ -45200,9 +48384,9 @@ Date:	Fri Jul 22 10:45:19 2005 +0000
 
     Make it possible to browse pages in test-poppler-qt
 
- ChangeLog		|   13 +++++++++----
- qt/test-poppler-qt.cpp |   49
- +++++++++++++++++++++++++++++++++++++++---------
+ ChangeLog		| 13 +++++++++----
+ qt/test-poppler-qt.cpp | 49
+ ++++++++++++++++++++++++++++++++++++++++---------
  2 files changed, 49 insertions(+), 13 deletions(-)
 
 commit 2d52650864eab0e9385ed1fe8fb594daac9d8322
@@ -45218,10 +48402,10 @@ Date:	Fri Jul 22 10:35:56 2005 +0000
     * glib/poppler-document.h (PopplerFontType): new enum.
     Update prototypes.
 
- ChangeLog		  |   11 ++++++++++
- glib/poppler-document.cc |   54
- +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h  |   38 ++++++++++++++++++++++----------
+ ChangeLog		  | 11 ++++++++++
+ glib/poppler-document.cc | 54
+ +++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h  | 38 ++++++++++++++++++++++++----------
  3 files changed, 91 insertions(+), 12 deletions(-)
 
 commit 43bed4aafcf1d291dc96fa5070efbd7936a6122f
@@ -45230,8 +48414,8 @@ Date:	Fri Jul 22 10:33:54 2005 +0000
 
     Fix bugs #3728 and #3750
 
- ChangeLog	  |    4 ++++
- splash/Splash.cc |   10 ++++++++++
+ ChangeLog	  |  4 ++++
+ splash/Splash.cc | 10 ++++++++++
  2 files changed, 14 insertions(+)
 
 commit c7bcef87493d354a077dd223d76f86640acc0ce3
@@ -45240,8 +48424,8 @@ Date:	Fri Jul 15 19:55:30 2005 +0000
 
     update for 2005-06-27 change to actually display something again.
 
- ChangeLog		|    5 +++++
- test/gtk-cairo-test.cc |   10 ++++++----
+ ChangeLog		|  5 +++++
+ test/gtk-cairo-test.cc | 10 ++++++----
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 commit 6623711d2d50dc52454904ee16b25337f0aab130
@@ -45250,9 +48434,9 @@ Date:	Sun Jul 10 09:34:03 2005 +0000
 
     A general cleanup of the Arthur output renderer.
 
- ChangeLog		    |	 5 +++
- poppler/ArthurOutputDev.cc |  105
- +++++++++++++++-----------------------------
+ ChangeLog		    |	5 +++
+ poppler/ArthurOutputDev.cc | 105
+ ++++++++++++++++-----------------------------
  2 files changed, 41 insertions(+), 69 deletions(-)
 
 commit ea1cc9a7b12db9c44b89896c41d07e3ba932d054
@@ -45268,10 +48452,10 @@ Date:	Fri Jul 8 04:59:41 2005 +0000
 	    * poppler/TextOutputDev.cc (visitLine): Add missing scaling of
 	    intra-line selection edges.
 
- ChangeLog		  |    9 +++++++
- glib/poppler-page.cc	  |   59
- +++++++++++++++++++++++++++++++++++++++++++++-
- poppler/TextOutputDev.cc |   17 +++++++------
+ ChangeLog		  |  9 ++++++++
+ glib/poppler-page.cc	  | 59
+ +++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/TextOutputDev.cc | 17 ++++++++------
  3 files changed, 77 insertions(+), 8 deletions(-)
 
 commit 1cd915397c9532ed80b4f905b6ed9c0126aa38f2
@@ -45281,12 +48465,12 @@ Date:	Thu Jul 7 21:15:09 2005 +0000
     Add support for page layout to the Qt4 bindings, plus
     test cases.
 
- ChangeLog			       |    8 ++++++++
- qt4/src/poppler-document.cc	       |   22 ++++++++++++++++++++++
- qt4/src/poppler-qt4.h		       |   26 ++++++++++++++++++++++++--
- qt4/tests/Makefile.am		       |   10 +++++++++-
- qt4/tests/check_pagelayout_none.cpp   |   22 ++++++++++++++++++++++
- qt4/tests/check_pagelayout_single.cpp |   22 ++++++++++++++++++++++
+ ChangeLog			       |  8 ++++++++
+ qt4/src/poppler-document.cc	       | 22 ++++++++++++++++++++++
+ qt4/src/poppler-qt4.h		       | 26 ++++++++++++++++++++++++--
+ qt4/tests/Makefile.am		       | 10 +++++++++-
+ qt4/tests/check_pagelayout_none.cpp   | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagelayout_single.cpp | 22 ++++++++++++++++++++++
  6 files changed, 107 insertions(+), 3 deletions(-)
 
 commit 4e050aef7ba132900f84205be221fd48808848c3
@@ -45299,8 +48483,8 @@ Date:	Thu Jul 7 17:19:36 2005 +0000
 	    Account
 	    for page rotation when creating the cairo surface.
 
- ChangeLog	      |    5 +++++
- glib/poppler-page.cc |   17 +++++++++++++++--
+ ChangeLog	      |  5 +++++
+ glib/poppler-page.cc | 17 +++++++++++++++--
  2 files changed, 20 insertions(+), 2 deletions(-)
 
 commit 2eeab0b8afeb4897806df2de6e496889c25dda5e
@@ -45313,8 +48497,8 @@ Date:	Thu Jul 7 15:58:43 2005 +0000
 	    out of
 	    bounds checking (from Marco).
 
- ChangeLog	      |    6 +++++-
- glib/poppler-page.cc |    5 +++++
+ ChangeLog	      | 6 +++++-
+ glib/poppler-page.cc | 5 +++++
  2 files changed, 10 insertions(+), 1 deletion(-)
 
 commit b1015f6bdbd93b2a2574a9f0e0e1cd7dbae9af78
@@ -45324,8 +48508,8 @@ Date:	Thu Jul 7 11:13:24 2005 +0000
     At least try to fix glib issues. If you care about glib,
     then you should review this.
 
- ChangeLog		  |    4 ++++
- glib/poppler-document.cc |    2 ++
+ ChangeLog		  | 4 ++++
+ glib/poppler-document.cc | 2 ++
  2 files changed, 6 insertions(+)
 
 commit 8bf787031e7a2e93b4e1202918bd1aee86675082
@@ -45335,17 +48519,17 @@ Date:	Thu Jul 7 11:04:08 2005 +0000
     Update for page mode - new mode from PDF-1.6, API docs fixes
     and some tests.
 
- ChangeLog				 |   15 +++++++++++++++
- poppler/Catalog.cc			 |    2 ++
- poppler/Catalog.h			 |    3 ++-
- qt4/src/poppler-document.cc		 |    2 ++
- qt4/src/poppler-qt4.h			 |   14 +++++++++-----
- qt4/tests/Makefile.am			 |   22 +++++++++++++++++++++-
- qt4/tests/check_pagemode_attach.cpp	 |   22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_fullscreen.cpp |   22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_none.cpp	 |   22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_oc.cpp	 |   22 ++++++++++++++++++++++
- qt4/tests/check_pagemode_thumbs.cpp	 |   22 ++++++++++++++++++++++
+ ChangeLog				 | 15 +++++++++++++++
+ poppler/Catalog.cc			 |  2 ++
+ poppler/Catalog.h			 |  3 ++-
+ qt4/src/poppler-document.cc		 |  2 ++
+ qt4/src/poppler-qt4.h			 | 14 +++++++++-----
+ qt4/tests/Makefile.am			 | 22 +++++++++++++++++++++-
+ qt4/tests/check_pagemode_attach.cpp	 | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_fullscreen.cpp | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_none.cpp	 | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_oc.cpp	 | 22 ++++++++++++++++++++++
+ qt4/tests/check_pagemode_thumbs.cpp	 | 22 ++++++++++++++++++++++
  11 files changed, 161 insertions(+), 7 deletions(-)
 
 commit 695e27fb4d6fcc3466e2c9c95b4f02821b07e823
@@ -45354,7 +48538,7 @@ Date:	Thu Jul 7 11:01:27 2005 +0000
 
     Suppress noise from new test files.
 
- qt4/tests/.cvsignore |    6 ++++++
+ qt4/tests/.cvsignore | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit 8a8d57bdcf11ed2903913d938b9711053b9bb9f1
@@ -45363,9 +48547,9 @@ Date:	Wed Jul 6 17:12:36 2005 +0000
 
     Extract family, stretch and weight from the font descriptor
 
- ChangeLog	    |	 2 ++
- poppler/GfxFont.cc |	41 +++++++++++++++++++++++++++++++++++++++++
- poppler/GfxFont.h  |	36 ++++++++++++++++++++++++++++++++++++
+ ChangeLog	    |  2 ++
+ poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++++++++++++++++
+ poppler/GfxFont.h  | 36 ++++++++++++++++++++++++++++++++++++
  3 files changed, 79 insertions(+)
 
 commit 3a1646c2f776f5a07b0e830fcb8e1b0a80efb41c
@@ -45374,9 +48558,9 @@ Date:	Wed Jul 6 13:29:00 2005 +0000
 
     Add checkFooter to check the document ends with %%EOF
 
- ChangeLog	   |	5 +++++
- poppler/PDFDoc.cc |   28 ++++++++++++++++++++++++++++
- poppler/PDFDoc.h  |	1 +
+ ChangeLog	   |  5 +++++
+ poppler/PDFDoc.cc | 28 ++++++++++++++++++++++++++++
+ poppler/PDFDoc.h  |  1 +
  3 files changed, 34 insertions(+)
 
 commit 377c023d31cf74d8240aa5be9dba8e3838459a8c
@@ -45385,9 +48569,9 @@ Date:	Wed Jul 6 11:15:16 2005 +0000
 
     Add unit tests for the isLinearized() property.
 
- ChangeLog			|    4 ++++
- qt4/tests/Makefile.am		|    6 +++++-
- qt4/tests/check_linearised.cpp |   23 +++++++++++++++++++++++
+ ChangeLog			|  4 ++++
+ qt4/tests/Makefile.am		|  6 +++++-
+ qt4/tests/check_linearised.cpp | 23 +++++++++++++++++++++++
  3 files changed, 32 insertions(+), 1 deletion(-)
 
 commit 5fa869887a840a585340993718df0841010666cf
@@ -45396,10 +48580,10 @@ Date:	Wed Jul 6 09:52:30 2005 +0000
 
     Remove boolean for unicode table lookup from Font
 
- ChangeLog		     |	 14 ++++++++++++++
- qt4/src/poppler-document.cc |	  2 --
- qt4/src/poppler-qt4.h	     |	 14 +-------------
- qt4/tests/poppler-fonts.cpp |	 16 +++++++---------
+ ChangeLog		     | 14 ++++++++++++++
+ qt4/src/poppler-document.cc |	2 --
+ qt4/src/poppler-qt4.h	     | 14 +-------------
+ qt4/tests/poppler-fonts.cpp | 16 +++++++---------
  4 files changed, 22 insertions(+), 24 deletions(-)
 
 commit 40469c5883e17e734f3d54872c59e76b95bc0f95
@@ -45408,7 +48592,7 @@ Date:	Wed Jul 6 09:00:39 2005 +0000
 
     Update to reflect recent changes.
 
- qt4/tests/.cvsignore |    2 ++
+ qt4/tests/.cvsignore | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 6cea437208f913085a6a8c7183b0826a107cefb5
@@ -45417,9 +48601,9 @@ Date:	Tue Jul 5 21:15:48 2005 +0000
 
     Don't crash with files that have fonts with no name
 
- ChangeLog		     |	  7 +++++++
- qt4/src/poppler-document.cc |	 13 ++++++++++---
- qt4/src/poppler-qt4.h	     |	  2 +-
+ ChangeLog		     |	7 +++++++
+ qt4/src/poppler-document.cc | 13 ++++++++++---
+ qt4/src/poppler-qt4.h	     |	2 +-
  3 files changed, 18 insertions(+), 4 deletions(-)
 
 commit 1323c74479848f5b87a3a13fa26e8b9e096e9f6a
@@ -45428,10 +48612,10 @@ Date:	Tue Jul 5 12:31:59 2005 +0000
 
     Check in a couple more test apps
 
- qt4/tests/Makefile.am		 |   10 ++++++-
- qt4/tests/check_author.cpp	 |   25 +++++++++++++++++
- qt4/tests/check_permissions.cpp |   59
- +++++++++++++++++++++++++++++++++++++++
+ qt4/tests/Makefile.am		 | 10 ++++++-
+ qt4/tests/check_author.cpp	 | 25 +++++++++++++++++
+ qt4/tests/check_permissions.cpp | 59
+ +++++++++++++++++++++++++++++++++++++++++
  3 files changed, 93 insertions(+), 1 deletion(-)
 
 commit 839a798ec3725427185de5a48c58ac448596b25d
@@ -45440,10 +48624,10 @@ Date:	Tue Jul 5 12:25:00 2005 +0000
 
     Add Qt4 bindings for new user permission properties.
 
- ChangeLog		     |	  4 ++++
- qt4/src/poppler-document.cc |	 25 +++++++++++++++++++++
- qt4/src/poppler-qt4.h	     |	 51
- ++++++++++++++++++++++++++++++++++++++-----
+ ChangeLog		     |	4 ++++
+ qt4/src/poppler-document.cc | 25 ++++++++++++++++++++++
+ qt4/src/poppler-qt4.h	     | 51
+ ++++++++++++++++++++++++++++++++++++++++-----
  3 files changed, 75 insertions(+), 5 deletions(-)
 
 commit e10f6990d3339e3a7adeaa50b1754cf7ecf82f87
@@ -45454,11 +48638,11 @@ Date:	Tue Jul 5 12:15:04 2005 +0000
     printing, document assembly, extraction for accessibility
     and form completion.
 
- ChangeLog	  |    8 ++++++++
- poppler/PDFDoc.h |    9 +++++++++
- poppler/XRef.cc  |   55
- ++++++++++++++++++++++++++++++++++++++++++++++++++----
- poppler/XRef.h   |    4 ++++
+ ChangeLog	  |  8 ++++++++
+ poppler/PDFDoc.h |  9 +++++++++
+ poppler/XRef.cc  | 55
+ +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ poppler/XRef.h   |  4 ++++
  4 files changed, 72 insertions(+), 4 deletions(-)
 
 commit 3a8e1ba03cdec6412dd0b79f0cc59a4cd97dd4e7
@@ -45467,7 +48651,7 @@ Date:	Mon Jul 4 11:38:22 2005 +0000
 
     A couple more little changes.
 
- ChangeLog |	6 ++++++
+ ChangeLog | 6 ++++++
  1 file changed, 6 insertions(+)
 
 commit a44bd0b45bb89f29ddca5d0e8986a8de50f9db39
@@ -45476,7 +48660,7 @@ Date:	Mon Jul 4 11:37:21 2005 +0000
 
     Change path to sample file to point to test module
 
- qt4/tests/check_orientation.cpp |    2 +-
+ qt4/tests/check_orientation.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2a7079087c35651c242d3843c94703a3199e61ca
@@ -45485,7 +48669,7 @@ Date:	Mon Jul 4 11:36:13 2005 +0000
 
     Fix typo causing failure to pick up upside down pages.
 
- qt4/src/poppler-page.cc |    2 +-
+ qt4/src/poppler-page.cc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 529a548044ae721a414c5b8e768c0498b1e6830b
@@ -45494,8 +48678,8 @@ Date:	Mon Jul 4 08:30:29 2005 +0000
 
     Update to reflect recent changes
 
- ChangeLog	      |   30 +++++++++++++++++++++++++++++-
- qt4/tests/.cvsignore |    2 ++
+ ChangeLog	      | 30 +++++++++++++++++++++++++++++-
+ qt4/tests/.cvsignore |  2 ++
  2 files changed, 31 insertions(+), 1 deletion(-)
 
 commit 08cca4670f8ae65333beacda85834112e76489d1
@@ -45505,9 +48689,9 @@ Date:	Mon Jul 4 08:21:27 2005 +0000
     Add in a simple demo/test application, similar to the pdffonts
     application in xpdf.
 
- qt4/tests/Makefile.am	     |	  9 ++++-
- qt4/tests/poppler-fonts.cpp |	 76
- +++++++++++++++++++++++++++++++++++++++++++
+ qt4/tests/Makefile.am	     |	9 +++++-
+ qt4/tests/poppler-fonts.cpp | 76
+ +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 84 insertions(+), 1 deletion(-)
 
 commit 52af89d8303b50c45d5e4584d19ec8b7d7ebcf9b
@@ -45516,8 +48700,8 @@ Date:	Mon Jul 4 08:18:52 2005 +0000
 
     Update to reflect changes to rendering API.
 
- qt4/tests/stress-poppler-qt4.cpp |    4 ++--
- qt4/tests/test-poppler-qt4.cpp   |    3 ++-
+ qt4/tests/stress-poppler-qt4.cpp | 4 ++--
+ qt4/tests/test-poppler-qt4.cpp   | 3 ++-
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 commit d42998d0fc32b1e21a2aeef1311e0baf508ade3f
@@ -45532,10 +48716,10 @@ Date:	Mon Jul 4 08:16:17 2005 +0000
 	* qt4/src/poppler-page.cc: change the render API to make it more
 	Qt-like.
 
- qt4/src/poppler-document.cc |	  7 ++++-
- qt4/src/poppler-page.cc     |	  5 ++-
- qt4/src/poppler-qt4.h	     |	 73
- ++++++++++++++++++++++++++++++++++++++++---
+ qt4/src/poppler-document.cc |	7 ++++-
+ qt4/src/poppler-page.cc     |	5 ++--
+ qt4/src/poppler-qt4.h	     | 73
+ ++++++++++++++++++++++++++++++++++++++++++---
  3 files changed, 77 insertions(+), 8 deletions(-)
 
 commit 5d194b926d1ed642ed4bbd3304befa073d389cd4
@@ -45545,8 +48729,8 @@ Date:	Mon Jul 4 08:10:16 2005 +0000
     Change FontInfo::type() to return an enumerated value,
     rather than a GooString.
 
- poppler/FontInfo.cc |	 16 ++--------------
- poppler/FontInfo.h  |	 16 +++++++++++++---
+ poppler/FontInfo.cc | 16 ++--------------
+ poppler/FontInfo.h  | 16 +++++++++++++---
  2 files changed, 15 insertions(+), 17 deletions(-)
 
 commit 1303020b2e97bc110ccf045cd2811daf59ec72ce
@@ -45556,7 +48740,7 @@ Date:	Mon Jul 4 07:42:32 2005 +0000
     Fix up the unit test, now that I have a real sample
     file.
 
- qt4/tests/check_orientation.cpp |    8 ++++----
+ qt4/tests/check_orientation.cpp | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 commit 96fc0ea3fc6c9c7d933e9e0c02a622b2aeef7617
@@ -45570,9 +48754,9 @@ Date:	Fri Jul 1 04:57:49 2005 +0000
 	    backwards in the text flow.  Currently this is a big pile of
 	    if-statements, and there is certainly room for improvement.
 
- ChangeLog		  |    6 +++
- poppler/TextOutputDev.cc |  129
- +++++++++++++++++++++++++++++++++++++---------
+ ChangeLog		  |   6 +++
+ poppler/TextOutputDev.cc | 129
+ ++++++++++++++++++++++++++++++++++++++---------
  2 files changed, 111 insertions(+), 24 deletions(-)
 
 commit 06c49c496f28aba608101adcecd8cec34937ac78
@@ -45591,11 +48775,11 @@ Date:	Thu Jun 30 19:44:33 2005 +0000
 
 	    * glib/test-poppler-glib.c (main): Update test case.
 
- ChangeLog		  |   11 +++++++++++
- NEWS			  |    6 ++++++
- glib/poppler-page.cc	  |   27 ++++++++++-----------------
- glib/poppler-page.h	  |    4 +---
- glib/test-poppler-glib.c |    2 +-
+ ChangeLog		  | 11 +++++++++++
+ NEWS			  |  6 ++++++
+ glib/poppler-page.cc	  | 27 ++++++++++-----------------
+ glib/poppler-page.h	  |  4 +---
+ glib/test-poppler-glib.c |  2 +-
  5 files changed, 29 insertions(+), 21 deletions(-)
 
 commit b126785aeda6b5576a13fc3f3853b027bd7dd306
@@ -45608,9 +48792,9 @@ Date:	Thu Jun 30 00:36:01 2005 +0000
 	    here from
 	    poppler-page.cc
 
- ChangeLog		|    5 +++++
- glib/poppler-page.cc	|    1 -
- glib/poppler-private.h |    1 +
+ ChangeLog		| 5 +++++
+ glib/poppler-page.cc	| 1 -
+ glib/poppler-private.h | 1 +
  3 files changed, 6 insertions(+), 1 deletion(-)
 
 commit b15a8caf003d7d0631d4f78db5ab54e55a5a000a
@@ -45631,18 +48815,18 @@ Date:	Wed Jun 29 21:24:48 2005 +0000
 	    * poppler/TextOutputDev.h: Add support for rendering real
 	    selection (based on text flow).
 
- ChangeLog		   |   20 ++-
- configure.ac		   |	4 +-
- glib/poppler-page.cc	   |  224 ++++++++++++++++++------
- glib/poppler-page.h	   |   65 ++++---
- glib/poppler-private.h    |	3 +
- poppler/CairoOutputDev.cc |   13 +-
- poppler/CairoOutputDev.h  |	2 +-
- poppler/Page.cc	   |   59 +++++--
- poppler/Page.h		   |   12 ++
- poppler/TextOutputDev.cc  |  414
- ++++++++++++++++++++++++++++++++++++++++++++-
- poppler/TextOutputDev.h   |   38 ++++-
+ ChangeLog		   |  20 ++-
+ configure.ac		   |   4 +-
+ glib/poppler-page.cc	   | 224 +++++++++++++++++++------
+ glib/poppler-page.h	   |  65 ++++----
+ glib/poppler-private.h    |   3 +
+ poppler/CairoOutputDev.cc |  13 +-
+ poppler/CairoOutputDev.h  |   2 +-
+ poppler/Page.cc	   |  59 +++++--
+ poppler/Page.h		   |  12 ++
+ poppler/TextOutputDev.cc  | 414
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/TextOutputDev.h   |  38 ++++-
  11 files changed, 743 insertions(+), 111 deletions(-)
 
 commit 3b5e20465e482eb0e75a106697ee94d60aea2fdc
@@ -45651,7 +48835,7 @@ Date:	Tue Jun 28 22:51:29 2005 +0000
 
     Forgot assigning type on copy constructor
 
- poppler/FontInfo.cc |	  1 +
+ poppler/FontInfo.cc | 1 +
  1 file changed, 1 insertion(+)
 
 commit e512cd1832a0e6d15149e12e8e67a39d335efc86
@@ -45660,9 +48844,9 @@ Date:	Tue Jun 28 22:49:14 2005 +0000
 
     Add FontInfo::getType()
 
- ChangeLog	     |	  3 +++
- poppler/FontInfo.cc |	  4 ++++
- poppler/FontInfo.h  |	  2 ++
+ ChangeLog	     | 3 +++
+ poppler/FontInfo.cc | 4 ++++
+ poppler/FontInfo.h  | 2 ++
  3 files changed, 9 insertions(+)
 
 commit 8aeb5205f2876a9dc36eb1dc1e361bb87adf4e31
@@ -45671,8 +48855,8 @@ Date:	Tue Jun 28 22:00:05 2005 +0000
 
     use transformation matrix for image rendering in Arthur backend
 
- ChangeLog		    |	 4 ++++
- poppler/ArthurOutputDev.cc |	12 +++++++-----
+ ChangeLog		    |  4 ++++
+ poppler/ArthurOutputDev.cc | 12 +++++++-----
  2 files changed, 11 insertions(+), 5 deletions(-)
 
 commit a221d06fdc7b0688ca0744a1d6ad49d472c7f12c
@@ -45681,11 +48865,11 @@ Date:	Tue Jun 28 10:59:14 2005 +0000
 
     Reduce cvs up noise
 
- .cvsignore	      |    1 +
- ChangeLog	      |    7 +++++++
- qt4/.cvsignore       |    3 +++
- qt4/src/.cvsignore   |    7 +++++++
- qt4/tests/.cvsignore |    8 ++++++++
+ .cvsignore	      | 1 +
+ ChangeLog	      | 7 +++++++
+ qt4/.cvsignore       | 3 +++
+ qt4/src/.cvsignore   | 7 +++++++
+ qt4/tests/.cvsignore | 8 ++++++++
  5 files changed, 26 insertions(+)
 
 commit ea58a20bbcf450a1ecb8fe00e8162cfdf76105f1
@@ -45750,18 +48934,18 @@ Date:	Tue Jun 28 03:44:12 2005 +0000
 	    * poppler/Makefile.am: Remove specialized cairo output
 	    devices.
 
- ChangeLog			|   17 ++++
- glib/poppler-document.cc	|    2 +-
- glib/poppler-page.cc		|   21 +++-
- glib/poppler-private.h		|    4 +-
- poppler/CairoOutputDev.cc	|   24 ++---
- poppler/CairoOutputDev.h	|    8 +-
- poppler/CairoOutputDevImage.cc |   80 ---------------
- poppler/CairoOutputDevImage.h	|   44 --------
- poppler/CairoOutputDevX.cc	|  216
- ----------------------------------------
- poppler/CairoOutputDevX.h	|  117 ----------------------
- poppler/Makefile.am		|    8 +-
+ ChangeLog			|  17 ++++
+ glib/poppler-document.cc	|   2 +-
+ glib/poppler-page.cc		|  21 +++-
+ glib/poppler-private.h		|   4 +-
+ poppler/CairoOutputDev.cc	|  24 +++--
+ poppler/CairoOutputDev.h	|   8 +-
+ poppler/CairoOutputDevImage.cc |  80 ---------------
+ poppler/CairoOutputDevImage.h	|  44 ---------
+ poppler/CairoOutputDevX.cc	| 216
+ -----------------------------------------
+ poppler/CairoOutputDevX.h	| 117 ----------------------
+ poppler/Makefile.am		|   8 +-
  11 files changed, 54 insertions(+), 487 deletions(-)
 
 commit 8079dce3f0ed91dd531465f45c6d3c568ab4ecd1
@@ -45777,10 +48961,10 @@ Date:	Mon Jun 27 01:04:32 2005 +0000
 	    so we
 	    can use cairo_show_glyphs() efficiently.
 
- ChangeLog		   |	7 +++
- poppler/CairoOutputDev.cc |  107
- +++++++++++++--------------------------------
- poppler/CairoOutputDev.h  |   12 ++++-
+ ChangeLog		   |   7 +++
+ poppler/CairoOutputDev.cc | 107
+ ++++++++++++++--------------------------------
+ poppler/CairoOutputDev.h  |  12 +++++-
  3 files changed, 48 insertions(+), 78 deletions(-)
 
 commit 1aa48d6b7907a1d53830f0cf28085041f685368d
@@ -45791,10 +48975,10 @@ Date:	Sun Jun 26 23:35:26 2005 +0000
     const; to the qt frontend. Code almost 100% copied from xpdf code
     inside kpdf
 
- ChangeLog	    |	 5 +++
- qt/poppler-page.cc |  121
- ++++++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h    |	78 +++++++++++++++++++++++++++++++++
+ ChangeLog	    |	5 +++
+ qt/poppler-page.cc | 121
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h    |  78 ++++++++++++++++++++++++++++++++++
  3 files changed, 204 insertions(+)
 
 commit 9d4327eecd94299a3629b0814e84f981a4be1dfb
@@ -45803,8 +48987,8 @@ Date:	Sun Jun 26 15:54:16 2005 +0000
 
     add poppler-enums.[ch].
 
- ChangeLog	 |    2 ++
- glib/.cvsignore |    8 +++++---
+ ChangeLog	 | 2 ++
+ glib/.cvsignore | 8 +++++---
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 commit 768186514b9fc175cf330344408bb89ab4c909f3
@@ -45813,8 +48997,8 @@ Date:	Sun Jun 26 11:40:35 2005 +0000
 
     require glib 2.4+ for g_value_take_string and G_DEFINE_TYPE.
 
- ChangeLog    |    5 +++++
- configure.ac |    4 ++--
+ ChangeLog    | 5 +++++
+ configure.ac | 4 ++--
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 commit 5d40e34a367212c39af06332879f26824d6d62d2
@@ -45825,8 +49009,8 @@ Date:	Sun Jun 26 00:01:39 2005 +0000
 
 	* poppler/Error.h: Maybe fix build on Solaris.
 
- ChangeLog	 |    4 ++++
- poppler/Error.h |    2 +-
+ ChangeLog	 | 4 ++++
+ poppler/Error.h | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit c2780a3b3f4615bb28bfe394d649b388db4ccf4d
@@ -45843,10 +49027,10 @@ Date:	Mon Jun 20 21:33:09 2005 +0000
 	    xMin
 	    and yMin to avoid referencing unintialized memory (#3582).
 
- ChangeLog	      |    9 +++++++++
- NEWS		      |   10 ++++++++++
- configure.ac	      |    2 +-
- glib/poppler-page.cc |    2 ++
+ ChangeLog	      |  9 +++++++++
+ NEWS		      | 10 ++++++++++
+ configure.ac	      |  2 +-
+ glib/poppler-page.cc |  2 ++
  4 files changed, 22 insertions(+), 1 deletion(-)
 
 commit 9023891f314ac37811b5c973be2e36b6de353cf2
@@ -45855,8 +49039,8 @@ Date:	Mon Jun 20 18:45:41 2005 +0000
 
     (info_dict_get_string): convert from PDFDocEncoding to UTF-8.
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |   16 +++++++++++++++-
+ ChangeLog		  |  5 +++++
+ glib/poppler-document.cc | 16 +++++++++++++++-
  2 files changed, 20 insertions(+), 1 deletion(-)
 
 commit bbf2fe757f0fd08d0e90e3810709ab7152c779c0
@@ -45871,11 +49055,11 @@ Date:	Mon Jun 20 17:58:38 2005 +0000
 	    add a
 	    getter for rotation.  Patch from Marco.
 
- ChangeLog	      |    7 +++++
- glib/poppler-page.cc |   69
- ++++++++++++++++++++++++++++----------------------
- glib/poppler-page.h  |   57 +++++++++++++++++++++--------------------
- glib/poppler.h       |    1 -
+ ChangeLog	      |  7 ++++++
+ glib/poppler-page.cc | 69
+ +++++++++++++++++++++++++++++-----------------------
+ glib/poppler-page.h  | 57 ++++++++++++++++++++++---------------------
+ glib/poppler.h       |  1 -
  4 files changed, 75 insertions(+), 59 deletions(-)
 
 commit c264d8a9f84587cd0f2ef67683a01fc8dd9395af
@@ -45889,9 +49073,9 @@ Date:	Mon Jun 20 17:38:27 2005 +0000
 	    without
 	    name (typically type 3 fonts) and fix an iterator bug.
 
- ChangeLog		  |    6 ++++++
- glib/poppler-document.cc |    8 +++++++-
- poppler/FontInfo.cc	  |   13 ++++++++++---
+ ChangeLog		  |  6 ++++++
+ glib/poppler-document.cc |  8 +++++++-
+ poppler/FontInfo.cc	  | 13 ++++++++++---
  3 files changed, 23 insertions(+), 4 deletions(-)
 
 commit 4746e63a793a2881e904ac54d58b7d3e48b07dcf
@@ -45905,8 +49089,8 @@ Date:	Mon Jun 20 17:22:35 2005 +0000
 	    lower left
 	    corner (#3396).
 
- ChangeLog	      |    6 ++++++
- glib/poppler-page.cc |    6 ++++++
+ ChangeLog	      | 6 ++++++
+ glib/poppler-page.cc | 6 ++++++
  2 files changed, 12 insertions(+)
 
 commit bada3d03583ef6ed34d2aa743de8fd9ca4a5c748
@@ -45919,9 +49103,9 @@ Date:	Fri Jun 17 05:30:56 2005 +0000
 	    checks
 	    for automake >= 1.7 (#3554).
 
- ChangeLog  |	 5 +++
- autogen.sh |  104
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog  |	5 +++
+ autogen.sh | 104
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 109 insertions(+)
 
 commit 25db42831ddde500697126352458e092a9b0ab9b
@@ -45936,9 +49120,9 @@ Date:	Wed Jun 15 15:02:46 2005 +0000
 	    (open or closed) for bookmark subtrees.
     -----------------------------------------------------------
 
- ChangeLog		  |    6 ++++++
- glib/poppler-document.cc |    9 +++++++++
- glib/poppler-document.h  |    1 +
+ ChangeLog		  | 6 ++++++
+ glib/poppler-document.cc | 9 +++++++++
+ glib/poppler-document.h  | 1 +
  3 files changed, 16 insertions(+)
 
 commit e54e306ac5d603001fefda3b9ecd81821e4bd09e
@@ -45947,9 +49131,9 @@ Date:	Mon Jun 13 17:18:32 2005 +0000
 
     Forgot to add new files.
 
- poppler/FontInfo.cc |	197
- +++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FontInfo.h  |	 51 +++++++++++++
+ poppler/FontInfo.cc | 197
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/FontInfo.h  |	51 ++++++++++++++
  2 files changed, 248 insertions(+)
 
 commit 23e8ed5cbf4d7d999a8a1dcf714aaddaf339ceff
@@ -45967,14 +49151,14 @@ Date:	Mon Jun 13 16:09:33 2005 +0000
 	    info from
 	    document.
 
- ChangeLog		  |   10 ++++
- glib/poppler-document.cc |  131
- ++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h  |   13 +++++
- glib/poppler-private.h   |    7 +++
- glib/poppler.h		  |    2 +
- glib/test-poppler-glib.c |   14 +++++
- poppler/Makefile.am	  |    2 +
+ ChangeLog		  |  10 ++++
+ glib/poppler-document.cc | 131
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h  |  13 +++++
+ glib/poppler-private.h   |   7 +++
+ glib/poppler.h		  |   2 +
+ glib/test-poppler-glib.c |  14 +++++
+ poppler/Makefile.am	  |   2 +
  7 files changed, 179 insertions(+)
 
 commit fbb86d2983a28ad2c46b8c5d475a2df1f0f0e4b9
@@ -45986,8 +49170,8 @@ Date:	Wed Jun 8 14:35:46 2005 +0000
 	    * poppler/CairoFontEngine.cc: Remember to delete tmpFileName.
 	    Patch from Nikolai Weibull (#3491).
 
- ChangeLog		    |	 5 +++++
- poppler/CairoFontEngine.cc |	37 +++++++++++++++++++------------------
+ ChangeLog		    |  5 +++++
+ poppler/CairoFontEngine.cc | 37 +++++++++++++++++++------------------
  2 files changed, 24 insertions(+), 18 deletions(-)
 
 commit 699b03025c1d38a42a49e39017097c5d0315fd6f
@@ -45998,8 +49182,8 @@ Date:	Tue Jun 7 20:25:48 2005 +0000
 
 	    * qt/test-poppler-qt.cpp: Add stdlib.h include for exit().
 
- ChangeLog		|    4 ++++
- qt/test-poppler-qt.cpp |    1 +
+ ChangeLog		| 4 ++++
+ qt/test-poppler-qt.cpp | 1 +
  2 files changed, 5 insertions(+)
 
 commit 0017b1a72c58e2d016d22451079c466abdfff15c
@@ -46016,10 +49200,10 @@ Date:	Thu Jun 2 19:14:45 2005 +0000
 	    * test/gtk-splash-test.cc: Fix from Martin Kretzschmar
 	    <martink@gnome.org> to compile with OPI enabled (#2911).
 
- ChangeLog		 |    9 +++++++++
- poppler/TextOutputDev.h |    3 +++
- qt/poppler-qt.h	 |    2 ++
- test/gtk-splash-test.cc |    2 +-
+ ChangeLog		 | 9 +++++++++
+ poppler/TextOutputDev.h | 3 +++
+ qt/poppler-qt.h	 | 2 ++
+ test/gtk-splash-test.cc | 2 +-
  4 files changed, 15 insertions(+), 1 deletion(-)
 
 commit 47c3b4ec2c7691e44f5100b1f5956df0005467c8
@@ -46036,12 +49220,12 @@ Date:	Thu Jun 2 18:49:55 2005 +0000
 	    * poppler-qt.pc.in:
 	    * poppler-splash.pc.in: Misc fixes to pkg-config files.
 
- ChangeLog	      |   10 ++++++++++
- configure.ac	      |    6 ++++--
- poppler-cairo.pc.in  |    3 +--
- poppler-glib.pc.in   |    4 ++--
- poppler-qt.pc.in     |    1 +
- poppler-splash.pc.in |    3 +--
+ ChangeLog	      | 10 ++++++++++
+ configure.ac	      |  6 ++++--
+ poppler-cairo.pc.in  |  3 +--
+ poppler-glib.pc.in   |  4 ++--
+ poppler-qt.pc.in     |  1 +
+ poppler-splash.pc.in |  3 +--
  6 files changed, 19 insertions(+), 8 deletions(-)
 
 commit 9f0da96dd005defd5d82dd05b627ff1925430215
@@ -46056,9 +49240,9 @@ Date:	Thu Jun 2 00:35:44 2005 +0000
 
 	Based on a patch by Albert Astals Cid.
 
- ChangeLog	  |    8 ++++++++
- poppler/Error.cc |   29 ++++++++++++++++++++---------
- poppler/Error.h  |    2 ++
+ ChangeLog	  |  8 ++++++++
+ poppler/Error.cc | 29 ++++++++++++++++++++---------
+ poppler/Error.h  |  2 ++
  3 files changed, 30 insertions(+), 9 deletions(-)
 
 commit f688aa11d066f1c6f4115cbdb604ac61fb8b5146
@@ -46070,11 +49254,11 @@ Date:	Sun May 29 14:59:34 2005 +0000
 	    * glib/*: Add more meta data properties to poppler document.
 	    Patch by Emil Soleyman-Zomalan (#3359).
 
- ChangeLog		  |    5 ++
- glib/poppler-document.cc |  155
- +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler.gidl	  |    5 ++
- glib/test-poppler-glib.c |   46 +++++++++-----
+ ChangeLog		  |   5 ++
+ glib/poppler-document.cc | 155
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler.gidl	  |   5 ++
+ glib/test-poppler-glib.c |  46 +++++++++-----
  4 files changed, 194 insertions(+), 17 deletions(-)
 
 commit 9e6eeec574d48d2341ee620e16360d3b21c40103
@@ -46099,10 +49283,9 @@ Date:	Thu May 26 13:03:35 2005 +0000
 
 	    * poppler/CairoOutputDev.cc: Support fill and stroke opacity.
 
- ChangeLog		   |   12 ++++++++++++
- poppler/CairoOutputDev.cc |   41
- ++++++++++++++++++++++++++++++-----------
- poppler/CairoOutputDev.h  |	6 +++++-
+ ChangeLog		   | 12 ++++++++++++
+ poppler/CairoOutputDev.cc | 41 ++++++++++++++++++++++++++++++-----------
+ poppler/CairoOutputDev.h  |  6 +++++-
  3 files changed, 47 insertions(+), 12 deletions(-)
 
 commit 89a633edd860e3c6ded1e468edf6f28cfcb43d0e
@@ -46117,11 +49300,11 @@ Date:	Thu May 26 12:52:38 2005 +0000
 
 	    * poppler/CairoOutputDev.cc (drawImage): Use getRGBLine here.
 
- ChangeLog		   |	8 +++
- poppler/CairoOutputDev.cc |   66 +++++++++----------
- poppler/GfxState.cc	   |  160
- ++++++++++++++++++++++++++++++++++++++++++++-
- poppler/GfxState.h	   |   14 ++++
+ ChangeLog		   |   8 +++
+ poppler/CairoOutputDev.cc |  66 +++++++++----------
+ poppler/GfxState.cc	   | 160
+ +++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/GfxState.h	   |  14 ++++
  4 files changed, 212 insertions(+), 36 deletions(-)
 
 commit 4d8224819da7a85e4d99f96c9bbb047ece58130a
@@ -46133,9 +49316,9 @@ Date:	Mon May 23 04:23:53 2005 +0000
 	    * glib/poppler-document.h: Add a permissions flag to the glib
 	    bindings.
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |   24 ++++++++++++++++++++++++
- glib/poppler-document.h  |   16 +++++++++-------
+ ChangeLog		  |  5 +++++
+ glib/poppler-document.cc | 24 ++++++++++++++++++++++++
+ glib/poppler-document.h  | 16 +++++++++-------
  3 files changed, 38 insertions(+), 7 deletions(-)
 
 commit 1f677e2f60634a7d0c5e0e0d2125ab15c2722979
@@ -46149,8 +49332,8 @@ Date:	Sat May 21 21:33:06 2005 +0000
 	    error spotted by Jürg Billeter.
     -----------------------------------------------------
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |    2 +-
+ ChangeLog		  | 5 +++++
+ glib/poppler-document.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 0bbf2f08173866cde9b097eeeb1f4218a396588d
@@ -46163,8 +49346,8 @@ Date:	Fri May 20 20:48:52 2005 +0000
 	    vs. column
 	    vector conventions between cairo and poppler.
 
- ChangeLog		   |	3 +++
- poppler/CairoOutputDev.cc |   18 +++++++++---------
+ ChangeLog		   |  3 +++
+ poppler/CairoOutputDev.cc | 18 +++++++++---------
  2 files changed, 12 insertions(+), 9 deletions(-)
 
 commit da44ec7e8de58e55e55b1f780bc3f4bc8307874f
@@ -46176,8 +49359,8 @@ Date:	Fri May 20 18:38:10 2005 +0000
 	    * poppler/CairoFontEngine.cc: Only get the code to gid map if
 	    we're using freetype 2.1.7 or older (#3340).
 
- ChangeLog		    |	 5 +++++
- poppler/CairoFontEngine.cc |	13 ++++++++-----
+ ChangeLog		    |  5 +++++
+ poppler/CairoFontEngine.cc | 13 ++++++++-----
  2 files changed, 13 insertions(+), 5 deletions(-)
 
 commit 6fe29cf0a7e54b8d294471a0f94eb9e989ad1d7f
@@ -46186,7 +49369,7 @@ Date:	Thu May 19 05:18:04 2005 +0000
 
     Add bugzilla number.
 
- ChangeLog |	2 +-
+ ChangeLog | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 42de1348622cf86a87bc22941bd48bffa943dac9
@@ -46201,8 +49384,8 @@ Date:	Thu May 19 05:16:22 2005 +0000
 	    codeToGID
 	    will be NULL, and we end up casting it to a Gfx8BitFont.
 
- ChangeLog		    |	 7 +++++++
- poppler/CairoFontEngine.cc |	 2 +-
+ ChangeLog		    | 7 +++++++
+ poppler/CairoFontEngine.cc | 2 +-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit afc05387c94a76ff0ed69b3f5d9a69ddd1448e83
@@ -46218,11 +49401,11 @@ Date:	Wed May 18 17:39:59 2005 +0000
 	    * glib/poppler-document.cc (poppler_ps_file_new): Take a page
 	    range here instead of just number of pages.
 
- ChangeLog		  |    9 +++++++++
- NEWS			  |    7 +++++++
- configure.ac		  |    6 +++---
- glib/poppler-document.cc |   15 ++++++++++-----
- glib/poppler-document.h  |    1 +
+ ChangeLog		  |  9 +++++++++
+ NEWS			  |  7 +++++++
+ configure.ac		  |  6 +++---
+ glib/poppler-document.cc | 15 ++++++++++-----
+ glib/poppler-document.h  |  1 +
  5 files changed, 30 insertions(+), 8 deletions(-)
 
 commit 420134a194af9161282ccfe329d17adef8d325f2
@@ -46235,9 +49418,9 @@ Date:	Tue May 17 23:38:27 2005 +0000
 	    * test/gtk-cairo-test.cc: Chase the cairo xlib constructor
 	    again.
 
- ChangeLog		    |	 5 +++++
- poppler/CairoOutputDevX.cc |	 5 +++--
- test/gtk-cairo-test.cc     |	 5 +++--
+ ChangeLog		    | 5 +++++
+ poppler/CairoOutputDevX.cc | 5 +++--
+ test/gtk-cairo-test.cc     | 5 +++--
  3 files changed, 11 insertions(+), 4 deletions(-)
 
 commit 6fd62953a910dcfb4abd9de5ea18285b8fa5d202
@@ -46246,7 +49429,7 @@ Date:	Mon May 16 23:16:15 2005 +0000
 
     Add bug number and attribution to ChangeLog entry.
 
- ChangeLog |	4 ++++
+ ChangeLog | 4 ++++
  1 file changed, 4 insertions(+)
 
 commit 6d7f624c13e8a9a8251ac97388cd80e418c70250
@@ -46263,13 +49446,13 @@ Date:	Mon May 16 21:56:31 2005 +0000
 	    * glib/poppler-enums.c:
 	    * glib/poppler-enums.h: Removed.
 
- ChangeLog	      |    8 +++
- configure.ac	      |    3 +
- glib/.cvsignore      |    1 +
- glib/Makefile.am     |   67 ++++++++++++------
- glib/poppler-enums.c |  189
- --------------------------------------------------
- glib/poppler-enums.h |   49 -------------
+ ChangeLog	      |   8 +++
+ configure.ac	      |   3 +
+ glib/.cvsignore      |   1 +
+ glib/Makefile.am     |  67 ++++++++++++------
+ glib/poppler-enums.c | 189
+ ---------------------------------------------------
+ glib/poppler-enums.h |  49 -------------
  6 files changed, 57 insertions(+), 260 deletions(-)
 
 commit 2801b54a944fc9e1072c5dcb9f1153a0c9f42de5
@@ -46280,8 +49463,8 @@ Date:	Mon May 16 20:27:51 2005 +0000
 
 	    * test/gtk-cairo-test.cc: Update this test case also.
 
- ChangeLog		|    2 ++
- test/gtk-cairo-test.cc |    5 +++--
+ ChangeLog		| 2 ++
+ test/gtk-cairo-test.cc | 5 +++--
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 8753ae8ba20fcceaef3ef1dda89129f0456fccf6
@@ -46298,9 +49481,9 @@ Date:	Mon May 16 19:06:00 2005 +0000
 	    Make this
 	    static.
 
- ChangeLog		    |	 8 ++++++++
- poppler/CairoFontEngine.cc |	 2 +-
- poppler/CairoOutputDevX.cc |	 5 +++--
+ ChangeLog		    | 8 ++++++++
+ poppler/CairoFontEngine.cc | 2 +-
+ poppler/CairoOutputDevX.cc | 5 +++--
  3 files changed, 12 insertions(+), 3 deletions(-)
 
 commit 2e17106ef4711097104a561d5be49980f8b2f5ab
@@ -46309,9 +49492,9 @@ Date:	Fri May 13 03:47:36 2005 +0000
 
     whoops!  commit the right file.
 
- glib/poppler.gidl |  212
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
- glib/test.gidl    |   23 ------
+ glib/poppler.gidl | 212
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/test.gidl    |  23 ------
  2 files changed, 212 insertions(+), 23 deletions(-)
 
 commit 19b62e1c8ea8ce042ac089defe94f756dcaf194e
@@ -46322,8 +49505,8 @@ Date:	Fri May 13 03:25:32 2005 +0000
 
 	    * glib/poppler.gidl: add metadata file.
 
- ChangeLog	|    4 ++++
- glib/test.gidl |   23 +++++++++++++++++++++++
+ ChangeLog	|  4 ++++
+ glib/test.gidl | 23 +++++++++++++++++++++++
  2 files changed, 27 insertions(+)
 
 commit bef5a548f3b21e7220079155e9b5054fb0c6c3c7
@@ -46339,11 +49522,11 @@ Date:	Thu May 12 21:26:25 2005 +0000
 	    patch
 	    from Jens Taprogge (#3281)
 
- ChangeLog			|    8 ++++++++
- poppler/CairoOutputDev.cc	|   22 +++++++++++-----------
- poppler/CairoOutputDevImage.cc |   11 ++++++-----
- poppler/CairoOutputDevX.cc	|    7 +++++--
- test/gtk-cairo-test.cc		|    8 +++++---
+ ChangeLog			|  8 ++++++++
+ poppler/CairoOutputDev.cc	| 22 +++++++++++-----------
+ poppler/CairoOutputDevImage.cc | 11 ++++++-----
+ poppler/CairoOutputDevX.cc	|  7 +++++--
+ test/gtk-cairo-test.cc		|  8 +++++---
  5 files changed, 35 insertions(+), 21 deletions(-)
 
 commit c10ea2dd9bffaf9af023612ef196bab2b204d3e1
@@ -46361,12 +49544,12 @@ Date:	Wed May 11 20:01:43 2005 +0000
 	    * glib/test-poppler-glib.c (main): Print out version and
 	    backend.
 
- ChangeLog		  |    8 ++++++++
- glib/poppler-enums.c	  |   26 ++++++++++++++++++++++++++
- glib/poppler-enums.h	  |   15 +++++++++++++++
- glib/poppler.cc	  |   21 +++++++++++++++++++++
- glib/poppler.h		  |   11 +++++++++++
- glib/test-poppler-glib.c |    9 ++++++++-
+ ChangeLog		  |  8 ++++++++
+ glib/poppler-enums.c	  | 26 ++++++++++++++++++++++++++
+ glib/poppler-enums.h	  | 15 +++++++++++++++
+ glib/poppler.cc	  | 21 +++++++++++++++++++++
+ glib/poppler.h		  | 11 +++++++++++
+ glib/test-poppler-glib.c |  9 ++++++++-
  6 files changed, 89 insertions(+), 1 deletion(-)
 
 commit 7d189e33cfa68e722561e9398ad85a77b538ab14
@@ -46389,13 +49572,13 @@ Date:	Fri May 6 16:38:57 2005 +0000
 	    in that
 	    order.
 
- ChangeLog		|   14 ++++++++++++++
- configure.ac		|    8 +++++++-
- glib/Makefile.am	|    1 +
- poppler-glib.pc.in	|    2 +-
- poppler-qt.pc.in	|    2 +-
- qt/Makefile.am		|    1 +
- qt/test-poppler-qt.cpp |    1 +
+ ChangeLog		| 14 ++++++++++++++
+ configure.ac		|  8 +++++++-
+ glib/Makefile.am	|  1 +
+ poppler-glib.pc.in	|  2 +-
+ poppler-qt.pc.in	|  2 +-
+ qt/Makefile.am		|  1 +
+ qt/test-poppler-qt.cpp |  1 +
  7 files changed, 26 insertions(+), 3 deletions(-)
 
 commit c937e63f17a096b94a554103476ecb9ab1b71b90
@@ -46409,9 +49592,9 @@ Date:	Wed May 4 20:08:41 2005 +0000
 	    cairo_mask() and cairo_paint() for drawing image masks
 	    and images.
 
- ChangeLog		   |	6 +++
- poppler/CairoOutputDev.cc |   98
- +++++++++++++++++++++++----------------------
+ ChangeLog		   |  6 +++
+ poppler/CairoOutputDev.cc | 98
+ ++++++++++++++++++++++++-----------------------
  2 files changed, 57 insertions(+), 47 deletions(-)
 
 commit c142773ad30b409d8169a53921e731305de46e50
@@ -46422,8 +49605,8 @@ Date:	Wed May 4 19:28:07 2005 +0000
 
 	    * poppler/CairoOutputDev.cc: Fix matrix convention confusion.
 
- ChangeLog		   |	4 ++++
- poppler/CairoOutputDev.cc |	4 ++--
+ ChangeLog		   | 4 ++++
+ poppler/CairoOutputDev.cc | 4 ++--
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 28760927d724231d0137ca7ecc66c6c2250dff0d
@@ -46441,9 +49624,9 @@ Date:	Wed May 4 19:11:11 2005 +0000
 	    * qt/test-poppler-qt.cpp (main): Use a QLabel for showing text
 	    instead of qDebug.
 
- ChangeLog		|   10 ++++++++++
- qt/poppler-page.cc	|    5 ++---
- qt/test-poppler-qt.cpp |    6 +++++-
+ ChangeLog		| 10 ++++++++++
+ qt/poppler-page.cc	|  5 ++---
+ qt/test-poppler-qt.cpp |  6 +++++-
  3 files changed, 17 insertions(+), 4 deletions(-)
 
 commit fd36522375bcf436639b8731acb3ad22c03c03f4
@@ -46463,15 +49646,15 @@ Date:	Wed May 4 06:32:38 2005 +0000
 	    Register a bunch of boxed types to test introspection, and for
 	    LBs.  Also, remove unused 'popper_document_save()' (-:
 
- ChangeLog		  |   13 ++++++++
- glib/poppler-document.cc |   48 ++++++++++++++++-----------
- glib/poppler-document.h  |   18 ++++++++--
- glib/poppler-enums.c	  |   19 +++++++++++
- glib/poppler-enums.h	  |    2 ++
- glib/poppler-page.cc	  |   83
- ++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h	  |   36 ++++++++++++++------
- glib/poppler.h		  |   12 ++++---
+ ChangeLog		  | 13 ++++++++
+ glib/poppler-document.cc | 48 ++++++++++++++++------------
+ glib/poppler-document.h  | 18 +++++++++--
+ glib/poppler-enums.c	  | 19 +++++++++++
+ glib/poppler-enums.h	  |  2 ++
+ glib/poppler-page.cc	  | 83
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h	  | 36 ++++++++++++++-------
+ glib/poppler.h		  | 12 ++++---
  8 files changed, 193 insertions(+), 38 deletions(-)
 
 commit 132647f8311c07b1f95ee4fca185e9774aae4913
@@ -46486,13 +49669,13 @@ Date:	Mon May 2 05:39:11 2005 +0000
 	    0.4.0
 	    font API and port to new cairo head.
 
- ChangeLog			|    7 +++++
- configure.ac			|    4 +--
- poppler/CairoFontEngine.cc	|   67
- ++++++++++++++++------------------------
- poppler/CairoFontEngine.h	|   12 +++----
- poppler/CairoOutputDev.cc	|   39 ++++++++++++++---------
- poppler/CairoOutputDevImage.cc |    2 +-
+ ChangeLog			|  7 +++++
+ configure.ac			|  4 +--
+ poppler/CairoFontEngine.cc	| 67
+ +++++++++++++++++-------------------------
+ poppler/CairoFontEngine.h	| 12 ++++----
+ poppler/CairoOutputDev.cc	| 39 ++++++++++++++----------
+ poppler/CairoOutputDevImage.cc |  2 +-
  6 files changed, 66 insertions(+), 65 deletions(-)
 
 commit 595c18c038f8dcef73fe58612fc8b93f891e65a1
@@ -46507,8 +49690,8 @@ Date:	Mon May 2 00:44:26 2005 +0000
 
 	Patch from Albert Astals Cid.
 
- ChangeLog		|    8 ++++++++
- splash/SplashFTFont.cc |    2 +-
+ ChangeLog		| 8 ++++++++
+ splash/SplashFTFont.cc | 2 +-
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 commit 49d89ca0ed3986bec7468f6c0ed295e84ba67239
@@ -46522,9 +49705,9 @@ Date:	Sun May 1 21:54:55 2005 +0000
 
 	Patch from Takashi Iwai through Albert Astals Cid.
 
- ChangeLog  |	 7 +++++++
- goo/gmem.c |	10 +++++-----
- goo/gmem.h |	 4 ++--
+ ChangeLog  |  7 +++++++
+ goo/gmem.c | 10 +++++-----
+ goo/gmem.h |  4 ++--
  3 files changed, 14 insertions(+), 7 deletions(-)
 
 commit 14d618bece894e4c6bed0f179a8fda4db5a67c9d
@@ -46539,9 +49722,9 @@ Date:	Sat Apr 30 19:53:57 2005 +0000
 
 	Patch from Albert Astals Cid.
 
- ChangeLog		|    8 ++++++++
- qt/poppler-document.cc |    2 +-
- qt/poppler-qt.h	|    2 +-
+ ChangeLog		| 8 ++++++++
+ qt/poppler-document.cc | 2 +-
+ qt/poppler-qt.h	| 2 +-
  3 files changed, 10 insertions(+), 2 deletions(-)
 
 commit 1e66da32964cc76c6ed3773574f422b4608cb0e1
@@ -46565,8 +49748,8 @@ Date:	Sat Apr 30 17:31:47 2005 +0000
 
 	Patch from Albert Astals Cid.
 
- ChangeLog	   |   13 +++++++++++++
- fofi/FoFiType1.cc |   14 +++++++++++---
+ ChangeLog	   | 13 +++++++++++++
+ fofi/FoFiType1.cc | 14 +++++++++++---
  2 files changed, 24 insertions(+), 3 deletions(-)
 
 commit 0b532db77ef41937dd5be30d15c96557d81eceb2
@@ -46581,12 +49764,12 @@ Date:	Fri Apr 29 19:37:07 2005 +0000
 	    to really
 	    set the PDF version correct.  Third time's the charm.
 
- ChangeLog		  |    7 ++++++
- glib/poppler-document.cc |    4 ++-
- goo/GooTimer.cc	  |   63
- ++++++++++++++++++++++++++++++++++++++++++++++
- goo/GooTimer.h		  |   40 +++++++++++++++++++++++++++++
- goo/Makefile.am	  |    2 ++
+ ChangeLog		  |  7 ++++++
+ glib/poppler-document.cc |  4 ++-
+ goo/GooTimer.cc	  | 63
+ ++++++++++++++++++++++++++++++++++++++++++++++++
+ goo/GooTimer.h		  | 40 ++++++++++++++++++++++++++++++
+ goo/Makefile.am	  |  2 ++
  5 files changed, 115 insertions(+), 1 deletion(-)
 
 commit 38948ea6f9ef76dae9b8a7156fe1ef32a0457380
@@ -46599,9 +49782,9 @@ Date:	Fri Apr 29 03:57:16 2005 +0000
 
 	    * NEWS: Write up news for 0.3.1 release.
 
- ChangeLog    |    6 ++++++
- NEWS	      |    6 ++++++
- configure.ac |    2 +-
+ ChangeLog    | 6 ++++++
+ NEWS	      | 6 ++++++
+ configure.ac | 2 +-
  3 files changed, 13 insertions(+), 1 deletion(-)
 
 commit af65146c92682a3af06e9d3147426445c78309de
@@ -46616,8 +49799,8 @@ Date:	Thu Apr 28 23:03:06 2005 +0000
 	    encoding.
 	    Fixes Bug 2934.
 
- ChangeLog		 |    7 +++++++
- poppler/GlobalParams.cc |    2 +-
+ ChangeLog		 | 7 +++++++
+ poppler/GlobalParams.cc | 2 +-
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 commit c2db3e1b297a9dc0accd0d8a1366970d45705c8f
@@ -46634,14 +49817,14 @@ Date:	Wed Apr 27 20:56:18 2005 +0000
 	* poppler/Stream.h: Add a reimplementation of FlateStream using
 	zlib.
 
- ChangeLog		|   10 +++++
- configure.ac		|   29 +++++++++++++
- poppler/FlateStream.cc |  107
- ++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/FlateStream.h	|   68 ++++++++++++++++++++++++++++++
- poppler/Makefile.am	|   17 +++++++-
- poppler/Stream.cc	|    6 +++
- poppler/Stream.h	|    2 +
+ ChangeLog		|  10 +++++
+ configure.ac		|  29 ++++++++++++++
+ poppler/FlateStream.cc | 107
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/FlateStream.h	|  68 +++++++++++++++++++++++++++++++
+ poppler/Makefile.am	|  17 +++++++-
+ poppler/Stream.cc	|   6 +++
+ poppler/Stream.h	|   2 +
  7 files changed, 237 insertions(+), 2 deletions(-)
 
 commit bc0afe524c2b87af191d83fc9e9bcdc8a6ce4042
@@ -46654,8 +49837,8 @@ Date:	Wed Apr 27 18:53:20 2005 +0000
 	    value
 	    NULL check.  Found by Albert Astals Cid.
 
- ChangeLog	    |	 5 +++++
- poppler/Catalog.cc |	 8 ++++----
+ ChangeLog	    | 5 +++++
+ poppler/Catalog.cc | 8 ++++----
  2 files changed, 9 insertions(+), 4 deletions(-)
 
 commit 3c37dc350d54e5a1035aecfba5bfa394f931cf51
@@ -46667,8 +49850,8 @@ Date:	Tue Apr 26 17:17:05 2005 +0000
 	    * glib/test-poppler-glib.c (main): add a quick dump-to-text
 	    test.
 
- ChangeLog		  |    4 ++++
- glib/test-poppler-glib.c |   20 ++++++++++++++++++++
+ ChangeLog		  |  4 ++++
+ glib/test-poppler-glib.c | 20 ++++++++++++++++++++
  2 files changed, 24 insertions(+)
 
 commit 44b800d520f90ffd143255d2c23835ea357c195b
@@ -46677,7 +49860,7 @@ Date:	Mon Apr 25 18:04:32 2005 +0000
 
     Actually commit the qt/Makefile.am change advertised in the ChangeLog.
 
- qt/Makefile.am |    5 +++--
+ qt/Makefile.am | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 commit 437bec03dd2ab3cdf6215f9ad443b7f21ce84e18
@@ -46690,7 +49873,7 @@ Date:	Sun Apr 24 19:56:17 2005 +0000
 	    poppler-private.h
 	    to SOURCES.
 
- ChangeLog |	5 +++++
+ ChangeLog | 5 +++++
  1 file changed, 5 insertions(+)
 
 commit 9b2b1244ed5f30a99120aaee49c72f7cb6a4f556
@@ -46703,8 +49886,8 @@ Date:	Sat Apr 23 20:16:02 2005 +0000
 	    loading
 	    CID fonts (#3114).
 
- ChangeLog		    |	 5 +++++
- poppler/CairoFontEngine.cc |	11 +++++++++--
+ ChangeLog		    |  5 +++++
+ poppler/CairoFontEngine.cc | 11 +++++++++--
  2 files changed, 14 insertions(+), 2 deletions(-)
 
 commit e4516d728a4d1bc85831d5d00b6d6b8d49c79308
@@ -46715,9 +49898,9 @@ Date:	Sat Apr 23 00:09:05 2005 +0000
 
 	    * configure.ac: Actually commit version number bump.
 
- ChangeLog    |    4 ++++
- NEWS	      |    2 +-
- configure.ac |    2 +-
+ ChangeLog    | 4 ++++
+ NEWS	      | 2 +-
+ configure.ac | 2 +-
  3 files changed, 6 insertions(+), 2 deletions(-)
 
 commit c20448cb26fa1c309d726f272ddf1227f5a0e6ea
@@ -46730,8 +49913,8 @@ Date:	Fri Apr 22 17:29:49 2005 +0000
 	    before the
 	    first goto. Fixes build with gcc 3.3.
 
- ChangeLog		    |	 5 +++++
- poppler/CairoFontEngine.cc |	 3 ++-
+ ChangeLog		    | 5 +++++
+ poppler/CairoFontEngine.cc | 3 ++-
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 commit 42ecccf9b454893797e3d62f0f1c0a3276689e51
@@ -46749,11 +49932,11 @@ Date:	Fri Apr 22 04:09:23 2005 +0000
 	    between
 	    several cairo_font_t.
 
- ChangeLog		    |	 8 +++++
- poppler/CairoFontEngine.cc |	79
- ++++++++++++++++++++------------------------
- poppler/CairoFontEngine.h  |	23 +++++--------
- poppler/CairoOutputDev.cc  |	18 +++++-----
+ ChangeLog		    |  8 +++++
+ poppler/CairoFontEngine.cc | 79
+ ++++++++++++++++++++--------------------------
+ poppler/CairoFontEngine.h  | 23 ++++++--------
+ poppler/CairoOutputDev.cc  | 18 +++++------
  4 files changed, 61 insertions(+), 67 deletions(-)
 
 commit 7a703616d9497eba4d7d318da9918dae9cbe8f12
@@ -46767,9 +49950,9 @@ Date:	Thu Apr 21 19:50:45 2005 +0000
 	    Outline::getItems() and OutlineItem::getKids() and make
 	    documentation more precise (Patch from Marco).
 
- ChangeLog	    |	 7 +++++++
- poppler/Outline.cc |	 6 ++++++
- poppler/Outline.h  |	 7 ++++---
+ ChangeLog	    | 7 +++++++
+ poppler/Outline.cc | 6 ++++++
+ poppler/Outline.h  | 7 ++++---
  3 files changed, 17 insertions(+), 3 deletions(-)
 
 commit 5c89902c5ee2cf13536225c141768b29505815ce
@@ -46802,12 +49985,12 @@ Date:	Thu Apr 21 06:35:33 2005 +0000
 	    call to
 	    Stream::addFilters(), reported by Ryan Lortie (#3046).
 
- ChangeLog		    |	 7 ++++++-
- NEWS			    |	12 +++---------
- poppler/CairoFontEngine.cc |	45
- ++++++++++++++++++++++++++++++++++++++------
- poppler/CairoFontEngine.h  |	 9 ++++++++-
- poppler/CairoOutputDev.cc  |	 9 +--------
+ ChangeLog		    |  7 ++++++-
+ NEWS			    | 12 +++---------
+ poppler/CairoFontEngine.cc | 45
+ +++++++++++++++++++++++++++++++++++++++------
+ poppler/CairoFontEngine.h  |  9 ++++++++-
+ poppler/CairoOutputDev.cc  |  9 +--------
  5 files changed, 57 insertions(+), 25 deletions(-)
 
 commit 71c1563bb0462154cb7caa4356d8f8d049073ac4
@@ -46833,14 +50016,14 @@ Date:	Thu Apr 21 05:20:24 2005 +0000
 	    call to
 	    Stream::addFilters(), reported by Ryan Lortie (#3046).
 
- ChangeLog		    |	15 +++++++++++++++
- NEWS			    |	15 +++++++++++++++
- glib/poppler-document.cc   |	10 ++++++++++
- glib/poppler-page.cc	    |	22 ++--------------------
- glib/poppler-private.h     |	13 +++++++++++++
- poppler-glib.pc.in	    |	 1 +
- poppler/CairoFontEngine.cc |	 2 +-
- poppler/Page.cc	    |	 2 --
+ ChangeLog		    | 15 +++++++++++++++
+ NEWS			    | 15 +++++++++++++++
+ glib/poppler-document.cc   | 10 ++++++++++
+ glib/poppler-page.cc	    | 22 ++--------------------
+ glib/poppler-private.h     | 13 +++++++++++++
+ poppler-glib.pc.in	    |  1 +
+ poppler/CairoFontEngine.cc |  2 +-
+ poppler/Page.cc	    |  2 --
  8 files changed, 57 insertions(+), 23 deletions(-)
 
 commit c6328cbc6cea05890b52a8302f8deba443959c03
@@ -46858,10 +50041,10 @@ Date:	Wed Apr 20 22:48:52 2005 +0000
 
 	Patch from Albert Astals Cid.
 
- ChangeLog		|   11 +++++++++++
- qt/poppler-page.cc	|   37 +++++++++++++++++++++++++++++++++++++
- qt/poppler-qt.h	|   20 ++++++++++++++++++++
- qt/test-poppler-qt.cpp |   40 ++++++++++++++++++++++++++++++----------
+ ChangeLog		| 11 +++++++++++
+ qt/poppler-page.cc	| 37 +++++++++++++++++++++++++++++++++++++
+ qt/poppler-qt.h	| 20 ++++++++++++++++++++
+ qt/test-poppler-qt.cpp | 40 ++++++++++++++++++++++++++++++----------
  4 files changed, 98 insertions(+), 10 deletions(-)
 
 commit 86a32b65100a5baedd18ce0135703289839a317c
@@ -46874,8 +50057,8 @@ Date:	Tue Apr 19 21:22:26 2005 +0000
 	    Use
 	    %.2g instead.
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |    2 +-
+ ChangeLog		  | 5 +++++
+ glib/poppler-document.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 4e81624dcc2d5218f2f8bb4eaa992e724014a853
@@ -46888,8 +50071,8 @@ Date:	Tue Apr 19 21:13:22 2005 +0000
 	    Use %g
 	    instead of %f to avoid versioning like PDF-1.50000
 
- ChangeLog		  |    5 +++++
- glib/poppler-document.cc |    2 +-
+ ChangeLog		  | 5 +++++
+ glib/poppler-document.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 6ef9d30f06be2bd8a9e1470d70f49843a7e432ac
@@ -46902,8 +50085,8 @@ Date:	Tue Apr 19 19:48:49 2005 +0000
 	    NULL links
 	    gracefully (fix from Jeff).
 
- ChangeLog		|    5 +++++
- glib/poppler-action.cc |    7 ++++++-
+ ChangeLog		| 5 +++++
+ glib/poppler-action.cc | 7 ++++++-
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 commit 770b7310ce8b07f95960c2014bf3f6040c060ac4
@@ -46915,8 +50098,8 @@ Date:	Tue Apr 19 04:28:15 2005 +0000
 	* poppler/Catalog.cc: Fix from Marco to make sure we always
 	initialize Catalog::pageLabelInfo.
 
- ChangeLog	    |	 5 +++++
- poppler/Catalog.cc |	 3 +--
+ ChangeLog	    | 5 +++++
+ poppler/Catalog.cc | 3 +--
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 49c10d9f2c4e0cef031f96929e38a14d7ce5af19
@@ -46946,20 +50129,20 @@ Date:	Sat Apr 16 18:57:43 2005 +0000
 	    * poppler/Catalog.cc:
 	    * poppler/Catalog.h: Extend to support PageLayout.
 
- ChangeLog		  |   22 ++++++
- glib/Makefile.am	  |   32 +++++++-
- glib/poppler-action.h	  |   15 ++--
- glib/poppler-document.cc |  196
- +++++++++++++++++++++++++++++++++++++++++-----
- glib/poppler-document.h  |   43 ++++++++--
- glib/poppler-enums.c	  |  144 ++++++++++++++++++++++++++++++++++
- glib/poppler-enums.h	  |   32 ++++++++
- glib/poppler-page.cc	  |    3 -
- glib/poppler-page.h	  |    1 +
- glib/poppler.h		  |    7 ++
- glib/test-poppler-glib.c |   48 +++++++++++-
- poppler/Catalog.cc	  |   17 ++++
- poppler/Catalog.h	  |   11 +++
+ ChangeLog		  |  22 ++++++
+ glib/Makefile.am	  |  32 +++++++-
+ glib/poppler-action.h	  |  15 ++--
+ glib/poppler-document.cc | 196
+ ++++++++++++++++++++++++++++++++++++++++++-----
+ glib/poppler-document.h  |  43 +++++++++--
+ glib/poppler-enums.c	  | 144 ++++++++++++++++++++++++++++++++++
+ glib/poppler-enums.h	  |  32 ++++++++
+ glib/poppler-page.cc	  |   3 -
+ glib/poppler-page.h	  |   1 +
+ glib/poppler.h		  |   7 ++
+ glib/test-poppler-glib.c |  48 +++++++++++-
+ poppler/Catalog.cc	  |  17 ++++
+ poppler/Catalog.h	  |  11 +++
  13 files changed, 529 insertions(+), 42 deletions(-)
 
 commit f35c76cd3528f1e1de594e85e734ca23624b3a62
@@ -46974,12 +50157,12 @@ Date:	Fri Apr 15 02:25:10 2005 +0000
 	    * glib/poppler.h: Patch from Marco Pesenti Gritti to set page
 	    orientaton.
 
- ChangeLog		|    8 ++++
- glib/poppler-page.cc	|  109
- ++++++++++++++++++++++++++++++++++++++++++++----
- glib/poppler-page.h	|   45 ++++++++++----------
- glib/poppler-private.h |    1 +
- glib/poppler.h		|    9 ++++
+ ChangeLog		|   8 ++++
+ glib/poppler-page.cc	| 109
+ +++++++++++++++++++++++++++++++++++++++++++++----
+ glib/poppler-page.h	|  45 ++++++++++----------
+ glib/poppler-private.h |   1 +
+ glib/poppler.h		|   9 ++++
  5 files changed, 142 insertions(+), 30 deletions(-)
 
 commit 538408a8845e167cc2d796ac8b8129d0a2e6a894
@@ -46991,8 +50174,8 @@ Date:	Thu Apr 14 01:34:38 2005 +0000
 	* poppler/CairoOutputDevImage.cc (getBitmap): remove unused
 	SplashBitmap. Patch from Albert Astals Cid.
 
- ChangeLog			|    5 +++++
- poppler/CairoOutputDevImage.cc |    2 --
+ ChangeLog			| 5 +++++
+ poppler/CairoOutputDevImage.cc | 2 --
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 commit 2903530492c24f3c7cb3bf3b993500694aaa27a8
@@ -47012,9 +50195,9 @@ Date:	Tue Apr 12 15:37:39 2005 +0000
 	    added when
 	    using the splash backend.
 
- ChangeLog	     |	 10 ++++++++++
- configure.ac	     |	  4 ++--
- poppler/Makefile.am |	  1 +
+ ChangeLog	     | 10 ++++++++++
+ configure.ac	     |	4 ++--
+ poppler/Makefile.am |	1 +
  3 files changed, 13 insertions(+), 2 deletions(-)
 
 commit 0f7dd9a0512ff97293ee3f8a762b0049393b3cc1
@@ -47027,9 +50210,9 @@ Date:	Sat Apr 9 18:14:39 2005 +0000
 	* poppler-document.cc (okToPrint, okToChange, okToCopy):
 	Patch from Albert Astals Cid adding more metadata exports
 
- ChangeLog		|    6 ++++++
- qt/poppler-document.cc |   20 ++++++++++++++++++++
- qt/poppler-qt.h	|    4 ++++
+ ChangeLog		|  6 ++++++
+ qt/poppler-document.cc | 20 ++++++++++++++++++++
+ qt/poppler-qt.h	|  4 ++++
  3 files changed, 30 insertions(+)
 
 commit dee72b531dab83a29c7675ae06ffe376e4498a4e
@@ -47040,8 +50223,8 @@ Date:	Fri Apr 8 21:09:27 2005 +0000
 
 	    * poppler-qt.pc.in (Libs): Add -lpoppler to Libs.
 
- ChangeLog	  |    4 ++++
- poppler-qt.pc.in |    2 +-
+ ChangeLog	  | 4 ++++
+ poppler-qt.pc.in | 2 +-
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 commit df59ce3b1d5ca8cd46aaf5f189bc78953e21e1a9
@@ -47052,9 +50235,9 @@ Date:	Fri Apr 8 03:30:33 2005 +0000
 
 	* configure.ac: redo the qt tests from Albert Astals Cid
 
- ChangeLog    |    4 +++
- configure.ac |   78
- +++++++++++++++++++++++++++++++++++-----------------------
+ ChangeLog    |  4 ++++
+ configure.ac | 78
+ ++++++++++++++++++++++++++++++++++++------------------------
  2 files changed, 51 insertions(+), 31 deletions(-)
 
 commit 3f9dde10e4778255c468895942e45d1a2637af3a
@@ -47069,10 +50252,10 @@ Date:	Fri Apr 8 03:11:00 2005 +0000
 	Patch from Albert Astals Cid adding consts and exporting some more
 	metadata.
 
- ChangeLog		|    8 ++++++++
- qt/poppler-document.cc |   21 ++++++++++++++++++---
- qt/poppler-page.cc	|    6 +++---
- qt/poppler-qt.h	|   15 +++++++++------
+ ChangeLog		|  8 ++++++++
+ qt/poppler-document.cc | 21 ++++++++++++++++++---
+ qt/poppler-page.cc	|  6 +++---
+ qt/poppler-qt.h	| 15 +++++++++------
  4 files changed, 38 insertions(+), 12 deletions(-)
 
 commit e79a8b946e0d04b32da0b4ceea1649efd203cb07
@@ -47089,13 +50272,13 @@ Date:	Thu Apr 7 22:01:51 2005 +0000
 	    Pesenti
 	    Gritti.
 
- ChangeLog		  |    9 +++++++++
- glib/poppler-document.cc |   45
+ ChangeLog		  |  9 +++++++++
+ glib/poppler-document.cc | 45
  +++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h  |    8 ++++++--
- glib/poppler-page.cc	  |   19 +++++++++++++++++++
- glib/poppler-page.h	  |   40 +++++++++++++++++++++-------------------
- glib/poppler-private.h   |    7 +++++++
+ glib/poppler-document.h  |  8 ++++++--
+ glib/poppler-page.cc	  | 19 +++++++++++++++++++
+ glib/poppler-page.h	  | 40 +++++++++++++++++++++-------------------
+ glib/poppler-private.h   |  7 +++++++
  6 files changed, 107 insertions(+), 21 deletions(-)
 
 commit 7319b66eb64e735ae8b811306eb76755f088385b
@@ -47107,8 +50290,8 @@ Date:	Thu Apr 7 16:26:15 2005 +0000
 	    * configure.ac: check for qt, not glib, when enabling the qt
 	    subdir
 
- ChangeLog    |    5 +++++
- configure.ac |    2 +-
+ ChangeLog    | 5 +++++
+ configure.ac | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit e258ed0cb42d524ee39451f680ad4c067e7721da
@@ -47121,10 +50304,10 @@ Date:	Wed Apr 6 20:49:19 2005 +0000
 	Add more things to .cvsignore.
 	Patch from Martin Kretzschmar.
 
- .cvsignore	 |    2 ++
- ChangeLog	 |    6 ++++++
- glib/.cvsignore |    7 +++++++
- qt/.cvsignore	 |    7 +++++++
+ .cvsignore	 | 2 ++
+ ChangeLog	 | 6 ++++++
+ glib/.cvsignore | 7 +++++++
+ qt/.cvsignore	 | 7 +++++++
  4 files changed, 22 insertions(+)
 
 commit 2a5624a81aa84677a57e098d7d4045f44e3b6f3a
@@ -47137,9 +50320,9 @@ Date:	Wed Apr 6 20:35:03 2005 +0000
 	Construct and deconstruct the PageData object.
 	Patch from Albert Astals Cid.
 
- ChangeLog	    |	 6 ++++++
- qt/poppler-page.cc |	 6 ++++++
- qt/poppler-qt.h    |	 1 +
+ ChangeLog	    | 6 ++++++
+ qt/poppler-page.cc | 6 ++++++
+ qt/poppler-qt.h    | 1 +
  3 files changed, 13 insertions(+)
 
 commit f983e3d317660653f2bfc56f9b06e2cec675beca
@@ -47159,17 +50342,17 @@ Date:	Wed Apr 6 14:39:40 2005 +0000
 	    * qt/test-poppler-qt.cpp:
 	    New files.
 
- ChangeLog		|   13 +++
- Makefile.am		|   13 ++-
- configure.ac		|   64 ++++++++++++-
- poppler-qt.pc.in	|   11 +++
- qt/Makefile.am		|   32 +++++++
- qt/poppler-document.cc |  232
- ++++++++++++++++++++++++++++++++++++++++++++++++
- qt/poppler-page.cc	|   66 ++++++++++++++
- qt/poppler-private.h	|   32 +++++++
- qt/poppler-qt.h	|   75 ++++++++++++++++
- qt/test-poppler-qt.cpp |   63 +++++++++++++
+ ChangeLog		|  13 +++
+ Makefile.am		|  13 ++-
+ configure.ac		|  64 +++++++++++++-
+ poppler-qt.pc.in	|  11 +++
+ qt/Makefile.am		|  32 +++++++
+ qt/poppler-document.cc | 232
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ qt/poppler-page.cc	|  66 ++++++++++++++
+ qt/poppler-private.h	|  32 +++++++
+ qt/poppler-qt.h	|  75 ++++++++++++++++
+ qt/test-poppler-qt.cpp |  63 ++++++++++++++
  10 files changed, 597 insertions(+), 4 deletions(-)
 
 commit d91dd69a7a0dd581c26728d2640e4d36a7ffe75f
@@ -47194,15 +50377,15 @@ Date:	Tue Apr 5 17:46:44 2005 +0000
 	    (splash_render_to_pixbuf): Split out the splash code to this
 	    function.
 
- ChangeLog			|   16 +++++
- NEWS				|    6 +-
- configure.ac			|   16 +++--
- glib/Makefile.am		|   17 ++++-
- glib/poppler-page.cc		|  152
- ++++++++++++++++++++++++++++++++--------
- poppler/CairoFontEngine.cc	|    2 +-
- poppler/CairoOutputDevImage.cc |   20 ++----
- poppler/CairoOutputDevImage.h	|    3 +-
+ ChangeLog			|  16 +++++
+ NEWS				|   6 +-
+ configure.ac			|  16 +++--
+ glib/Makefile.am		|  17 ++++-
+ glib/poppler-page.cc		| 152
+ +++++++++++++++++++++++++++++++++--------
+ poppler/CairoFontEngine.cc	|   2 +-
+ poppler/CairoOutputDevImage.cc |  20 ++----
+ poppler/CairoOutputDevImage.h	|   3 +-
  8 files changed, 179 insertions(+), 53 deletions(-)
 
 commit b62b0cec2335d987b31fbb0043cb33db29cc6a13
@@ -47213,7 +50396,7 @@ Date:	Tue Apr 5 02:56:32 2005 +0000
 
 	    * ChangeLog: Add this entry to test commit mailer script.
 
- ChangeLog |	2 ++
+ ChangeLog | 2 ++
  1 file changed, 2 insertions(+)
 
 commit 50b494266ce197fe88468ca2917b9910d77e5f98
@@ -47225,8 +50408,8 @@ Date:	Tue Apr 5 02:49:18 2005 +0000
 	    * TODO: Add reminder about using PDF font descriptors with
 	    fontconfig.
 
- ChangeLog |	3 +++
- TODO	   |	2 ++
+ ChangeLog | 3 +++
+ TODO	   | 2 ++
  2 files changed, 5 insertions(+)
 
 commit d3d12235bf4de48363571b3d992ea3bfc29e6529
@@ -47249,12 +50432,12 @@ Date:	Mon Apr 4 21:50:56 2005 +0000
 	    function to
 	    select text on page.
 
- ChangeLog	      |   15 +++++++++++++++
- configure.ac	      |    5 ++++-
- glib/poppler-page.cc |   48
+ ChangeLog	      | 15 +++++++++++++++
+ configure.ac	      |  5 ++++-
+ glib/poppler-page.cc | 48
  +++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-page.h  |    3 +++
- poppler/Makefile.am  |    4 ++++
+ glib/poppler-page.h  |  3 +++
+ poppler/Makefile.am  |  4 ++++
  5 files changed, 71 insertions(+), 4 deletions(-)
 
 commit 2cb9d70678e33504246cbfbe0525c33f5e3b7736
@@ -47267,8 +50450,8 @@ Date:	Mon Apr 4 05:56:29 2005 +0000
 	    list of
 	    matches so we get them in the right order.
 
- ChangeLog	      |    5 +++++
- glib/poppler-page.cc |    2 +-
+ ChangeLog	      | 5 +++++
+ glib/poppler-page.cc | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit 8c2a5ffb73c0f2d84adebcfbd43f8347ae8c8bbc
@@ -47280,8 +50463,8 @@ Date:	Sun Apr 3 18:17:55 2005 +0000
 	* poppler/DCTStream.h: Wrap #include <jpeglib.h> in extern "C"
 	Fixes build with unpatched libjpeg.
 
- ChangeLog	     |	  5 +++++
- poppler/DCTStream.h |	  2 ++
+ ChangeLog	     | 5 +++++
+ poppler/DCTStream.h | 2 ++
  2 files changed, 7 insertions(+)
 
 commit 1879d82d9088aa36ef5e677f4bae44c84f90caa6
@@ -47294,9 +50477,9 @@ Date:	Sat Apr 2 22:16:38 2005 +0000
 	* poppler/Page.cc (Page::Page):
 	Some initial infrastructure for supporting transitions.
 
- ChangeLog	 |    6 ++++++
- poppler/Page.cc |   10 ++++++++++
- poppler/Page.h  |    4 ++++
+ ChangeLog	 |  6 ++++++
+ poppler/Page.cc | 10 ++++++++++
+ poppler/Page.h  |  4 ++++
  3 files changed, 20 insertions(+)
 
 commit fa4efbed51e12811070798a7cfb6b1f9e8d57abc
@@ -47308,8 +50491,8 @@ Date:	Fri Apr 1 00:32:34 2005 +0000
 	    * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Clip
 	    output to destination pixbuf and fix RGB order.
 
- ChangeLog	      |    5 +++++
- glib/poppler-page.cc |   38 +++++++++++++++++++++++---------------
+ ChangeLog	      |  5 +++++
+ glib/poppler-page.cc | 38 +++++++++++++++++++++++---------------
  2 files changed, 28 insertions(+), 15 deletions(-)
 
 commit bb508ded0b8c5806a9db1ec73e57b14268896911
@@ -47326,11 +50509,11 @@ Date:	Thu Mar 31 22:45:05 2005 +0000
 	    a couple
 	    of functions.
 
- ChangeLog		  |    8 +++++
- glib/poppler-page.cc	  |   82
- ++++++++++++++++++++++++++++++++++++++++------
- glib/poppler-page.h	  |   18 +++++++---
- glib/test-poppler-glib.c |   19 +++++++++--
+ ChangeLog		  |  8 +++++
+ glib/poppler-page.cc	  | 82
+ ++++++++++++++++++++++++++++++++++++++++++------
+ glib/poppler-page.h	  | 18 ++++++++---
+ glib/test-poppler-glib.c | 19 +++++++++--
  4 files changed, 109 insertions(+), 18 deletions(-)
 
 commit 0b4d481e9c79cb18cf41b503970801bbf4b95b3c
@@ -47346,10 +50529,10 @@ Date:	Thu Mar 31 05:29:42 2005 +0000
 	    links to locations on the current document.
     :s
 
- ChangeLog	      |    7 +++++
- glib/poppler-page.cc |   85
- +++++++++++++++++++++++++++++++++++++++++++++++---
- glib/poppler-page.h  |   15 +++++++++
+ ChangeLog	      |  7 +++++
+ glib/poppler-page.cc | 85
+ ++++++++++++++++++++++++++++++++++++++++++++++++----
+ glib/poppler-page.h  | 15 ++++++++++
  3 files changed, 102 insertions(+), 5 deletions(-)
 
 commit c4e18f5a454794bd5e226f1106a54ccf807c6c3d
@@ -47361,8 +50544,8 @@ Date:	Thu Mar 31 02:28:46 2005 +0000
 	* poppler/DCTStream.h: change x to unsigned int to eliminate
 	comparision warning
 
- ChangeLog	     |	  5 +++++
- poppler/DCTStream.h |	  2 +-
+ ChangeLog	     | 5 +++++
+ poppler/DCTStream.h | 2 +-
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 commit e6a2a588305b4797af901599eb6854028f2be476
@@ -47373,8 +50556,8 @@ Date:	Wed Mar 30 18:43:44 2005 +0000
 
 	* poppler/Catalog.cc: delete pageLabelInfo on deconstruction
 
- ChangeLog	    |	 4 ++++
- poppler/Catalog.cc |	 1 +
+ ChangeLog	    | 4 ++++
+ poppler/Catalog.cc | 1 +
  2 files changed, 5 insertions(+)
 
 commit a52905c0f0bf4d10d2103b80924a4de204d03836
@@ -47383,8 +50566,8 @@ Date:	Wed Mar 30 04:08:26 2005 +0000
 
     add this
 
- glib/poppler-action.cc |  285
- ++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-action.cc | 285
+ +++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 285 insertions(+)
 
 commit 9542860a74076020b5727d4b761c08cdab42d69e
@@ -47393,8 +50576,8 @@ Date:	Wed Mar 30 04:07:57 2005 +0000
 
     add these
 
- glib/poppler-action.h |  157
- +++++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-action.h | 157
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 157 insertions(+)
 
 commit 07720f98eca8736695f7d0d8e98465d301e6b7cf
@@ -47405,8 +50588,8 @@ Date:	Wed Mar 30 04:07:39 2005 +0000
 
 	    * glib/poppler-page.h: Reformat.
 
- ChangeLog	     |	  4 ++++
- glib/poppler-page.h |	 34 +++++++++++++++++-----------------
+ ChangeLog	     |	4 ++++
+ glib/poppler-page.h | 34 +++++++++++++++++-----------------
  2 files changed, 21 insertions(+), 17 deletions(-)
 
 commit 3437b9e122aa05f4ede24664ee5a9b2d423ef9c4
@@ -47422,14 +50605,14 @@ Date:	Wed Mar 30 04:04:53 2005 +0000
 	    * glib/poppler-private.h (_poppler_action_new): New function.
 	    * glib/test-poppler-glib.c: Fix warnings.
 
- ChangeLog		  |    8 +++++++
- glib/Makefile.am	  |    2 ++
- glib/poppler-document.cc |   57
- +++++++++++-----------------------------------
- glib/poppler-document.h  |    7 ++----
- glib/poppler-private.h   |   12 ++++++++--
- glib/poppler.h		  |    1 +
- glib/test-poppler-glib.c |    4 +++-
+ ChangeLog		  |  8 +++++++
+ glib/Makefile.am	  |  2 ++
+ glib/poppler-document.cc | 57
+ +++++++++++-------------------------------------
+ glib/poppler-document.h  |  7 ++----
+ glib/poppler-private.h   | 12 ++++++++--
+ glib/poppler.h		  |  1 +
+ glib/test-poppler-glib.c |  4 +++-
  7 files changed, 39 insertions(+), 52 deletions(-)
 
 commit cab0ec4d011c34b571050a446c6e3286cc8749c8
@@ -47449,13 +50632,13 @@ Date:	Tue Mar 29 18:49:26 2005 +0000
 	    function.
 	    * poppler-glib.pc.in: add -lpoppler-glib to the libs line.
 
- ChangeLog		  |   12 ++++
- glib/poppler-document.cc |  160
- +++++++++++++++++++++++++++++++++++++++++++++-
- glib/poppler-document.h  |   15 +++++
- glib/poppler-page.cc	  |   48 +++++++++++++-
- glib/poppler-page.h	  |    3 +
- poppler-glib.pc.in	  |    2 +-
+ ChangeLog		  |  12 ++++
+ glib/poppler-document.cc | 160
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ glib/poppler-document.h  |  15 +++++
+ glib/poppler-page.cc	  |  48 +++++++++++++-
+ glib/poppler-page.h	  |   3 +
+ poppler-glib.pc.in	  |   2 +-
  6 files changed, 236 insertions(+), 4 deletions(-)
 
 commit 2de98f3871bc4ea3e361ca4fe37f5b6561918c77
@@ -47472,15 +50655,15 @@ Date:	Mon Mar 28 07:49:54 2005 +0000
 	    * glib/poppler-page.cc (poppler_page_get_thumbnail): New glib
 	    function for getting the embedded thumbnail image for a page.
 
- ChangeLog		  |   10 +++++
- glib/poppler-page.cc	  |   23 ++++++++++
- glib/poppler-page.h	  |   32 +++++++-------
- glib/test-poppler-glib.c |   24 +++++++---
- poppler/Dict.cc	  |   20 +++++++++
- poppler/Dict.h		  |    1 +
- poppler/Page.cc	  |  109
- ++++++++++++++++++++++++++++++++++++++++++++++
- poppler/Page.h		  |    1 +
+ ChangeLog		  |  10 +++++
+ glib/poppler-page.cc	  |  23 ++++++++++
+ glib/poppler-page.h	  |  32 +++++++-------
+ glib/test-poppler-glib.c |  24 ++++++++---
+ poppler/Dict.cc	  |  20 +++++++++
+ poppler/Dict.h		  |   1 +
+ poppler/Page.cc	  | 109
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/Page.h		  |   1 +
  8 files changed, 196 insertions(+), 24 deletions(-)
 
 commit 591055d1fbcd0b9c2bb11f14040568051c5976d1
@@ -47493,9 +50676,9 @@ Date:	Sat Mar 26 00:34:21 2005 +0000
 
 	    * configure.ac: Check for fontconfig for glib bindings.
 
- ChangeLog	  |    4 ++++
- configure.ac	  |    4 ++--
- glib/Makefile.am |    7 +++++--
+ ChangeLog	  | 4 ++++
+ configure.ac	  | 4 ++--
+ glib/Makefile.am | 7 +++++--
  3 files changed, 11 insertions(+), 4 deletions(-)
 
 commit 1e30abe94a96b91df05716ea079c58782d767951
@@ -47509,8 +50692,8 @@ Date:	Thu Mar 24 22:24:41 2005 +0000
 	    instead of GTK_TEST_*.  Reported by Adam Jackson
 	    <ajax@nwnk.net>.
 
- ChangeLog	  |    5 +++++
- glib/Makefile.am |    7 +++----
+ ChangeLog	  | 5 +++++
+ glib/Makefile.am | 7 +++----
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 commit 1d9fcaa34222b2ccd53280148561917dbb8d95d9
@@ -47528,9 +50711,9 @@ Date:	Wed Mar 23 05:53:08 2005 +0000
 	    take the
 	    page label from the command line.
 
- ChangeLog		  |    6 ++++++
- glib/test-poppler-glib.c |    5 ++++-
- poppler/Catalog.cc	  |   31 +++++++++++++++++++++++++++++--
+ ChangeLog		  |  6 ++++++
+ glib/test-poppler-glib.c |  5 ++++-
+ poppler/Catalog.cc	  | 31 +++++++++++++++++++++++++++++--
  3 files changed, 39 insertions(+), 3 deletions(-)
 
 commit a9bbb465a0ee6ab320f76d322a3f575327ad1148
@@ -47543,10 +50726,10 @@ Date:	Wed Mar 23 05:38:34 2005 +0000
 	    * glib/poppler-page.h: Add poppler_page_get_index() and rename
 	    popper_page_get_dimension() to popper_page_get_size()
 
- ChangeLog		  |    6 ++++++
- glib/poppler-page.cc	  |   12 +++++++++---
- glib/poppler-page.h	  |   32 +++++++++++++++++---------------
- glib/test-poppler-glib.c |    5 ++---
+ ChangeLog		  |  6 ++++++
+ glib/poppler-page.cc	  | 12 +++++++++---
+ glib/poppler-page.h	  | 32 +++++++++++++++++---------------
+ glib/test-poppler-glib.c |  5 ++---
  4 files changed, 34 insertions(+), 21 deletions(-)
 
 commit 178bff27d09d1e18d1fc00c975fa235b0e9f93d3
@@ -47560,9 +50743,9 @@ Date:	Wed Mar 23 04:14:28 2005 +0000
 	    * glib/poppler-document.h: Add prototype and format headers
 	    properly.
 
- ChangeLog		  |    7 +++++++
- glib/poppler-document.cc |   20 ++++++++++++++++++++
- glib/poppler-document.h  |   30 +++++++++++++-----------------
+ ChangeLog		  |  7 +++++++
+ glib/poppler-document.cc | 20 ++++++++++++++++++++
+ glib/poppler-document.h  | 30 +++++++++++++-----------------
  3 files changed, 40 insertions(+), 17 deletions(-)
 
 commit e40c6f69c9466df4cc70840b959f72cb0809c777
@@ -47574,8 +50757,8 @@ Date:	Wed Mar 23 01:30:04 2005 +0000
 	    * configure.ac: Fix --disable-popper typo reported by Albert.
 	    Require exactly cairo 0.4 since CVS cairo has API changes.
 
- ChangeLog    |    5 +++++
- configure.ac |    6 +++---
+ ChangeLog    | 5 +++++
+ configure.ac | 6 +++---
  2 files changed, 8 insertions(+), 3 deletions(-)
 
 commit 2a1e4f6f6dd87dc59b3579175a87215fd7350ee0
@@ -47590,12 +50773,12 @@ Date:	Tue Mar 22 22:46:37 2005 +0000
 	    * poppler/Catalog.cc:
 	    * poppler/Catalog.h: Optimize lookup of named destinations.
 
- ChangeLog	    |	 8 +++
- poppler/Array.cc   |	15 ++++++
- poppler/Array.h    |	 1 +
- poppler/Catalog.cc |  142
- +++++++++++++++++++++++++++++++++-------------------
- poppler/Catalog.h  |	32 +++++++++++-
+ ChangeLog	    |	8 +++
+ poppler/Array.cc   |  15 ++++++
+ poppler/Array.h    |	1 +
+ poppler/Catalog.cc | 142
+ ++++++++++++++++++++++++++++++++++-------------------
+ poppler/Catalog.h  |  32 +++++++++++-
  5 files changed, 146 insertions(+), 52 deletions(-)
 
 commit 4dfe0ce4a1ca09d632943f0f6315e31135957ada
@@ -47606,9 +50789,9 @@ Date:	Tue Mar 22 01:50:05 2005 +0000
 
 	    * NEWS, TODO: Update these.
 
- ChangeLog |	4 ++++
- NEWS	   |	1 +
- TODO	   |   29 ++++++++++++++++++++---------
+ ChangeLog |  4 ++++
+ NEWS	   |  1 +
+ TODO	   | 29 ++++++++++++++++++++---------
  3 files changed, 25 insertions(+), 9 deletions(-)
 
 commit c158de90a5a8c6514d8aa22efa0b891a1801e822
@@ -47624,9 +50807,9 @@ Date:	Mon Mar 21 07:53:19 2005 +0000
 	    from the Catalog dict and expose it through getPageMode()
 	    method.
 
- ChangeLog	    |	10 ++++++++--
- poppler/Catalog.cc |	16 ++++++++++++++++
- poppler/Catalog.h  |	12 ++++++++++++
+ ChangeLog	    | 10 ++++++++--
+ poppler/Catalog.cc | 16 ++++++++++++++++
+ poppler/Catalog.h  | 12 ++++++++++++
  3 files changed, 36 insertions(+), 2 deletions(-)
 
 commit 9887679ca195714d71cbedde9297e9dcea04eb13
@@ -47657,18 +50840,18 @@ Date:	Mon Mar 21 07:36:11 2005 +0000
 
 	    * poppler/Makefile.am: Add new files to sources.
 
- ChangeLog		  |   23 +++
- glib/poppler-document.cc |   95 ++++++++++++-
- glib/poppler-document.h  |    3 +
- glib/poppler-page.cc	  |   37 ++++-
- glib/poppler-private.h   |    3 +-
- glib/test-poppler-glib.c |   13 +-
- poppler/Catalog.cc	  |   15 ++
- poppler/Catalog.h	  |    6 +
- poppler/Makefile.am	  |    4 +-
- poppler/PageLabelInfo.cc |  346
- ++++++++++++++++++++++++++++++++++++++++++++++
- poppler/PageLabelInfo.h  |   37 +++++
+ ChangeLog		  |  23 ++++
+ glib/poppler-document.cc |  95 ++++++++++++-
+ glib/poppler-document.h  |   3 +
+ glib/poppler-page.cc	  |  37 ++++-
+ glib/poppler-private.h   |   3 +-
+ glib/test-poppler-glib.c |  13 +-
+ poppler/Catalog.cc	  |  15 ++
+ poppler/Catalog.h	  |   6 +
+ poppler/Makefile.am	  |   4 +-
+ poppler/PageLabelInfo.cc | 346
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/PageLabelInfo.h  |  37 +++++
  11 files changed, 573 insertions(+), 9 deletions(-)
 
 commit 2cfe917de909254bc3a114a6add68a14b5885fd0
@@ -47686,13 +50869,13 @@ Date:	Sun Mar 20 05:44:06 2005 +0000
 	    and
 	    comments.
 
- ChangeLog		  |   10 ++++++++++
- glib/poppler-document.cc |    2 +-
- glib/poppler-document.h  |    2 +-
- glib/poppler-page.cc	  |    2 +-
- glib/poppler-page.h	  |    2 +-
- glib/poppler.cc	  |    2 +-
- glib/poppler.h		  |    2 +-
+ ChangeLog		  | 10 ++++++++++
+ glib/poppler-document.cc |  2 +-
+ glib/poppler-document.h  |  2 +-
+ glib/poppler-page.cc	  |  2 +-
+ glib/poppler-page.h	  |  2 +-
+ glib/poppler.cc	  |  2 +-
+ glib/poppler.h		  |  2 +-
  7 files changed, 16 insertions(+), 6 deletions(-)
 
 commit f9b6017cfaf8f814ae2fc027927477c29f24af71
@@ -47719,22 +50902,22 @@ Date:	Sun Mar 20 00:35:21 2005 +0000
 	    * glib/test-poppler-glib.c:
 	    * poppler-glib.pc.in: New files.
 
- ChangeLog		  |   19 ++++++
- Makefile.am		  |   27 ++++----
- NEWS			  |    4 ++
- configure.ac		  |   25 ++++++-
- glib/Makefile.am	  |   33 ++++++++++
- glib/poppler-document.cc |  165
- ++++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-document.h  |   52 +++++++++++++++
- glib/poppler-page.cc	  |  158
- ++++++++++++++++++++++++++++++++++++++++++++
- glib/poppler-page.h	  |   50 ++++++++++++++
- glib/poppler-private.h   |   20 ++++++
- glib/poppler.cc	  |   29 ++++++++
- glib/poppler.h		  |   42 ++++++++++++
- glib/test-poppler-glib.c |   43 ++++++++++++
- poppler-glib.pc.in	  |   11 ++++
+ ChangeLog		  |  19 ++++++
+ Makefile.am		  |  27 ++++----
+ NEWS			  |   4 ++
+ configure.ac		  |  25 ++++++-
+ glib/Makefile.am	  |  33 ++++++++++
+ glib/poppler-document.cc | 165
+ +++++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-document.h  |  52 +++++++++++++++
+ glib/poppler-page.cc	  | 158
+ +++++++++++++++++++++++++++++++++++++++++++++
+ glib/poppler-page.h	  |  50 ++++++++++++++
+ glib/poppler-private.h   |  20 ++++++
+ glib/poppler.cc	  |  29 +++++++++
+ glib/poppler.h		  |  42 ++++++++++++
+ glib/test-poppler-glib.c |  43 ++++++++++++
+ poppler-glib.pc.in	  |  11 ++++
  14 files changed, 661 insertions(+), 17 deletions(-)
 
 commit 2a31446b227b5cdc8334e672a71835b6ea14713a
@@ -47748,8 +50931,8 @@ Date:	Wed Mar 16 15:51:36 2005 +0000
 	* poppler/XRef.cc (XRef::checkEncrypted):
 	The key length should be 5 for revision 2 documents.
 
- ChangeLog	 |    7 +++++++
- poppler/XRef.cc |    6 ++++++
+ ChangeLog	 | 7 +++++++
+ poppler/XRef.cc | 6 ++++++
  2 files changed, 13 insertions(+)
 
 commit e632a1d4b2f685993bda407458c34ef8e6b74136
@@ -47764,8 +50947,8 @@ Date:	Fri Mar 11 22:43:29 2005 +0000
 	    Use
 	    getLine instead of getPixel.
 
- ChangeLog		   |	3 +++
- poppler/CairoOutputDev.cc |   18 ++++++++----------
+ ChangeLog		   |  3 +++
+ poppler/CairoOutputDev.cc | 18 ++++++++----------
  2 files changed, 11 insertions(+), 10 deletions(-)
 
 commit 83e904452f205a2c0cd2723cb12b7fd4640ce342
@@ -47781,14 +50964,14 @@ Date:	Fri Mar 11 21:42:52 2005 +0000
 	    * DCTStream.cc, DCTStream.h, Stream.cc, Stream.h, Makefile.am:
 	    Conditionally use libjpeg instead of xpdf jpeg decoder.
 
- ChangeLog	      |    9 +++++
- configure.ac	      |   34 +++++++++++++++-
- poppler/DCTStream.cc |  110
- ++++++++++++++++++++++++++++++++++++++++++++++++++
- poppler/DCTStream.h  |   70 ++++++++++++++++++++++++++++++++
- poppler/Makefile.am  |   14 ++++++-
- poppler/Stream.cc    |    8 ++++
- poppler/Stream.h     |    2 +
+ ChangeLog	      |   9 +++++
+ configure.ac	      |  34 +++++++++++++++-
+ poppler/DCTStream.cc | 110
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ poppler/DCTStream.h  |  70 ++++++++++++++++++++++++++++++++
+ poppler/Makefile.am  |  14 ++++++-
+ poppler/Stream.cc    |   8 ++++
+ poppler/Stream.h     |   2 +
  7 files changed, 245 insertions(+), 2 deletions(-)
 
 commit e2af71338fd89760c4ac76999985efc5eb92817f
@@ -47809,10 +50992,10 @@ Date:	Fri Mar 11 16:42:20 2005 +0000
 	    (CairoOutputDev::interpretType3Chars): Return true so that
 	    Gfx.cc turns type3 characters into calls to drawImageMask
 
- ChangeLog		    |	14 ++++++++++++++
- poppler/CairoFontEngine.cc |	 1 -
- poppler/CairoOutputDev.cc  |	25 ++++++++++---------------
- poppler/CairoOutputDev.h   |	 2 +-
+ ChangeLog		    | 14 ++++++++++++++
+ poppler/CairoFontEngine.cc |  1 -
+ poppler/CairoOutputDev.cc  | 25 ++++++++++---------------
+ poppler/CairoOutputDev.h   |  2 +-
  4 files changed, 25 insertions(+), 17 deletions(-)
 
 commit 3dc52373346e448077d2539163e873eef6406ed7
@@ -47825,9 +51008,9 @@ Date:	Wed Mar 9 15:47:00 2005 +0000
 
 	    * configure.ac: Bump poppler version to 0.1.2
 
- ChangeLog    |    6 ++++++
- NEWS	      |   12 ++++++++++++
- configure.ac |    2 +-
+ ChangeLog    |  6 ++++++
+ NEWS	      | 12 ++++++++++++
+ configure.ac |  2 +-
  3 files changed, 19 insertions(+), 1 deletion(-)
 
 commit 5c6a2d34fc25df28ca5326e6910d7cf664f0c3d7
@@ -47838,8 +51021,8 @@ Date:	Wed Mar 9 15:35:31 2005 +0000
 
 	    * configure.ac: Bump cairo requirement to 0.4.
 
- ChangeLog    |    4 ++++
- configure.ac |    4 ++--
+ ChangeLog    | 4 ++++
+ configure.ac | 4 ++--
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 commit 5b2d9a61e79cefd819888c8c89231a5fafccd114
@@ -47862,11 +51045,11 @@ Date:	Sat Mar 5 04:57:49 2005 +0000
 	    * poppler/CairoOutputDev.h (CairoOutputDev::useDrawChar):
 	    Tell Gfx.cc that it should use drawString instead of drawChar.
 
- ChangeLog		   |   14 ++++++
- TODO			   |	3 ++
- poppler/CairoOutputDev.cc |  110
- ++++++++++++++++++++++++++++++++++-----------
- poppler/CairoOutputDev.h  |	7 +--
+ ChangeLog		   |  14 ++++++
+ TODO			   |   3 ++
+ poppler/CairoOutputDev.cc | 110
+ ++++++++++++++++++++++++++++++++++------------
+ poppler/CairoOutputDev.h  |   7 +--
  4 files changed, 102 insertions(+), 32 deletions(-)
 
 commit 60d190ef80a0dcd9cc3a67306e2c65c5dd482f24
@@ -47887,11 +51070,11 @@ Date:	Sat Mar 5 04:37:14 2005 +0000
 	    * .cvsignore:
 	    * */.cvsignore: Add these to silence CVS.
 
- ChangeLog		 |    9 +++++++++
- TODO			 |   15 +++++++++++----
- configure.ac		 |   21 +++++++++++++++++++++
- test/gtk-cairo-test.cc  |    6 ++----
- test/gtk-splash-test.cc |    5 ++---
+ ChangeLog		 |  9 +++++++++
+ TODO			 | 15 +++++++++++----
+ configure.ac		 | 21 +++++++++++++++++++++
+ test/gtk-cairo-test.cc  |  6 ++----
+ test/gtk-splash-test.cc |  5 ++---
  5 files changed, 45 insertions(+), 11 deletions(-)
 
 commit e6706e505c1675724c8870f7c58079932661db5f
@@ -47903,13 +51086,13 @@ Date:	Sat Mar 5 02:19:50 2005 +0000
 	    * .cvsignore:
 	    * */.cvsignore: Add these to silence CVS.
 
- .cvsignore	    |	21 +++++++++++++++++++++
- ChangeLog	    |	 3 +++
- fofi/.cvsignore    |	 8 ++++++++
- goo/.cvsignore     |	 8 ++++++++
- poppler/.cvsignore |	10 ++++++++++
- splash/.cvsignore  |	 8 ++++++++
- test/.cvsignore    |	10 ++++++++++
+ .cvsignore	    | 21 +++++++++++++++++++++
+ ChangeLog	    |  3 +++
+ fofi/.cvsignore    |  8 ++++++++
+ goo/.cvsignore     |  8 ++++++++
+ poppler/.cvsignore | 10 ++++++++++
+ splash/.cvsignore  |  8 ++++++++
+ test/.cvsignore    | 10 ++++++++++
  7 files changed, 68 insertions(+)
 
 commit 932edfc3c5c61e3b3e98957b717abbf8055e1c5e
@@ -47921,8 +51104,8 @@ Date:	Fri Mar 4 19:47:13 2005 +0000
 	    * configure.ac: Implement same check for gtk+-2.0 tests as for
 	    cairo.
 
- ChangeLog    |    5 +++++
- configure.ac |   11 ++++++++---
+ ChangeLog    |  5 +++++
+ configure.ac | 11 ++++++++---
  2 files changed, 13 insertions(+), 3 deletions(-)
 
 commit c632b35ad9345f280d78c268f84ae3fd5a3921b9
@@ -47940,8 +51123,8 @@ Date:	Fri Mar 4 16:33:43 2005 +0000
 	    * poppler/poppler-config.h: Remove this file (noticed by Brad
 	    Hards <bradh@frogmouth.net>).
 
- ChangeLog    |    5 +++++
- configure.ac |   17 ++++++++++++++---
+ ChangeLog    |  5 +++++
+ configure.ac | 17 ++++++++++++++---
  2 files changed, 19 insertions(+), 3 deletions(-)
 
 commit 80f9c90273eb31ac349c46bf86dedff7daf21db4
@@ -47953,9 +51136,9 @@ Date:	Fri Mar 4 15:32:32 2005 +0000
 	    * poppler/poppler-config.h: Remove this file (noticed by Brad
 	    Hards <bradh@frogmouth.net>).
 
- ChangeLog		  |    5 ++
- poppler/poppler-config.h |  146
- ----------------------------------------------
+ ChangeLog		  |   5 ++
+ poppler/poppler-config.h | 146
+ -----------------------------------------------
  2 files changed, 5 insertions(+), 146 deletions(-)
 
 commit 338b83b6f08a7212fdde2bbce94385e9a71a3d23
@@ -47970,9 +51153,9 @@ Date:	Fri Mar 4 02:46:44 2005 +0000
 	    CairoOutputDev::drawImageMask): destroy the image surface and
 	    free the image buffer.
 
- ChangeLog		   |   10 ++++++++++
- autogen.sh		   |	2 +-
- poppler/CairoOutputDev.cc |	8 +++++---
+ ChangeLog		   | 10 ++++++++++
+ autogen.sh		   |  2 +-
+ poppler/CairoOutputDev.cc |  8 +++++---
  3 files changed, 16 insertions(+), 4 deletions(-)
 
 commit 062aa51487f539406b54458885b4c9501da3c44d
@@ -47983,8 +51166,8 @@ Date:	Thu Mar 3 20:01:14 2005 +0000
 
 	    * autogen.sh: Add to CVS.
 
- ChangeLog  |	 4 ++++
- autogen.sh |	 4 ++++
+ ChangeLog  | 4 ++++
+ autogen.sh | 4 ++++
  2 files changed, 8 insertions(+)
 
 commit cb02d5d0e770e2a8cbe5a8ac810820a2ce5fec0c
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 6e547ed6..d3f57325 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -27,6 +27,8 @@ check_include_files(unistd.h HAVE_UNISTD_H)
 check_function_exists(fseek64 HAVE_FSEEK64)
 check_function_exists(fseeko HAVE_FSEEKO)
 check_function_exists(ftell64 HAVE_FTELL64)
+check_function_exists(pread64 HAVE_PREAD64)
+check_function_exists(lseek64 HAVE_LSEEK64)
 check_function_exists(gmtime_r HAVE_GMTIME_R)
 check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
 check_function_exists(localtime_r HAVE_LOCALTIME_R)
@@ -34,6 +36,8 @@ check_function_exists(popen HAVE_POPEN)
 check_function_exists(mkstemp HAVE_MKSTEMP)
 check_function_exists(mkstemps HAVE_MKSTEMPS)
 check_function_exists(rand_r HAVE_RAND_R)
+check_function_exists(strcpy_s HAVE_STRCPY_S)
+check_function_exists(strcat_s HAVE_STRCAT_S)
 
 macro(CHECK_FOR_DIR include var)
   check_c_source_compiles(
diff --git a/Makefile.am b/Makefile.am
index a9f5db1c..e7e5bace 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,11 +15,17 @@ glib_subdir = glib
 glib_pc_file = poppler-glib.pc
 endif
 
+if BUILD_POPPLER_QT5
+qt5_subdir = qt5
+qt5_pc_file = poppler-qt5.pc
+endif
+
 if BUILD_POPPLER_QT4
 qt4_subdir = qt4
 qt4_pc_file = poppler-qt4.pc
 endif
 
+
 if BUILD_POPPLER_CPP
 cpp_subdir = cpp
 cpp_pc_file = poppler-cpp.pc
@@ -29,7 +35,7 @@ if BUILD_UTILS
 utils_subdir = utils
 endif
 
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(cpp_subdir)
+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
 
 EXTRA_DIST =					\
 	README-XPDF				\
@@ -41,6 +47,8 @@ EXTRA_DIST =					\
 	poppler-splash-uninstalled.pc.in	\
 	poppler-qt4.pc.in			\
 	poppler-qt4-uninstalled.pc.in		\
+	poppler-qt5.pc.in			\
+	poppler-qt5-uninstalled.pc.in		\
 	poppler-cpp.pc.in			\
 	poppler-cpp-uninstalled.pc.in
 
@@ -51,6 +59,7 @@ pkgconfig_DATA =				\
 	$(splash_pc_file)			\
 	$(glib_pc_file)				\
 	$(qt4_pc_file)				\
+	$(qt5_pc_file)				\
 	$(cpp_pc_file)
 
 # Add CMake buildsystem files here so they get added on make dist
@@ -64,10 +73,16 @@ EXTRA_DIST +=							\
 	qt4/tests/CMakeLists.txt				\
 	qt4/CMakeLists.txt					\
 	qt4/demos/CMakeLists.txt				\
+	qt5/src/CMakeLists.txt					\
+	qt5/tests/CMakeLists.txt				\
+	qt5/CMakeLists.txt					\
+	qt5/demos/CMakeLists.txt				\
 	test/CMakeLists.txt					\
 	utils/CMakeLists.txt					\
 	CMakeLists.txt						\
 	ConfigureChecks.cmake					\
+	cmake/modules/CheckFileOffsetBits.c			\
+	cmake/modules/CheckFileOffsetBits.cmake			\
 	cmake/modules/COPYING-CMAKE-SCRIPTS			\
 	cmake/modules/FindCairo.cmake				\
 	cmake/modules/FindFontconfig.cmake			\
@@ -92,6 +107,7 @@ EXTRA_DIST +=							\
 	poppler-cpp.pc.cmake					\
 	poppler-glib.pc.cmake					\
 	poppler-qt4.pc.cmake					\
+	poppler-qt5.pc.cmake					\
 	poppler-splash.pc.cmake					\
 	poppler.pc.cmake
 
diff --git a/Makefile.in b/Makefile.in
index fc70aec6..3ae3732b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,24 +79,26 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/poppler-cairo-uninstalled.pc.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in $(srcdir)/poppler.pc.in \
+	$(srcdir)/poppler-uninstalled.pc.in \
 	$(srcdir)/poppler-cairo.pc.in \
-	$(srcdir)/poppler-cpp-uninstalled.pc.in \
-	$(srcdir)/poppler-cpp.pc.in \
-	$(srcdir)/poppler-glib-uninstalled.pc.in \
+	$(srcdir)/poppler-cairo-uninstalled.pc.in \
+	$(srcdir)/poppler-splash.pc.in \
+	$(srcdir)/poppler-splash-uninstalled.pc.in \
 	$(srcdir)/poppler-glib.pc.in \
-	$(srcdir)/poppler-qt4-uninstalled.pc.in \
+	$(srcdir)/poppler-glib-uninstalled.pc.in \
 	$(srcdir)/poppler-qt4.pc.in \
-	$(srcdir)/poppler-splash-uninstalled.pc.in \
-	$(srcdir)/poppler-splash.pc.in \
-	$(srcdir)/poppler-uninstalled.pc.in $(srcdir)/poppler.pc.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	TODO config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
+	$(srcdir)/poppler-qt4-uninstalled.pc.in \
+	$(srcdir)/poppler-qt5.pc.in \
+	$(srcdir)/poppler-qt5-uninstalled.pc.in \
+	$(srcdir)/poppler-cpp.pc.in \
+	$(srcdir)/poppler-cpp-uninstalled.pc.in AUTHORS COPYING \
+	ChangeLog INSTALL NEWS README TODO config.guess config.sub \
+	depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -86,24 +115,32 @@ CONFIG_CLEAN_FILES = poppler.pc poppler-uninstalled.pc \
 	poppler-cairo.pc poppler-cairo-uninstalled.pc \
 	poppler-splash.pc poppler-splash-uninstalled.pc \
 	poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc \
-	poppler-qt4-uninstalled.pc poppler-cpp.pc \
+	poppler-qt4-uninstalled.pc poppler-qt5.pc \
+	poppler-qt5-uninstalled.pc poppler-cpp.pc \
 	poppler-cpp-uninstalled.pc
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -140,12 +177,34 @@ am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
 DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = goo fofi splash poppler utils glib test qt4 cpp
+CSCOPE = cscope
+DIST_SUBDIRS = goo fofi splash poppler utils glib test qt4 qt5 cpp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -155,6 +214,7 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -182,6 +242,7 @@ am__relativize = \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -278,6 +339,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -312,10 +376,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -337,13 +407,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -393,25 +463,32 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-testdatadir=$(TESTDATADIR)
 @BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
 @BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
 @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
+@BUILD_POPPLER_QT5_TRUE@qt5_subdir = qt5
+@BUILD_POPPLER_QT5_TRUE@qt5_pc_file = poppler-qt5.pc
 @BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
 @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
 @BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
 @BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
 @BUILD_UTILS_TRUE@utils_subdir = utils
-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(cpp_subdir)
+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
 
 # Add CMake buildsystem files here so they get added on make dist
 EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
 	poppler-cairo.pc.in poppler-cairo-uninstalled.pc.in \
 	poppler-splash.pc.in poppler-splash-uninstalled.pc.in \
 	poppler-qt4.pc.in poppler-qt4-uninstalled.pc.in \
+	poppler-qt5.pc.in poppler-qt5-uninstalled.pc.in \
 	poppler-cpp.pc.in poppler-cpp-uninstalled.pc.in \
 	cpp/tests/CMakeLists.txt cpp/CMakeLists.txt \
 	glib/demo/CMakeLists.txt glib/CMakeLists.txt \
 	glib/poppler-features.h.cmake qt4/src/CMakeLists.txt \
 	qt4/tests/CMakeLists.txt qt4/CMakeLists.txt \
-	qt4/demos/CMakeLists.txt test/CMakeLists.txt \
+	qt4/demos/CMakeLists.txt qt5/src/CMakeLists.txt \
+	qt5/tests/CMakeLists.txt qt5/CMakeLists.txt \
+	qt5/demos/CMakeLists.txt test/CMakeLists.txt \
 	utils/CMakeLists.txt CMakeLists.txt ConfigureChecks.cmake \
+	cmake/modules/CheckFileOffsetBits.c \
+	cmake/modules/CheckFileOffsetBits.cmake \
 	cmake/modules/COPYING-CMAKE-SCRIPTS \
 	cmake/modules/FindCairo.cmake \
 	cmake/modules/FindFontconfig.cmake \
@@ -430,7 +507,8 @@ EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
 	cmake/modules/FindLIBOPENJPEG.cmake config.h.cmake \
 	poppler-cairo.pc.cmake poppler/poppler-config.h.cmake \
 	poppler-cpp.pc.cmake poppler-glib.pc.cmake \
-	poppler-qt4.pc.cmake poppler-splash.pc.cmake poppler.pc.cmake
+	poppler-qt4.pc.cmake poppler-qt5.pc.cmake \
+	poppler-splash.pc.cmake poppler.pc.cmake
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
 	poppler.pc				\
@@ -438,6 +516,7 @@ pkgconfig_DATA = \
 	$(splash_pc_file)			\
 	$(glib_pc_file)				\
 	$(qt4_pc_file)				\
+	$(qt5_pc_file)				\
 	$(cpp_pc_file)
 
 all: config.h
@@ -513,6 +592,10 @@ poppler-qt4.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt4.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 poppler-qt4-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt4-uninstalled.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-qt5.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt5.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+poppler-qt5-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-qt5-uninstalled.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 poppler-cpp.pc: $(top_builddir)/config.status $(srcdir)/poppler-cpp.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 poppler-cpp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/poppler-cpp-uninstalled.pc.in
@@ -549,22 +632,25 @@ uninstall-pkgconfigDATA:
 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -579,57 +665,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -645,12 +686,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -662,15 +698,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -679,9 +711,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -749,40 +803,36 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -793,8 +843,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -806,9 +854,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -840,7 +888,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -978,15 +1026,14 @@ ps-am:
 
 uninstall-am: uninstall-pkgconfigDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-local distclean-tags \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-local distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -996,8 +1043,7 @@ uninstall-am: uninstall-pkgconfigDATA
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-pkgconfigDATA
+	tags tags-am uninstall uninstall-am uninstall-pkgconfigDATA
 
 
 distclean-local:
diff --git a/NEWS b/NEWS
index 36c0398f..e1f7cfe4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,145 @@
+Release 0.24.1
+        core:
+         * SplashOutputDev: use getRGBLine images if available. Bug #66928
+         * SplashOutputDev: Don't copy bitmap if we don't need to.
+         * PSOutputDev: Fix regression in -eps -level1sep rendering. Bug #68321
+         * Fix crash in malformed file 1026.asan.0.42.pdf
+         * use copyString instead of strdup where memory is freed with gfree. Bug #67666
+
+        utils:
+         * pdfdetach: don't mention xpdfrc
+         * pdftotext: Fix -bbox with stdin as input. Bug #45163
+         * pdftohtml: Fix jpeg image export. Bug #48270
+         * pdfimages: Fix typos in man page
+
+        glib:
+         * demo: Remove GTK_DISABLE_DEPRECATED compilation flag
+
+        qt4:
+         * Fix small typo in documentation
+
+        qt5:
+         * Fix small typo in documentation
+
+Release 0.24.0
+        core:
+         * TextOutputDev: Do not draw ligatures more than once when selected. Bug #9001
+         * PSOutputDev: Make some pdftops conversions much faster
+         * PSOutputDev: Initialize t3FillColorOnly
+         * SplashOutputDev: Fallback to 1x1 bitmap if we fail to create the real size
+
+Release 0.23.4
+        core:
+         * TextOutputDev: clip the selected text rendering to the selection box. Bug #66983
+         * CairoImageOutputDev: Fix the bounding box of saved images
+
+        build system:
+         * Improve linking against pthreads
+
+Release 0.23.3
+        core:
+         * Annotation improvements
+         * Fix crashes on malformed files
+         * TextSelectionPainter: Draw glyphs after selection background
+         * TextOutputDev: add a method to TextPage to get the selection as a list of words
+
+        qt5:
+         * Initial Qt5 port
+
+        qt4:
+         * Windows compile fixes
+         * Demo: Allow the choose the page rotation
+
+        build system:
+         * Fix mingw build
+         * Minor autotools fixes
+
+Release 0.23.2
+        core:
+         * SplashOutputDev: Speed-up some tiling on a 10x factor
+         * Improve caching of lcms2 ICC color profiles
+         * Put some private classes in an anonymous namespace
+
+        qt4:
+         * Add a thread stresser tool
+
+        build system:
+         * Fix mingw build
+
+Release 0.23.1
+        core:
+         * XRef stream writing: Write 32-bit offsets when possible
+         * Fix splashModeBGR8 rendering (Bug #64381)
+
+        glib:
+         * Do not use deprecated gtk_scrolled_window_add_with_viewport() (Bug #64683)
+
+        build system:
+         * Fix Large file support when using cmake
+
+Release 0.23.0
+        core:
+         * Make rendering thread safe
+         * Large file support
+         * Implement Crypt filter (Bug #62800)
+         * Fix endstream detection (Bug #62985)
+         * CairoOutputDev: support uncolored tiling patterns (Bug #59179)
+         * SplashOutputDev: Introduce Thin Line mode support (Bug #37347)
+
+        qt4:
+         * Expose Thin Line mode support
+
+Release 0.22.4
+        core:
+         * Always consider a softmask transfer function (Bug #63587)
+         * Fix crash on malformed files (Bug #63190)
+         * Splash: Fix compilation with fixed point mode enabled
+
+        utils:
+         * Fix crash on some files (Bug #63909)
+
+        qt4:
+         * Fix name decoding of some attachments (KDE Bug #307786)
+
+        build system:
+         * Fix compilation with mingw-w64 compiler
+
+Release 0.22.3
+        core:
+         * Check order bounding box values in tiling pattern (Bug #62369)
+         * CairoImageOutputDev: Don't change image interpolation when printing (Bug #62418)
+         * TextOutputDev: Set text matrix when painting selection (Bug #61042)
+         * Only write the file once when saving (Bug #62739)
+         * Fix for complete rewrites in repaired files
+         * Fixlet regarding spec interpretation for Link Zoom value
+         * Fix typos in man pages
+         * Fix compile when not using libjpeg
+
+        glib:
+         * Always start from the beginning when starting a new search on a page (Bug #59972)
+
+        qt4:
+         * Fix crash in files with LinkRendition (KDE Bug #317710)
+
+        build system:
+         * Small cmake improvements
+
+Release 0.22.2
+        core:
+         * Correct rendering of underline and strike out annotations (Bug #61518)
+         * Workaround broken jpeg stream definitions (Bug #61994)
+         * SplashOutputDev: Restore CTM on early exits (Bug #61413)
+         * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432)
+         * Fix latin page labels. (Bug #61034)
+         * Fix compilation with jpeglib9
+         * Fix minor valgrind warning
+
+        utils:
+         * pdfimages: Fix extraction of some images (Bug #61168)
+
+        build system:
+         * Fix the build with automake-1.13
+
 Release 0.22.1
         core:
          * Fix crash in some pdf files when extracting text (Bug #59561)
diff --git a/aclocal.m4 b/aclocal.m4
index 7317371f..21796860 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # lib-link.m4 serial 21 (gettext-0.18)
 dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
@@ -1180,25 +1180,22 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.13.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -1214,24 +1211,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.13.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -1250,7 +1245,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -1276,22 +1271,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -1310,16 +1302,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -1329,7 +1319,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -1342,12 +1332,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -1355,8 +1346,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -1396,16 +1387,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -1414,8 +1405,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -1423,7 +1414,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -1471,7 +1462,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -1481,9 +1472,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -1498,20 +1493,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -1524,7 +1517,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -1536,21 +1529,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -1568,7 +1559,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -1576,29 +1567,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
@@ -1614,7 +1590,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -1643,31 +1619,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -1678,28 +1663,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
@@ -1727,15 +1716,12 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -1749,16 +1735,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -1774,14 +1758,12 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -1799,7 +1781,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -1826,15 +1808,12 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -1842,11 +1821,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -1859,54 +1837,22 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -1916,7 +1862,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -1932,22 +1878,16 @@ AC_DEFUN([_AM_IF_OPTION],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -1958,32 +1898,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -1993,31 +1941,50 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
@@ -2035,7 +2002,7 @@ else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
@@ -2052,44 +2019,40 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -2103,18 +2066,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -2124,81 +2085,119 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/acx_pthread.m4])
+m4_include([m4/ax_pthread.m4])
 m4_include([m4/define-dir.m4])
 m4_include([m4/gtk-doc.m4])
 m4_include([m4/iconv.m4])
diff --git a/cmake/modules/CheckFileOffsetBits.c b/cmake/modules/CheckFileOffsetBits.c
new file mode 100644
index 00000000..d948fecf
--- /dev/null
+++ b/cmake/modules/CheckFileOffsetBits.c
@@ -0,0 +1,14 @@
+#include <sys/types.h>
+
+#define KB ((off_t)1024)
+#define MB ((off_t)1024 * KB)
+#define GB ((off_t)1024 * MB)
+#define TB ((off_t)1024 * GB)
+int t2[(((64 * GB -1) % 671088649) == 268434537)
+       && (((TB - (64 * GB -1) + 255) % 1792151290) == 305159546)? 1: -1];
+
+int main()
+{
+  ;
+  return 0;
+}
diff --git a/cmake/modules/CheckFileOffsetBits.cmake b/cmake/modules/CheckFileOffsetBits.cmake
new file mode 100644
index 00000000..b347c936
--- /dev/null
+++ b/cmake/modules/CheckFileOffsetBits.cmake
@@ -0,0 +1,44 @@
+# - Check if _FILE_OFFSET_BITS macro needed for large files
+# CHECK_FILE_OFFSET_BITS ()
+#
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+# Copyright (c) 2009, Michihiro NAKAJIMA
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+#INCLUDE(CheckCXXSourceCompiles)
+
+GET_FILENAME_COMPONENT(_selfdir_CheckFileOffsetBits
+	 "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+MACRO (CHECK_FILE_OFFSET_BITS)
+  IF(NOT DEFINED _FILE_OFFSET_BITS)
+    MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files")
+    TRY_COMPILE(__WITHOUT_FILE_OFFSET_BITS_64
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
+    IF(NOT __WITHOUT_FILE_OFFSET_BITS_64)
+      TRY_COMPILE(__WITH_FILE_OFFSET_BITS_64
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c
+        COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_FILE_OFFSET_BITS=64)
+    ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64)
+
+    IF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
+      SET(_FILE_OFFSET_BITS 64 CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files")
+      MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files - needed")
+    ELSE(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
+      SET(_FILE_OFFSET_BITS "" CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files")
+      MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files - not needed")
+    ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64)
+  ENDIF(NOT DEFINED _FILE_OFFSET_BITS)
+
+ENDMACRO (CHECK_FILE_OFFSET_BITS)
+
diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake
index 15fb0c75..35a9f9e7 100644
--- a/cmake/modules/FindGLIB.cmake
+++ b/cmake/modules/FindGLIB.cmake
@@ -6,6 +6,7 @@
 #  GLIB2_LIBRARIES - Link these to use GLib
 #
 # Copyright 2008-2010 Pino Toscano, <pino@kde.org>
+# Copyright 2013 Michael Weiser, <michael@weiser.dinsnail.net>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -15,7 +16,7 @@ include(FindPackageHandleStandardArgs)
 if (NOT WIN32)
   find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}")
+  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}")
 
   find_package_handle_standard_args(GLib DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS)
 
diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index 1a32483a..cb67220d 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -15,7 +15,7 @@ include(FindPackageHandleStandardArgs)
 if (NOT WIN32)
   find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GTK3 "gtk+-3.0>=3.0" "gdk-pixbuf-2.0" "gthread-2.0" "gio-2.0")
+  pkg_check_modules(GTK3 "gtk+-3.0>=3.0" "gdk-pixbuf-2.0")
 
   find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS)
 
diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake
index 9122bb33..79378b0c 100644
--- a/cmake/modules/FindQt4.cmake
+++ b/cmake/modules/FindQt4.cmake
@@ -250,19 +250,7 @@ MACRO(QT_QUERY_QMAKE outvar invar)
 
 ENDMACRO(QT_QUERY_QMAKE)
 
-GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
-# check for qmake
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
-  $ENV{QTDIR}/bin
-)
-
-IF (QT_QMAKE_EXECUTABLE)
-
-  SET(QT4_QMAKE_FOUND FALSE)
-  
+MACRO(VERIFY_QMAKE_QT4)
   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
 
   # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path
@@ -307,19 +295,47 @@ IF (QT_QMAKE_EXECUTABLE)
     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" found_qt_major_vers "${QTVERSION}")
     STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" found_qt_minor_vers "${QTVERSION}")
     STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" found_qt_patch_vers "${QTVERSION}")
+    IF (${found_qt_major_vers} EQUAL 4)
+      # compute an overall version number which can be compared at once
+      MATH(EXPR req_vers "${req_qt_major_vers}*10000 + ${req_qt_minor_vers}*100 + ${req_qt_patch_vers}")
+      MATH(EXPR found_vers "${found_qt_major_vers}*10000 + ${found_qt_minor_vers}*100 + ${found_qt_patch_vers}")
+
+
+      IF (found_vers LESS req_vers)
+        SET(QT4_QMAKE_FOUND FALSE)
+        SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
+      ELSE (found_vers LESS req_vers)
+        SET(QT4_QMAKE_FOUND TRUE)
+      ENDIF (found_vers LESS req_vers)
+    ENDIF ()
+  ENDIF (qt_version_tmp)
+ENDMACRO()
 
-    # compute an overall version number which can be compared at once
-    MATH(EXPR req_vers "${req_qt_major_vers}*10000 + ${req_qt_minor_vers}*100 + ${req_qt_patch_vers}")
-    MATH(EXPR found_vers "${found_qt_major_vers}*10000 + ${found_qt_minor_vers}*100 + ${found_qt_patch_vers}")
+GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+# check for qmake
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+  $ENV{QTDIR}/bin
+)
 
-    IF (found_vers LESS req_vers)
-      SET(QT4_QMAKE_FOUND FALSE)
-      SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
-    ELSE (found_vers LESS req_vers)
-      SET(QT4_QMAKE_FOUND TRUE)
-    ENDIF (found_vers LESS req_vers)
-  ENDIF (qt_version_tmp)
+IF (QT_QMAKE_EXECUTABLE)
 
+  SET(QT4_QMAKE_FOUND FALSE)
+  VERIFY_QMAKE_QT4()
+
+  IF (NOT QT4_QMAKE_FOUND)
+    FIND_PROGRAM(QT_QMAKE_EXECUTABLE2 NAMES qmake4 qmake-qt4 PATHS
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+      $ENV{QTDIR}/bin
+    )
+    SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE2})
+    VERIFY_QMAKE_QT4()
+  ENDIF()
+  
 ENDIF (QT_QMAKE_EXECUTABLE)
 
 IF (QT4_QMAKE_FOUND)
diff --git a/config.guess b/config.guess
index d622a44e..b79252d6 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
@@ -852,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -950,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,19 +1256,21 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1287,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1361,6 @@ EOF
 	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
diff --git a/config.h.cmake b/config.h.cmake
index cde219f1..b707ba72 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -46,6 +46,12 @@
 /* Define to 1 if you have the `ftell64' function. */
 #cmakedefine HAVE_FTELL64 1
 
+/* Define to 1 if you have the `pread64' function. */
+#cmakedefine HAVE_PREAD64 1
+
+/* Define to 1 if you have the `lseek64' function. */
+#cmakedefine HAVE_LSEEK64 1
+
 /* Defines if gettimeofday is available on your system */
 #cmakedefine HAVE_GETTIMEOFDAY 1
 
@@ -216,10 +222,10 @@
 #endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
+#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-/* #undef _LARGEFILE_SOURCE */
+/* TODO This is wrong, port if needed #undef _LARGEFILE_SOURCE */
 
 /* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
+/* TODO This is wrong, port if needed #undef _LARGE_FILES */
diff --git a/config.h.in b/config.h.in
index a29b012b..12fb1a09 100644
--- a/config.h.in
+++ b/config.h.in
@@ -70,6 +70,9 @@
 /* Defines if localtime_r is available on your system */
 #undef HAVE_LOCALTIME_R
 
+/* Define to 1 if you have the `lseek64' function. */
+#undef HAVE_LSEEK64
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -88,9 +91,15 @@
 /* Define to 1 if you have the `popen' function. */
 #undef HAVE_POPEN
 
+/* Define to 1 if you have the `pread64' function. */
+#undef HAVE_PREAD64
+
 /* Define if you have POSIX threads libraries and header files. */
 #undef HAVE_PTHREAD
 
+/* Have PTHREAD_PRIO_INHERIT. */
+#undef HAVE_PTHREAD_PRIO_INHERIT
+
 /* Defines if rand_r is available on your system */
 #undef HAVE_RAND_R
 
@@ -103,6 +112,12 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `strcat_s' function. */
+#undef HAVE_STRCAT_S
+
+/* Define to 1 if you have the `strcpy_s' function. */
+#undef HAVE_STRCPY_S
+
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
diff --git a/config.sub b/config.sub
index 6205f842..9633db70 100755
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-04-18'
+timestamp='2013-08-10'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +116,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -259,10 +252,12 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -273,7 +268,7 @@ case $basic_machine in
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -291,16 +286,17 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -370,13 +366,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -389,7 +385,8 @@ case $basic_machine in
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -407,12 +404,13 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -788,11 +786,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -828,7 +830,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1019,7 +1021,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1346,21 +1352,21 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1492,9 +1498,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1543,6 +1546,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1586,6 +1592,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/configure b/configure
index 94772c38..10728833 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler 0.22.1.
+# Generated by GNU Autoconf 2.69 for poppler 0.24.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler'
 PACKAGE_TARNAME='poppler'
-PACKAGE_VERSION='0.22.1'
-PACKAGE_STRING='poppler 0.22.1'
+PACKAGE_VERSION='0.24.1'
+PACKAGE_STRING='poppler 0.24.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler'
 PACKAGE_URL=''
 
@@ -659,8 +659,19 @@ BUILD_POPPLER_CPP_FALSE
 BUILD_POPPLER_CPP_TRUE
 LTLIBICONV
 LIBICONV
+BUILD_POPPLER_QT5_FALSE
+BUILD_POPPLER_QT5_TRUE
+QTCHOOSER
+MOCQT52
+MOCQT5
+POPPLER_QT5_CXXFLAGS
+POPPLER_QT5_TEST_LIBS
+POPPLER_QT5_TEST_CFLAGS
+POPPLER_QT5_LIBS
+POPPLER_QT5_CFLAGS
 BUILD_POPPLER_QT4_FALSE
 BUILD_POPPLER_QT4_TRUE
+MOCQT42
 MOCQT4
 POPPLER_QT4_CXXFLAGS
 POPPLER_QT4_TEST_LIBS
@@ -755,7 +766,7 @@ ENABLE_XPDF_HEADERS_TRUE
 PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
-acx_pthread_config
+ax_pthread_config
 auto_import_flags
 create_shared_lib
 win32_libs
@@ -916,6 +927,7 @@ enable_gtk_doc
 enable_gtk_doc_html
 enable_gtk_doc_pdf
 enable_poppler_qt4
+enable_poppler_qt5
 enable_poppler_cpp
 with_libiconv_prefix
 enable_gtk_test
@@ -966,6 +978,10 @@ POPPLER_QT4_CFLAGS
 POPPLER_QT4_LIBS
 POPPLER_QT4_TEST_CFLAGS
 POPPLER_QT4_TEST_LIBS
+POPPLER_QT5_CFLAGS
+POPPLER_QT5_LIBS
+POPPLER_QT5_TEST_CFLAGS
+POPPLER_QT5_TEST_LIBS
 GTK_TEST_CFLAGS
 GTK_TEST_LIBS
 LCMS_CFLAGS
@@ -1510,7 +1526,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures poppler 0.22.1 to adapt to many kinds of systems.
+\`configure' configures poppler 0.24.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1584,7 +1600,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler 0.22.1:";;
+     short | recursive ) echo "Configuration of poppler 0.24.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1592,10 +1608,12 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1621,6 +1639,7 @@ Optional Features:
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
   --disable-poppler-qt4   Don't compile poppler Qt4 wrapper.
+  --disable-poppler-qt5   Don't compile poppler Qt5 wrapper.
   --disable-poppler-cpp   Don't compile poppler cpp wrapper.
   --disable-gtk-test      Don't compile GTK+ test program.
   --disable-utils         Don't compile poppler command line utils.
@@ -1713,6 +1732,14 @@ Some influential environment variables:
               C compiler flags for POPPLER_QT4_TEST, overriding pkg-config
   POPPLER_QT4_TEST_LIBS
               linker flags for POPPLER_QT4_TEST, overriding pkg-config
+  POPPLER_QT5_CFLAGS
+              C compiler flags for POPPLER_QT5, overriding pkg-config
+  POPPLER_QT5_LIBS
+              linker flags for POPPLER_QT5, overriding pkg-config
+  POPPLER_QT5_TEST_CFLAGS
+              C compiler flags for POPPLER_QT5_TEST, overriding pkg-config
+  POPPLER_QT5_TEST_LIBS
+              linker flags for POPPLER_QT5_TEST, overriding pkg-config
   GTK_TEST_CFLAGS
               C compiler flags for GTK_TEST, overriding pkg-config
   GTK_TEST_LIBS
@@ -1786,7 +1813,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler configure 0.22.1
+poppler configure 0.24.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2480,7 +2507,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by poppler $as_me 0.22.1, which was
+It was created by poppler $as_me 0.24.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2829,7 +2856,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.11'
+am__api_version='1.13'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2955,9 +2982,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2968,32 +2992,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -3005,6 +3037,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -3027,12 +3069,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -3044,10 +3086,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -3186,12 +3228,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3274,6 +3310,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3296,7 +3371,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler'
- VERSION='0.22.1'
+ VERSION='0.24.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3324,27 +3399,38 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
+
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
 am_make=${MAKE-make}
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -3375,9 +3461,7 @@ else
 fi
 AM_BACKSLASH='\'
 
-ac_config_headers="$ac_config_headers config.h"
-
-ac_config_headers="$ac_config_headers poppler/poppler-config.h"
+ac_config_headers="$ac_config_headers config.h poppler/poppler-config.h"
 
 DEPDIR="${am__leading_dot}deps"
 
@@ -3398,7 +3482,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -4242,8 +4326,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -4278,16 +4362,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4296,8 +4380,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -4305,7 +4389,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -6041,7 +6125,8 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -6439,10 +6524,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -6481,7 +6562,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -7575,7 +7656,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -9135,7 +9223,7 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -11305,17 +11393,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -11432,7 +11509,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -13029,8 +13106,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -13065,16 +13142,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -13083,8 +13160,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -13092,7 +13169,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -13414,8 +13491,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -13450,16 +13527,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -13468,8 +13545,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -13477,7 +13554,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -14340,9 +14417,6 @@ fi
         ld_shlibs_CXX=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         link_all_deplibs_CXX=yes
@@ -14504,7 +14578,7 @@ fi
         inherit_rpath_CXX=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -15364,7 +15438,7 @@ lt_prog_compiler_static_CXX=
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -16236,17 +16310,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -16363,7 +16426,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -17364,8 +17427,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -17400,16 +17463,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -17418,8 +17481,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -17427,7 +17490,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -17621,7 +17684,7 @@ fi
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.22.1"
+#define POPPLER_VERSION "0.24.1"
 _ACEOF
 
 
@@ -17647,6 +17710,9 @@ case "$host_os" in
     win32_libs="-lgdi32"
     create_shared_lib="-no-undefined"
     auto_import_flags="-Wl,--enable-auto-import"
+
+    # Use mingw's ansi stdio extensions
+    CXXFLAGS="$CXXFLAGS -D__USE_MINGW_ANSI_STDIO=1"
   ;;
 esac
 
@@ -17656,14 +17722,13 @@ esac
 
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-acx_pthread_ok=no
+ax_pthread_ok=no
 
 # We used to check for pthread.h first, but this fails if pthread.h
 # requires special compiler flags (e.g. on True64 or Sequent).
@@ -17698,13 +17763,13 @@ return pthread_join ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  acx_pthread_ok=yes
+  ax_pthread_ok=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
-$as_echo "$acx_pthread_ok" >&6; }
-        if test x"$acx_pthread_ok" = xno; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+$as_echo "$ax_pthread_ok" >&6; }
+        if test x"$ax_pthread_ok" = xno; then
                 PTHREAD_LIBS=""
                 PTHREAD_CFLAGS=""
         fi
@@ -17722,7 +17787,7 @@ fi
 # which indicates that we try without any flags at all, and "pthread-config"
 # which is a program returning the flags for the Pth emulation library.
 
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+ax_pthread_flags="pthreads none -Kthread -kthread lthread pthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
 
 # The ordering *is* (sometimes) important.  Some notes on the
 # individual items follow:
@@ -17744,8 +17809,8 @@ acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -m
 # --thread-safe: KAI C++
 # pthread-config: use pthread-config program (for GNU Pth library)
 
-case "${host_cpu}-${host_os}" in
-        *solaris*)
+case ${host_os} in
+        solaris*)
 
         # On Solaris (at least, for some versions), libc contains stubbed
         # (non-functional) versions of the pthreads routines, so link-based
@@ -17755,12 +17820,16 @@ case "${host_cpu}-${host_os}" in
         # who knows whether they'll stub that too in a future libc.)  So,
         # we'll just look for -pthreads and -lpthread first:
 
-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
         ;;
 esac
 
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
 
         case $flag in
                 none)
@@ -17774,16 +17843,16 @@ $as_echo_n "checking whether pthreads work with $flag... " >&6; }
                 PTHREAD_CFLAGS="$flag"
                 ;;
 
-		pthread-config)
-		# Extract the first word of "pthread-config", so it can be a program name with args.
+                pthread-config)
+                # Extract the first word of "pthread-config", so it can be a program name with args.
 set dummy pthread-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_acx_pthread_config+:} false; then :
+if ${ac_cv_prog_ax_pthread_config+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$acx_pthread_config"; then
-  ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
+  if test -n "$ax_pthread_config"; then
+  ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -17792,7 +17861,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_acx_pthread_config="yes"
+    ac_cv_prog_ax_pthread_config="yes"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -17800,23 +17869,23 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
+  test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no"
 fi
 fi
-acx_pthread_config=$ac_cv_prog_acx_pthread_config
-if test -n "$acx_pthread_config"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5
-$as_echo "$acx_pthread_config" >&6; }
+ax_pthread_config=$ac_cv_prog_ax_pthread_config
+if test -n "$ax_pthread_config"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
+$as_echo "$ax_pthread_config" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-		if test x"$acx_pthread_config" = xno; then continue; fi
-		PTHREAD_CFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
 
                 *)
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5
@@ -17842,18 +17911,23 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }
 int
 main ()
 {
-pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0);
+pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  acx_pthread_ok=yes
+  ax_pthread_ok=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -17861,9 +17935,9 @@ rm -f core conftest.err conftest.$ac_objext \
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
-$as_echo "$acx_pthread_ok" >&6; }
-        if test "x$acx_pthread_ok" = xyes; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+$as_echo "$ax_pthread_ok" >&6; }
+        if test "x$ax_pthread_ok" = xyes; then
                 break;
         fi
 
@@ -17873,24 +17947,24 @@ done
 fi
 
 # Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
+if test "x$ax_pthread_ok" = xyes; then
         save_LIBS="$LIBS"
         LIBS="$PTHREAD_LIBS $LIBS"
         save_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 
         # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
 $as_echo_n "checking for joinable pthread attribute... " >&6; }
-	attr_name=unknown
-	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
 main ()
 {
-int attr=$attr; return attr;
+int attr = $attr; return attr /* ; */
   ;
   return 0;
 }
@@ -17900,7 +17974,7 @@ if ac_fn_c_try_link "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-	done
+        done
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5
 $as_echo "$attr_name" >&6; }
         if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
@@ -17914,9 +17988,16 @@ _ACEOF
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
 $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
         flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
         esac
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
 $as_echo "${flag}" >&6; }
@@ -17924,12 +18005,58 @@ $as_echo "${flag}" >&6; }
             PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
         fi
 
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
+$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; }
+if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                    #include <pthread.h>
+int
+main ()
+{
+int i = PTHREAD_PRIO_INHERIT;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_PTHREAD_PRIO_INHERIT=yes
+else
+  ax_cv_PTHREAD_PRIO_INHERIT=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
+$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
+        if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then :
+
+$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
+
+fi
+
         LIBS="$save_LIBS"
         CFLAGS="$save_CFLAGS"
 
-        # More AIX lossage: must compile with xlc_r or cc_r
-	if test x"$GCC" != xyes; then
-          for ac_prog in xlc_r cc_r
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != xyes; then
+            case $host_os in
+                aix*)
+                case "x/$CC" in #(
+  x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) :
+    #handle absolute path differently from PATH based program lookup
+                   case "x$CC" in #(
+  x/*) :
+    if as_fn_executable_p ${CC}_r; then :
+  PTHREAD_CC="${CC}_r"
+fi ;; #(
+  *) :
+    for ac_prog in ${CC}_r
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -17970,27 +18097,31 @@ fi
 
   test -n "$PTHREAD_CC" && break
 done
-test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}"
-
-        else
-          PTHREAD_CC=$CC
-	fi
-else
-        PTHREAD_CC="$CC"
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+ ;;
+esac ;; #(
+  *) :
+     ;;
+esac
+                ;;
+            esac
+        fi
 fi
 
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
 
 
 
 
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
+if test x"$ax_pthread_ok" = xyes; then
 
 $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
 
         :
 else
-        acx_pthread_ok=no
+        ax_pthread_ok=no
 
 fi
 ac_ext=c
@@ -19715,6 +19846,18 @@ _ACEOF
 fi
 done
 
+for ac_func in strcpy_s strcat_s
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -20021,6 +20164,18 @@ if test "$xpdf_cv_func_fseek64" = yes -a "$xpdf_cv_func_ftell64" = yes; then
   $as_echo "#define HAVE_FSEEK64 1" >>confdefs.h
 
 fi
+for ac_func in pread64 lseek64
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
 
 # Check whether --enable-zlib was given.
 if test "${enable_zlib+set}" = set; then :
@@ -21128,7 +21283,7 @@ $as_echo "yes" >&6; }
 	enable_cairo_output="yes"
 fi
 fi
-if test x$use_cairo = x; then
+if test "x$use_cairo" = "x"; then
    use_cairo=$enable_cairo_output
 fi
 
@@ -21860,31 +22015,11 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0) were not met:
-
-$GTKDOC_DEPS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+	:
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	:
 else
 	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
 	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
@@ -21919,6 +22054,10 @@ fi
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+
 
    if test x$enable_gtk_doc = xyes; then
   ENABLE_GTK_DOC_TRUE=
@@ -22410,11 +22549,11 @@ $as_echo "no" >&6; }
 set dummy ${ac_tool_prefix}moc-qt4; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MOCQT4+:} false; then :
+if ${ac_cv_prog_MOCQT42+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$MOCQT4"; then
-  ac_cv_prog_MOCQT4="$MOCQT4" # Let the user override the test.
+  if test -n "$MOCQT42"; then
+  ac_cv_prog_MOCQT42="$MOCQT42" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -22423,7 +22562,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MOCQT4="${ac_tool_prefix}moc-qt4"
+    ac_cv_prog_MOCQT42="${ac_tool_prefix}moc-qt4"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -22433,10 +22572,10 @@ IFS=$as_save_IFS
 
 fi
 fi
-MOCQT4=$ac_cv_prog_MOCQT4
-if test -n "$MOCQT4"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOCQT4" >&5
-$as_echo "$MOCQT4" >&6; }
+MOCQT42=$ac_cv_prog_MOCQT42
+if test -n "$MOCQT42"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOCQT42" >&5
+$as_echo "$MOCQT42" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -22444,17 +22583,17 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_MOCQT4"; then
-  ac_ct_MOCQT4=$MOCQT4
+if test -z "$ac_cv_prog_MOCQT42"; then
+  ac_ct_MOCQT42=$MOCQT42
   # Extract the first word of "moc-qt4", so it can be a program name with args.
 set dummy moc-qt4; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MOCQT4+:} false; then :
+if ${ac_cv_prog_ac_ct_MOCQT42+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_MOCQT4"; then
-  ac_cv_prog_ac_ct_MOCQT4="$ac_ct_MOCQT4" # Let the user override the test.
+  if test -n "$ac_ct_MOCQT42"; then
+  ac_cv_prog_ac_ct_MOCQT42="$ac_ct_MOCQT42" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -22463,7 +22602,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MOCQT4="moc-qt4"
+    ac_cv_prog_ac_ct_MOCQT42="moc-qt4"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -22473,17 +22612,17 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_MOCQT4=$ac_cv_prog_ac_ct_MOCQT4
-if test -n "$ac_ct_MOCQT4"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MOCQT4" >&5
-$as_echo "$ac_ct_MOCQT4" >&6; }
+ac_ct_MOCQT42=$ac_cv_prog_ac_ct_MOCQT42
+if test -n "$ac_ct_MOCQT42"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MOCQT42" >&5
+$as_echo "$ac_ct_MOCQT42" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_MOCQT4" = x; then
-    MOCQT4=""
+  if test "x$ac_ct_MOCQT42" = x; then
+    MOCQT42=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -22491,20 +22630,22 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    MOCQT4=$ac_ct_MOCQT4
+    MOCQT42=$ac_ct_MOCQT42
   fi
 else
-  MOCQT4="$ac_cv_prog_MOCQT4"
+  MOCQT42="$ac_cv_prog_MOCQT42"
 fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc-qt4" >&5
 $as_echo_n "checking for Qt4 moc-qt4... " >&6; }
-    mocversion=`$MOCQT4 -v 2>&1`
+    mocversion=`$MOCQT42 -v 2>&1`
     mocversiongrep=`echo $mocversion | grep "Qt 4"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       # no valid moc found
       enable_poppler_qt4=no;
       MOCQT4="not found"
+    else
+      MOCQT4=$MOCQT42
     fi
   fi
 
@@ -22522,6 +22663,668 @@ fi
 
 
 
+# Check whether --enable-poppler-qt5 was given.
+if test "${enable_poppler_qt5+set}" = set; then :
+  enableval=$enable_poppler_qt5; enable_poppler_qt5=$enableval
+else
+  enable_poppler_qt5="try"
+fi
+
+if test x$enable_poppler_qt5 = xyes; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT5" >&5
+$as_echo_n "checking for POPPLER_QT5... " >&6; }
+
+if test -n "$POPPLER_QT5_CFLAGS"; then
+    pkg_cv_POPPLER_QT5_CFLAGS="$POPPLER_QT5_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$POPPLER_QT5_LIBS"; then
+    pkg_cv_POPPLER_QT5_LIBS="$POPPLER_QT5_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_LIBS=`$PKG_CONFIG --libs "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        POPPLER_QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>&1`
+        else
+	        POPPLER_QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$POPPLER_QT5_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0) were not met:
+
+$POPPLER_QT5_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables POPPLER_QT5_CFLAGS
+and POPPLER_QT5_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables POPPLER_QT5_CFLAGS
+and POPPLER_QT5_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	POPPLER_QT5_CFLAGS=$pkg_cv_POPPLER_QT5_CFLAGS
+	POPPLER_QT5_LIBS=$pkg_cv_POPPLER_QT5_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT5_TEST" >&5
+$as_echo_n "checking for POPPLER_QT5_TEST... " >&6; }
+
+if test -n "$POPPLER_QT5_TEST_CFLAGS"; then
+    pkg_cv_POPPLER_QT5_TEST_CFLAGS="$POPPLER_QT5_TEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Test >= 5.0.0 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Test >= 5.0.0 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_TEST_CFLAGS=`$PKG_CONFIG --cflags "Qt5Test >= 5.0.0 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$POPPLER_QT5_TEST_LIBS"; then
+    pkg_cv_POPPLER_QT5_TEST_LIBS="$POPPLER_QT5_TEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Test >= 5.0.0 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Test >= 5.0.0 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_TEST_LIBS=`$PKG_CONFIG --libs "Qt5Test >= 5.0.0 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        POPPLER_QT5_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Test >= 5.0.0 " 2>&1`
+        else
+	        POPPLER_QT5_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Test >= 5.0.0 " 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$POPPLER_QT5_TEST_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (Qt5Test >= 5.0.0 ) were not met:
+
+$POPPLER_QT5_TEST_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables POPPLER_QT5_TEST_CFLAGS
+and POPPLER_QT5_TEST_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables POPPLER_QT5_TEST_CFLAGS
+and POPPLER_QT5_TEST_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	POPPLER_QT5_TEST_CFLAGS=$pkg_cv_POPPLER_QT5_TEST_CFLAGS
+	POPPLER_QT5_TEST_LIBS=$pkg_cv_POPPLER_QT5_TEST_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+elif test x$enable_poppler_qt5 = xtry; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT5" >&5
+$as_echo_n "checking for POPPLER_QT5... " >&6; }
+
+if test -n "$POPPLER_QT5_CFLAGS"; then
+    pkg_cv_POPPLER_QT5_CFLAGS="$POPPLER_QT5_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$POPPLER_QT5_LIBS"; then
+    pkg_cv_POPPLER_QT5_LIBS="$POPPLER_QT5_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_LIBS=`$PKG_CONFIG --libs "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        POPPLER_QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>&1`
+        else
+	        POPPLER_QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$POPPLER_QT5_PKG_ERRORS" >&5
+
+	enable_poppler_qt5="no"
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	enable_poppler_qt5="no"
+else
+	POPPLER_QT5_CFLAGS=$pkg_cv_POPPLER_QT5_CFLAGS
+	POPPLER_QT5_LIBS=$pkg_cv_POPPLER_QT5_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	enable_poppler_qt5="yes"
+fi
+  if test x$enable_poppler_qt5 = xyes; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POPPLER_QT5_TEST" >&5
+$as_echo_n "checking for POPPLER_QT5_TEST... " >&6; }
+
+if test -n "$POPPLER_QT5_TEST_CFLAGS"; then
+    pkg_cv_POPPLER_QT5_TEST_CFLAGS="$POPPLER_QT5_TEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Test >= 5.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Test >= 5.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_TEST_CFLAGS=`$PKG_CONFIG --cflags "Qt5Test >= 5.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$POPPLER_QT5_TEST_LIBS"; then
+    pkg_cv_POPPLER_QT5_TEST_LIBS="$POPPLER_QT5_TEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Test >= 5.0.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Test >= 5.0.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_POPPLER_QT5_TEST_LIBS=`$PKG_CONFIG --libs "Qt5Test >= 5.0.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        POPPLER_QT5_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Test >= 5.0.0" 2>&1`
+        else
+	        POPPLER_QT5_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Test >= 5.0.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$POPPLER_QT5_TEST_PKG_ERRORS" >&5
+
+	enable_poppler_qt5="no"
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	enable_poppler_qt5="no"
+else
+	POPPLER_QT5_TEST_CFLAGS=$pkg_cv_POPPLER_QT5_TEST_CFLAGS
+	POPPLER_QT5_TEST_LIBS=$pkg_cv_POPPLER_QT5_TEST_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	enable_poppler_qt5="yes"
+fi
+  fi
+fi
+
+
+
+
+
+if test x$enable_poppler_qt5 = xyes; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}moc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}moc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MOCQT5+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MOCQT5"; then
+  ac_cv_prog_MOCQT5="$MOCQT5" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MOCQT5="${ac_tool_prefix}moc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MOCQT5=$ac_cv_prog_MOCQT5
+if test -n "$MOCQT5"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOCQT5" >&5
+$as_echo "$MOCQT5" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MOCQT5"; then
+  ac_ct_MOCQT5=$MOCQT5
+  # Extract the first word of "moc", so it can be a program name with args.
+set dummy moc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MOCQT5+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MOCQT5"; then
+  ac_cv_prog_ac_ct_MOCQT5="$ac_ct_MOCQT5" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MOCQT5="moc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MOCQT5=$ac_cv_prog_ac_ct_MOCQT5
+if test -n "$ac_ct_MOCQT5"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MOCQT5" >&5
+$as_echo "$ac_ct_MOCQT5" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MOCQT5" = x; then
+    MOCQT5=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MOCQT5=$ac_ct_MOCQT5
+  fi
+else
+  MOCQT5="$ac_cv_prog_MOCQT5"
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 moc" >&5
+$as_echo_n "checking for Qt5 moc... " >&6; }
+  mocversion=`$MOCQT5 -v 2>&1`
+  mocversiongrep=`echo $mocversion | grep "Qt 5"`
+  if test x"$mocversiongrep" != x"$mocversion"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    # moc was not the qt5 one, try with moc-qt5
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}moc-qt5", so it can be a program name with args.
+set dummy ${ac_tool_prefix}moc-qt5; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MOCQT52+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MOCQT52"; then
+  ac_cv_prog_MOCQT52="$MOCQT52" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MOCQT52="${ac_tool_prefix}moc-qt5"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MOCQT52=$ac_cv_prog_MOCQT52
+if test -n "$MOCQT52"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOCQT52" >&5
+$as_echo "$MOCQT52" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MOCQT52"; then
+  ac_ct_MOCQT52=$MOCQT52
+  # Extract the first word of "moc-qt5", so it can be a program name with args.
+set dummy moc-qt5; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MOCQT52+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MOCQT52"; then
+  ac_cv_prog_ac_ct_MOCQT52="$ac_ct_MOCQT52" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MOCQT52="moc-qt5"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MOCQT52=$ac_cv_prog_ac_ct_MOCQT52
+if test -n "$ac_ct_MOCQT52"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MOCQT52" >&5
+$as_echo "$ac_ct_MOCQT52" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MOCQT52" = x; then
+    MOCQT52=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MOCQT52=$ac_ct_MOCQT52
+  fi
+else
+  MOCQT52="$ac_cv_prog_MOCQT52"
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt5 moc-qt5" >&5
+$as_echo_n "checking for Qt5 moc-qt5... " >&6; }
+    mocversion=`$MOCQT52 -v 2>&1`
+    mocversiongrep=`echo $mocversion | grep "Qt 5"`
+    if test x"$mocversiongrep" != x"$mocversion"; then
+      if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
+set dummy ${ac_tool_prefix}qtchooser; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_QTCHOOSER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$QTCHOOSER"; then
+  ac_cv_prog_QTCHOOSER="$QTCHOOSER" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_QTCHOOSER="${ac_tool_prefix}qtchooser"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+QTCHOOSER=$ac_cv_prog_QTCHOOSER
+if test -n "$QTCHOOSER"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QTCHOOSER" >&5
+$as_echo "$QTCHOOSER" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_QTCHOOSER"; then
+  ac_ct_QTCHOOSER=$QTCHOOSER
+  # Extract the first word of "qtchooser", so it can be a program name with args.
+set dummy qtchooser; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_QTCHOOSER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_QTCHOOSER"; then
+  ac_cv_prog_ac_ct_QTCHOOSER="$ac_ct_QTCHOOSER" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_QTCHOOSER="qtchooser"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_QTCHOOSER=$ac_cv_prog_ac_ct_QTCHOOSER
+if test -n "$ac_ct_QTCHOOSER"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_QTCHOOSER" >&5
+$as_echo "$ac_ct_QTCHOOSER" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_QTCHOOSER" = x; then
+    QTCHOOSER=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    QTCHOOSER=$ac_ct_QTCHOOSER
+  fi
+else
+  QTCHOOSER="$ac_cv_prog_QTCHOOSER"
+fi
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qtchooser" >&5
+$as_echo_n "checking for qtchooser... " >&6; }
+      qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+      mocversion=`$qt5tooldir/moc -v 2>&1`
+      mocversiongrep=`echo $mocversion | grep "Qt 5"`
+      if test x"$mocversiongrep" != x"$mocversion"; then
+        # no valid moc found
+        enable_poppler_qt5=no;
+        MOCQT5="not found"
+      else
+        MOCQT5=$qt5tooldir/moc
+      fi
+    else
+      MOCQT5=$MOCQT52
+    fi
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOCQT5" >&5
+$as_echo "$MOCQT5" >&6; }
+fi
+
+ if test "x$enable_poppler_qt5" = "xyes"; then
+  BUILD_POPPLER_QT5_TRUE=
+  BUILD_POPPLER_QT5_FALSE='#'
+else
+  BUILD_POPPLER_QT5_TRUE='#'
+  BUILD_POPPLER_QT5_FALSE=
+fi
+
+
+
 # Check whether --enable-poppler-cpp was given.
 if test "${enable_poppler_cpp+set}" = set; then :
   enableval=$enable_poppler_cpp; enable_poppler_cpp=$enableval
@@ -23952,6 +24755,7 @@ case "$enable_compile_warnings" in
 		-Wmissing-format-attribute -fno-exceptions -fno-check-new \
 		-fno-common $CXXFLAGS" ;;
 esac
+CXXFLAGS="-fPIC $CXXFLAGS";
 
 case `$PKG_CONFIG --version` in
   0.?|0.10-7)
@@ -23967,14 +24771,14 @@ esac
 
 POPPLER_MAJOR_VERSION=0
 
-POPPLER_MINOR_VERSION=22
+POPPLER_MINOR_VERSION=24
 
 POPPLER_MICRO_VERSION=1
 
-POPPLER_VERSION=0.22.1
+POPPLER_VERSION=0.24.1
 
 
-ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc"
+ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile qt5/Makefile qt5/src/Makefile qt5/tests/Makefile qt5/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-qt5.pc poppler-qt5-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -24085,6 +24889,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -24190,6 +25002,10 @@ if test -z "${BUILD_POPPLER_QT4_TRUE}" && test -z "${BUILD_POPPLER_QT4_FALSE}";
   as_fn_error $? "conditional \"BUILD_POPPLER_QT4\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_POPPLER_QT5_TRUE}" && test -z "${BUILD_POPPLER_QT5_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_POPPLER_QT5\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${BUILD_POPPLER_CPP_TRUE}" && test -z "${BUILD_POPPLER_CPP_FALSE}"; then
   as_fn_error $? "conditional \"BUILD_POPPLER_CPP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -24607,7 +25423,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by poppler $as_me 0.22.1, which was
+This file was extended by poppler $as_me 0.24.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24673,7 +25489,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-poppler config.status 0.22.1
+poppler config.status 0.24.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -25199,6 +26015,10 @@ do
     "qt4/src/Makefile") CONFIG_FILES="$CONFIG_FILES qt4/src/Makefile" ;;
     "qt4/tests/Makefile") CONFIG_FILES="$CONFIG_FILES qt4/tests/Makefile" ;;
     "qt4/demos/Makefile") CONFIG_FILES="$CONFIG_FILES qt4/demos/Makefile" ;;
+    "qt5/Makefile") CONFIG_FILES="$CONFIG_FILES qt5/Makefile" ;;
+    "qt5/src/Makefile") CONFIG_FILES="$CONFIG_FILES qt5/src/Makefile" ;;
+    "qt5/tests/Makefile") CONFIG_FILES="$CONFIG_FILES qt5/tests/Makefile" ;;
+    "qt5/demos/Makefile") CONFIG_FILES="$CONFIG_FILES qt5/demos/Makefile" ;;
     "cpp/Makefile") CONFIG_FILES="$CONFIG_FILES cpp/Makefile" ;;
     "cpp/poppler-version.h") CONFIG_FILES="$CONFIG_FILES cpp/poppler-version.h" ;;
     "cpp/tests/Makefile") CONFIG_FILES="$CONFIG_FILES cpp/tests/Makefile" ;;
@@ -25212,6 +26032,8 @@ do
     "poppler-glib-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-glib-uninstalled.pc" ;;
     "poppler-qt4.pc") CONFIG_FILES="$CONFIG_FILES poppler-qt4.pc" ;;
     "poppler-qt4-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-qt4-uninstalled.pc" ;;
+    "poppler-qt5.pc") CONFIG_FILES="$CONFIG_FILES poppler-qt5.pc" ;;
+    "poppler-qt5-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-qt5-uninstalled.pc" ;;
     "poppler-cpp.pc") CONFIG_FILES="$CONFIG_FILES poppler-cpp.pc" ;;
     "poppler-cpp-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES poppler-cpp-uninstalled.pc" ;;
 
@@ -25810,7 +26632,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -25823,7 +26645,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -25857,21 +26679,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -26750,6 +27570,7 @@ echo "  font configuration: $with_font_configuration"
 echo "  splash output:      $enable_splash_output"
 echo "  cairo output:       $use_cairo"
 echo "  qt4 wrapper:        $enable_poppler_qt4"
+echo "  qt5 wrapper:        $enable_poppler_qt5"
 echo "  glib wrapper:       $use_glib"
 echo "    introspection:    $found_introspection"
 echo "  cpp wrapper:        $enable_poppler_cpp"
diff --git a/configure.ac b/configure.ac
index a512782b..3d236562 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[22])
+m4_define([poppler_version_minor],[24])
 m4_define([poppler_version_micro],[1])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
@@ -8,8 +8,7 @@ AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi?
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-AM_CONFIG_HEADER(config.h)
-AM_CONFIG_HEADER(poppler/poppler-config.h)
+AC_CONFIG_HEADERS([config.h poppler/poppler-config.h])
 AC_C_BIGENDIAN
 
 dnl ##### Initialize libtool.
@@ -67,6 +66,9 @@ case "$host_os" in
     win32_libs="-lgdi32"
     create_shared_lib="-no-undefined"
     auto_import_flags="-Wl,--enable-auto-import"
+
+    # Use mingw's ansi stdio extensions
+    CXXFLAGS="$CXXFLAGS -D__USE_MINGW_ANSI_STDIO=1"
   ;;
 esac
 
@@ -74,7 +76,7 @@ AC_SUBST(win32_libs)
 AC_SUBST(create_shared_lib)
 AC_SUBST(auto_import_flags)
 
-ACX_PTHREAD()
+AX_PTHREAD()
 
 dnl Install xpdf headers
 AC_ARG_ENABLE(xpdf-headers,
@@ -252,6 +254,7 @@ fi
 
 dnl ##### Checks for library functions.
 AC_CHECK_FUNCS(popen mkstemp mkstemps)
+AC_CHECK_FUNCS(strcpy_s strcat_s)
 
 dnl ##### Back to C for the library tests.
 AC_LANG_C
@@ -265,6 +268,7 @@ AC_CHECK_FUNCS(ftell64, xpdf_cv_func_ftell64=yes, xpdf_cv_func_ftell64=no)
 if test "$xpdf_cv_func_fseek64" = yes -a "$xpdf_cv_func_ftell64" = yes; then
   AC_DEFINE(HAVE_FSEEK64)
 fi
+AC_CHECK_FUNCS(pread64 lseek64)
 
 dnl Test for zlib
 AC_ARG_ENABLE([zlib],
@@ -487,7 +491,7 @@ elif test x$enable_cairo_output = xtry; then
                     [enable_cairo_output="no"
 		     use_cairo="no (requires cairo >= $CAIRO_VERSION)"])
 fi
-if test x$use_cairo = x; then
+if test "x$use_cairo" = "x"; then
    use_cairo=$enable_cairo_output
 fi
 
@@ -604,14 +608,16 @@ if test x$enable_poppler_qt4 = xyes; then
   if test x"$mocversiongrep" != x"$mocversion"; then
     AC_MSG_RESULT([no])
     # moc was not the qt4 one, try with moc-qt4
-    AC_CHECK_TOOL(MOCQT4, moc-qt4)
+    AC_CHECK_TOOL(MOCQT42, moc-qt4)
     AC_MSG_CHECKING([for Qt4 moc-qt4])
-    mocversion=`$MOCQT4 -v 2>&1`
+    mocversion=`$MOCQT42 -v 2>&1`
     mocversiongrep=`echo $mocversion | grep "Qt 4"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       # no valid moc found
       enable_poppler_qt4=no;
       MOCQT4="not found"
+    else
+      MOCQT4=$MOCQT42
     fi
   fi
   AC_SUBST(MOCQT4)
@@ -620,6 +626,72 @@ fi
 
 AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
 
+dnl 
+dnl Try Qt5
+dnl
+
+AC_ARG_ENABLE(poppler-qt5,
+              AC_HELP_STRING([--disable-poppler-qt5],
+	                     [Don't compile poppler Qt5 wrapper.]),
+              enable_poppler_qt5=$enableval,
+              enable_poppler_qt5="try")
+if test x$enable_poppler_qt5 = xyes; then
+  PKG_CHECK_MODULES(POPPLER_QT5, 
+	            Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0)
+  PKG_CHECK_MODULES(POPPLER_QT5_TEST, 
+	            Qt5Test >= 5.0.0 ) 
+elif test x$enable_poppler_qt5 = xtry; then
+  PKG_CHECK_MODULES(POPPLER_QT5,
+                    Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Xml >= 5.0.0 Qt5Widgets >= 5.0.0,
+                    [enable_poppler_qt5="yes"],
+                    [enable_poppler_qt5="no"])
+  if test x$enable_poppler_qt5 = xyes; then
+    PKG_CHECK_MODULES(POPPLER_QT5_TEST,
+                    Qt5Test >= 5.0.0,
+                    [enable_poppler_qt5="yes"],
+                    [enable_poppler_qt5="no"])
+  fi
+fi
+
+AC_SUBST(POPPLER_QT5_CXXFLAGS)
+AC_SUBST(POPPLER_QT5_LIBS)
+AC_SUBST(POPPLER_QT5_TEST_LIBS)
+
+if test x$enable_poppler_qt5 = xyes; then
+  AC_CHECK_TOOL(MOCQT5, moc)
+  AC_MSG_CHECKING([for Qt5 moc])
+  mocversion=`$MOCQT5 -v 2>&1`
+  mocversiongrep=`echo $mocversion | grep "Qt 5"`
+  if test x"$mocversiongrep" != x"$mocversion"; then
+    AC_MSG_RESULT([no])
+    # moc was not the qt5 one, try with moc-qt5
+    AC_CHECK_TOOL(MOCQT52, moc-qt5)
+    AC_MSG_CHECKING([for Qt5 moc-qt5])
+    mocversion=`$MOCQT52 -v 2>&1`
+    mocversiongrep=`echo $mocversion | grep "Qt 5"`
+    if test x"$mocversiongrep" != x"$mocversion"; then
+      AC_CHECK_TOOL(QTCHOOSER, qtchooser)
+      AC_MSG_CHECKING([for qtchooser])
+      qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+      mocversion=`$qt5tooldir/moc -v 2>&1`
+      mocversiongrep=`echo $mocversion | grep "Qt 5"`
+      if test x"$mocversiongrep" != x"$mocversion"; then
+        # no valid moc found
+        enable_poppler_qt5=no;
+        MOCQT5="not found"
+      else
+        MOCQT5=$qt5tooldir/moc
+      fi
+    else
+      MOCQT5=$MOCQT52
+    fi
+  fi
+  AC_SUBST(MOCQT5)
+  AC_MSG_RESULT([$MOCQT5])
+fi
+
+AM_CONDITIONAL(BUILD_POPPLER_QT5, test "x$enable_poppler_qt5" = "xyes")
+
 dnl
 dnl CPP frontend
 dnl
@@ -752,6 +824,7 @@ case "$enable_compile_warnings" in
 		-Wmissing-format-attribute -fno-exceptions -fno-check-new \
 		-fno-common $CXXFLAGS" ;;
 esac
+CXXFLAGS="-fPIC $CXXFLAGS";
 
 case `$PKG_CONFIG --version` in
   0.?|0.1[0-7])
@@ -787,6 +860,10 @@ qt4/Makefile
 qt4/src/Makefile
 qt4/tests/Makefile
 qt4/demos/Makefile
+qt5/Makefile
+qt5/src/Makefile
+qt5/tests/Makefile
+qt5/demos/Makefile
 cpp/Makefile
 cpp/poppler-version.h
 cpp/tests/Makefile
@@ -800,6 +877,8 @@ poppler-glib.pc
 poppler-glib-uninstalled.pc
 poppler-qt4.pc
 poppler-qt4-uninstalled.pc
+poppler-qt5.pc
+poppler-qt5-uninstalled.pc
 poppler-cpp.pc
 poppler-cpp-uninstalled.pc])
 
@@ -810,6 +889,7 @@ echo "  font configuration: $with_font_configuration"
 echo "  splash output:      $enable_splash_output"
 echo "  cairo output:       $use_cairo"
 echo "  qt4 wrapper:        $enable_poppler_qt4"
+echo "  qt5 wrapper:        $enable_poppler_qt5"
 echo "  glib wrapper:       $use_glib"
 echo "    introspection:    $found_introspection"
 echo "  cpp wrapper:        $enable_poppler_cpp"
diff --git a/cpp/Makefile.in b/cpp/Makefile.in
index 4a548965..3ae55142 100644
--- a/cpp/Makefile.in
+++ b/cpp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,10 +80,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = cpp
-DIST_COMMON = $(poppler_include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/poppler-version.h.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/poppler-version.h.in $(top_srcdir)/depcomp \
+	$(poppler_include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -120,10 +148,23 @@ libpoppler_cpp_la_OBJECTS = $(am_libpoppler_cpp_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libpoppler_cpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(libpoppler_cpp_la_CXXFLAGS) $(CXXFLAGS) \
 	$(libpoppler_cpp_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -136,17 +177,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -155,26 +195,26 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libpoppler_cpp_la_SOURCES)
 DIST_SOURCES = $(libpoppler_cpp_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -183,9 +223,29 @@ am__can_run_installinfo = \
 HEADERS = $(poppler_include_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -307,6 +367,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -341,10 +404,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -366,13 +435,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -510,6 +579,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 poppler-version.h: $(top_builddir)/config.status $(srcdir)/poppler-version.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -536,12 +606,15 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libpoppler-cpp.la: $(libpoppler_cpp_la_OBJECTS) $(libpoppler_cpp_la_DEPENDENCIES) $(EXTRA_libpoppler_cpp_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(libpoppler_cpp_la_LINK) -rpath $(libdir) $(libpoppler_cpp_la_OBJECTS) $(libpoppler_cpp_la_LIBADD) $(LIBS)
 
@@ -726,22 +799,25 @@ uninstall-poppler_includeHEADERS:
 	dir='$(DESTDIR)$(poppler_includedir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -756,57 +832,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -822,12 +853,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -839,15 +865,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -856,6 +878,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1025,25 +1062,24 @@ ps-am:
 uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-poppler_includeHEADERS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-poppler_includeHEADERS install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-libLTLIBRARIES uninstall-poppler_includeHEADERS
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libLTLIBRARIES \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-poppler_includeHEADERS install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-poppler_includeHEADERS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/cpp/poppler-private.cpp b/cpp/poppler-private.cpp
index 2783bed4..3bee6192 100644
--- a/cpp/poppler-private.cpp
+++ b/cpp/poppler-private.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
  *
  * 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
@@ -28,7 +29,7 @@
 
 using namespace poppler;
 
-void detail::error_function(void * /*data*/, ErrorCategory /*category*/, int pos, char *msg)
+void detail::error_function(void * /*data*/, ErrorCategory /*category*/, Goffset pos, char *msg)
 {
     std::ostringstream oss;
     if (pos >= 0) {
diff --git a/cpp/poppler-private.h b/cpp/poppler-private.h
index a4b455c4..3e8873f4 100644
--- a/cpp/poppler-private.h
+++ b/cpp/poppler-private.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
  *
  * 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
@@ -38,7 +39,7 @@ namespace poppler
 namespace detail
 {
 
-void error_function(void *data, ErrorCategory category, int pos, char *msg);
+void error_function(void *data, ErrorCategory category, Goffset pos, char *msg);
 
 rectf pdfrectangle_to_rectf(const PDFRectangle &pdfrect);
 
diff --git a/cpp/poppler-version.h b/cpp/poppler-version.h
index c7ea3ec8..6ca3facb 100644
--- a/cpp/poppler-version.h
+++ b/cpp/poppler-version.h
@@ -21,9 +21,9 @@
 
 #include "poppler-global.h"
 
-#define POPPLER_VERSION "0.22.1"
+#define POPPLER_VERSION "0.24.1"
 #define POPPLER_VERSION_MAJOR 0
-#define POPPLER_VERSION_MINOR 22
+#define POPPLER_VERSION_MINOR 24
 #define POPPLER_VERSION_MICRO 1
 
 namespace poppler
diff --git a/cpp/tests/Makefile.in b/cpp/tests/Makefile.in
index 544d1ff8..089d4929 100644
--- a/cpp/tests/Makefile.in
+++ b/cpp/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,9 +80,10 @@ build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = poppler-dump$(EXEEXT) poppler-render$(EXEEXT)
 subdir = cpp/tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -76,10 +104,23 @@ poppler_dump_DEPENDENCIES = $(LDADDS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_poppler_render_OBJECTS = parseargs.$(OBJEXT) \
 	poppler-render.$(OBJEXT)
 poppler_render_OBJECTS = $(am_poppler_render_OBJECTS)
 poppler_render_DEPENDENCIES = $(LDADDS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -92,20 +133,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(poppler_dump_SOURCES) $(poppler_render_SOURCES)
 DIST_SOURCES = $(poppler_dump_SOURCES) $(poppler_render_SOURCES)
 am__can_run_installinfo = \
@@ -113,6 +150,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -208,6 +262,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -242,10 +299,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -267,13 +330,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -379,9 +442,11 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 poppler-dump$(EXEEXT): $(poppler_dump_OBJECTS) $(poppler_dump_DEPENDENCIES) $(EXTRA_poppler_dump_DEPENDENCIES) 
 	@rm -f poppler-dump$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(poppler_dump_OBJECTS) $(poppler_dump_LDADD) $(LIBS)
+
 poppler-render$(EXEEXT): $(poppler_render_OBJECTS) $(poppler_render_DEPENDENCIES) $(EXTRA_poppler_render_DEPENDENCIES) 
 	@rm -f poppler-render$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(poppler_render_OBJECTS) $(poppler_render_LDADD) $(LIBS)
@@ -458,26 +523,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -489,15 +543,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -506,6 +556,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -647,18 +712,19 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/depcomp b/depcomp
index 25a39e6c..4ebd5b3a 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # 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
@@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -57,11 +56,65 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -86,32 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-   gccflag=-qmakedep=gcc,-MF
-   depmode=gcc
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -134,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -143,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -157,15 +216,14 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
@@ -174,15 +232,15 @@ gcc)
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' "$nl" < "$tmpdepfile" |
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -200,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -209,7 +266,6 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
@@ -217,19 +273,15 @@ sgi)
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr "$nl" ' ' >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
@@ -247,9 +299,8 @@ aix)
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -262,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -273,65 +322,113 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-  # However on
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\':
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # will emit a similar output, but also prepend the continuation lines
-  # with horizontal tabulation characters.
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form 'foo.o: dependent.h',
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-    < "$tmpdepfile" > "$depfile"
-  sed '
-    s/[ '"$tab"'][ '"$tab"']*/ /g
-    s/^ *//
-    s/ *\\*$//
-    s/^[^:]*: *//
-    /^$/d
-    /:$/d
-    s/$/ :/
-  ' < "$tmpdepfile" >> "$depfile"
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -342,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -355,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -366,76 +461,61 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in 'foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
 
 msvc7)
   if test "$libtool" = yes; then
@@ -446,8 +526,7 @@ msvc7)
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -473,6 +552,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
@@ -524,13 +604,14 @@ dashmstdout)
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -583,10 +664,12 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -622,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -657,15 +740,15 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
diff --git a/fofi/FoFiIdentifier.cc b/fofi/FoFiIdentifier.cc
index d8ee7e0e..be28e256 100644
--- a/fofi/FoFiIdentifier.cc
+++ b/fofi/FoFiIdentifier.cc
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2013 Christoph Duelli <duelli@melosgmbh.de>
+//
+// 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
+//
+//========================================================================
+
 #ifdef USE_GCC_PRAGMAS
 #pragma implementation
 #endif
@@ -18,6 +32,8 @@
 
 //------------------------------------------------------------------------
 
+namespace { // do not pollute global namespace
+
 class Reader {
 public:
 
@@ -413,6 +429,8 @@ GBool StreamReader::fillBuf(int pos, int len) {
   return gTrue;
 }
 
+}
+
 //------------------------------------------------------------------------
 
 static FoFiIdentifierType identify(Reader *reader);
diff --git a/fofi/Makefile.in b/fofi/Makefile.in
index b22a3249..0eb98ad7 100644
--- a/fofi/Makefile.in
+++ b/fofi/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,10 +80,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = fofi
-DIST_COMMON = $(am__poppler_fofi_include_HEADERS_DIST) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(am__poppler_fofi_include_HEADERS_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -78,6 +105,19 @@ libfofi_la_OBJECTS = $(am_libfofi_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -90,17 +130,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -109,17 +148,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libfofi_la_SOURCES)
 DIST_SOURCES = $(libfofi_la_SOURCES)
 am__can_run_installinfo = \
@@ -158,6 +196,23 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(poppler_fofi_includedir)"
 HEADERS = $(poppler_fofi_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -253,6 +308,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -287,10 +345,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -312,13 +376,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -424,12 +488,15 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libfofi.la: $(libfofi_la_OBJECTS) $(libfofi_la_DEPENDENCIES) $(EXTRA_libfofi_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(CXXLINK)  $(libfofi_la_OBJECTS) $(libfofi_la_LIBADD) $(LIBS)
 
@@ -494,26 +561,15 @@ uninstall-poppler_fofi_includeHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(poppler_fofi_includedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -525,15 +581,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -542,6 +594,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -686,19 +753,19 @@ uninstall-am: uninstall-poppler_fofi_includeHEADERS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-poppler_fofi_includeHEADERS \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-poppler_fofi_includeHEADERS install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-poppler_fofi_includeHEADERS
 
 
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index bab58381..a3a9d4c3 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -81,6 +81,9 @@ set(poppler_glib_generated_SRCS
 add_library(poppler-glib SHARED ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
 set_target_properties(poppler-glib PROPERTIES VERSION 8.6.0 SOVERSION 8)
 target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
+if(HAVE_PTHREAD)
+   target_link_libraries(poppler-glib -lpthread)
+endif()
 install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
 install(FILES
diff --git a/glib/Makefile.in b/glib/Makefile.in
index a3e6e246..38f89257 100644
--- a/glib/Makefile.in
+++ b/glib/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,23 +17,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -55,11 +82,11 @@ build_triplet = @build@
 host_triplet = @host@
 @HAVE_INTROSPECTION_TRUE@am__append_1 = $(dist_gir_DATA) $(typelibs_DATA)
 subdir = glib
-DIST_COMMON = $(am__dist_gir_DATA_DIST) \
-	$(poppler_glib_include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/poppler-features.h.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/poppler-features.h.in $(top_srcdir)/depcomp \
+	$(am__dist_gir_DATA_DIST) $(poppler_glib_include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -121,10 +148,23 @@ libpoppler_glib_la_OBJECTS = $(am_libpoppler_glib_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libpoppler_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libpoppler_glib_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -137,17 +177,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -156,26 +195,26 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(libpoppler_glib_la_SOURCES)
 DIST_SOURCES = $(libpoppler_glib_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -187,9 +226,29 @@ HEADERS = $(nodist_poppler_glib_include_HEADERS) \
 	$(poppler_glib_include_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -311,6 +370,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -345,10 +407,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -370,13 +438,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -539,6 +607,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 poppler-features.h: $(top_builddir)/config.status $(srcdir)/poppler-features.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -565,12 +634,15 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libpoppler-glib.la: $(libpoppler_glib_la_OBJECTS) $(libpoppler_glib_la_DEPENDENCIES) $(EXTRA_libpoppler_glib_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(libpoppler_glib_la_LINK) -rpath $(libdir) $(libpoppler_glib_la_OBJECTS) $(libpoppler_glib_la_LIBADD) $(LIBS)
 
@@ -728,22 +800,25 @@ uninstall-poppler_glib_includeHEADERS:
 	dir='$(DESTDIR)$(poppler_glib_includedir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -758,57 +833,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -824,12 +854,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -841,15 +866,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -858,6 +879,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1036,28 +1072,26 @@ uninstall-am: uninstall-dist_girDATA uninstall-libLTLIBRARIES \
 	uninstall-nodist_poppler_glib_includeHEADERS \
 	uninstall-poppler_glib_includeHEADERS uninstall-typelibsDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	ctags-recursive install install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dist_girDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man \
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libLTLIBRARIES \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_girDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
 	install-nodist_poppler_glib_includeHEADERS install-pdf \
 	install-pdf-am install-poppler_glib_includeHEADERS install-ps \
 	install-ps-am install-strip install-typelibsDATA installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-dist_girDATA uninstall-libLTLIBRARIES \
+	tags tags-am uninstall uninstall-am uninstall-dist_girDATA \
+	uninstall-libLTLIBRARIES \
 	uninstall-nodist_poppler_glib_includeHEADERS \
 	uninstall-poppler_glib_includeHEADERS uninstall-typelibsDATA
 
diff --git a/glib/Poppler-0.18.gir b/glib/Poppler-0.18.gir
index 0cf4e031..d1040b73 100644
--- a/glib/Poppler-0.18.gir
+++ b/glib/Poppler-0.18.gir
@@ -6,7 +6,6 @@ and/or use gtk-doc annotations.  -->
             xmlns="http://www.gtk.org/introspection/core/1.0"
             xmlns:c="http://www.gtk.org/introspection/c/1.0"
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <include name="GLib" version="2.0"/>
   <include name="GObject" version="2.0"/>
   <include name="Gio" version="2.0"/>
   <include name="cairo" version="1.0"/>
@@ -67,7 +66,7 @@ and/or use gtk-doc annotations.  -->
            glib:type-name="PopplerAction"
            glib:get-type="poppler_action_get_type"
            c:symbol-prefix="action">
-      <doc xml:whitespace="preserve">A data structure for holding actions</doc>
+      <doc xml:space="preserve">A data structure for holding actions</doc>
       <field name="type" writable="1">
         <type name="ActionType" c:type="PopplerActionType"/>
       </field>
@@ -102,17 +101,29 @@ and/or use gtk-doc annotations.  -->
         <type name="ActionJavascript" c:type="PopplerActionJavascript"/>
       </field>
       <method name="copy" c:identifier="poppler_action_copy">
-        <doc xml:whitespace="preserve">Copies @action, creating an identical #PopplerAction.</doc>
+        <doc xml:space="preserve">Copies @action, creating an identical #PopplerAction.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new action identical to @action</doc>
+          <doc xml:space="preserve">a new action identical to @action</doc>
           <type name="Action" c:type="PopplerAction*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="action" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAction</doc>
+            <type name="Action" c:type="PopplerAction*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_action_free">
-        <doc xml:whitespace="preserve">Frees @action</doc>
+        <doc xml:space="preserve">Frees @action</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="action" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAction</doc>
+            <type name="Action" c:type="PopplerAction*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </union>
     <record name="ActionAny" c:type="PopplerActionAny">
@@ -174,7 +185,7 @@ and/or use gtk-doc annotations.  -->
       </field>
     </record>
     <record name="ActionLayer" c:type="PopplerActionLayer">
-      <doc xml:whitespace="preserve">Action to perform over a list of layers</doc>
+      <doc xml:space="preserve">Action to perform over a list of layers</doc>
       <field name="action" writable="1">
         <type name="ActionLayerAction" c:type="PopplerActionLayerAction"/>
       </field>
@@ -189,19 +200,25 @@ and/or use gtk-doc annotations.  -->
                  glib:type-name="PopplerActionLayerAction"
                  glib:get-type="poppler_action_layer_action_get_type"
                  c:type="PopplerActionLayerAction">
-      <doc xml:whitespace="preserve">Layer actions</doc>
+      <doc xml:space="preserve">Layer actions</doc>
       <member name="on"
               value="0"
               c:identifier="POPPLER_ACTION_LAYER_ON"
-              glib:nick="on"/>
+              glib:nick="on">
+        <doc xml:space="preserve">set layer visibility on</doc>
+      </member>
       <member name="off"
               value="1"
               c:identifier="POPPLER_ACTION_LAYER_OFF"
-              glib:nick="off"/>
+              glib:nick="off">
+        <doc xml:space="preserve">set layer visibility off</doc>
+      </member>
       <member name="toggle"
               value="2"
               c:identifier="POPPLER_ACTION_LAYER_TOGGLE"
-              glib:nick="toggle"/>
+              glib:nick="toggle">
+        <doc xml:space="preserve">reverse the layer visibility state</doc>
+      </member>
     </enumeration>
     <record name="ActionMovie" c:type="PopplerActionMovie">
       <field name="type" writable="1">
@@ -223,23 +240,31 @@ and/or use gtk-doc annotations.  -->
                  glib:type-name="PopplerActionMovieOperation"
                  glib:get-type="poppler_action_movie_operation_get_type"
                  c:type="PopplerActionMovieOperation">
-      <doc xml:whitespace="preserve">Movie operations</doc>
+      <doc xml:space="preserve">Movie operations</doc>
       <member name="play"
               value="0"
               c:identifier="POPPLER_ACTION_MOVIE_PLAY"
-              glib:nick="play"/>
+              glib:nick="play">
+        <doc xml:space="preserve">play movie</doc>
+      </member>
       <member name="pause"
               value="1"
               c:identifier="POPPLER_ACTION_MOVIE_PAUSE"
-              glib:nick="pause"/>
+              glib:nick="pause">
+        <doc xml:space="preserve">pause playing movie</doc>
+      </member>
       <member name="resume"
               value="2"
               c:identifier="POPPLER_ACTION_MOVIE_RESUME"
-              glib:nick="resume"/>
+              glib:nick="resume">
+        <doc xml:space="preserve">resume paused movie</doc>
+      </member>
       <member name="stop"
               value="3"
               c:identifier="POPPLER_ACTION_MOVIE_STOP"
-              glib:nick="stop"/>
+              glib:nick="stop">
+        <doc xml:space="preserve">stop playing movie</doc>
+      </member>
     </enumeration>
     <record name="ActionNamed" c:type="PopplerActionNamed">
       <field name="type" writable="1">
@@ -283,51 +308,73 @@ and/or use gtk-doc annotations.  -->
                  glib:type-name="PopplerActionType"
                  glib:get-type="poppler_action_type_get_type"
                  c:type="PopplerActionType">
-      <doc xml:whitespace="preserve">Action types</doc>
+      <doc xml:space="preserve">Action types</doc>
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_ACTION_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+        <doc xml:space="preserve">unknown action</doc>
+      </member>
       <member name="none"
               value="1"
               c:identifier="POPPLER_ACTION_NONE"
-              glib:nick="none"/>
+              glib:nick="none">
+        <doc xml:space="preserve">no action specified</doc>
+      </member>
       <member name="goto_dest"
               value="2"
               c:identifier="POPPLER_ACTION_GOTO_DEST"
-              glib:nick="goto-dest"/>
+              glib:nick="goto-dest">
+        <doc xml:space="preserve">go to destination</doc>
+      </member>
       <member name="goto_remote"
               value="3"
               c:identifier="POPPLER_ACTION_GOTO_REMOTE"
-              glib:nick="goto-remote"/>
+              glib:nick="goto-remote">
+        <doc xml:space="preserve">go to destination in another document</doc>
+      </member>
       <member name="launch"
               value="4"
               c:identifier="POPPLER_ACTION_LAUNCH"
-              glib:nick="launch"/>
+              glib:nick="launch">
+        <doc xml:space="preserve">launch app (or open document</doc>
+      </member>
       <member name="uri"
               value="5"
               c:identifier="POPPLER_ACTION_URI"
-              glib:nick="uri"/>
+              glib:nick="uri">
+        <doc xml:space="preserve">URI</doc>
+      </member>
       <member name="named"
               value="6"
               c:identifier="POPPLER_ACTION_NAMED"
-              glib:nick="named"/>
+              glib:nick="named">
+        <doc xml:space="preserve">predefined action</doc>
+      </member>
       <member name="movie"
               value="7"
               c:identifier="POPPLER_ACTION_MOVIE"
-              glib:nick="movie"/>
+              glib:nick="movie">
+        <doc xml:space="preserve">play movies. Since 0.14</doc>
+      </member>
       <member name="rendition"
               value="8"
               c:identifier="POPPLER_ACTION_RENDITION"
-              glib:nick="rendition"/>
+              glib:nick="rendition">
+        <doc xml:space="preserve">play multimedia content. Since 0.14</doc>
+      </member>
       <member name="ocg_state"
               value="9"
               c:identifier="POPPLER_ACTION_OCG_STATE"
-              glib:nick="ocg-state"/>
+              glib:nick="ocg-state">
+        <doc xml:space="preserve">state of layer. Since 0.14</doc>
+      </member>
       <member name="javascript"
               value="10"
               c:identifier="POPPLER_ACTION_JAVASCRIPT"
-              glib:nick="javascript"/>
+              glib:nick="javascript">
+        <doc xml:space="preserve">Javascript. Since 0.18</doc>
+      </member>
     </enumeration>
     <record name="ActionUri" c:type="PopplerActionUri">
       <field name="type" writable="1">
@@ -348,71 +395,117 @@ and/or use gtk-doc annotations.  -->
            glib:get-type="poppler_annot_get_type">
       <method name="get_annot_type"
               c:identifier="poppler_annot_get_annot_type">
-        <doc xml:whitespace="preserve">Gets the type of @poppler_annot</doc>
+        <doc xml:space="preserve">Gets the type of @poppler_annot</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerAnnotType of @poppler_annot.</doc>
+          <doc xml:space="preserve">#PopplerAnnotType of @poppler_annot.</doc>
           <type name="AnnotType" c:type="PopplerAnnotType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_color" c:identifier="poppler_annot_get_color">
-        <doc xml:whitespace="preserve">Retrieves the color of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the color of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated #PopplerColor with the color values of @poppler_annot, or %NULL. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated #PopplerColor with the color values of @poppler_annot, or %NULL. It must be freed with g_free() when done.</doc>
           <type name="Color" c:type="PopplerColor*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_contents" c:identifier="poppler_annot_get_contents">
-        <doc xml:whitespace="preserve">Retrieves the contents of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the contents of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string with the contents of @poppler_annot. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string with the contents of @poppler_annot. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_flags" c:identifier="poppler_annot_get_flags">
-        <doc xml:whitespace="preserve">Retrieves the flag field specifying various characteristics of the
+        <doc xml:space="preserve">Retrieves the flag field specifying various characteristics of the
 @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the flag field of @poppler_annot.</doc>
+          <doc xml:space="preserve">the flag field of @poppler_annot.</doc>
           <type name="AnnotFlag" c:type="PopplerAnnotFlag"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_modified" c:identifier="poppler_annot_get_modified">
-        <doc xml:whitespace="preserve">Retrieves the last modification data of @poppler_annot. The returned
+        <doc xml:space="preserve">Retrieves the last modification data of @poppler_annot. The returned
 string will be either a PDF format date or a text string.
 See also #poppler_date_parse()</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string with the last modification data of @poppler_annot. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string with the last modification data of @poppler_annot. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_name" c:identifier="poppler_annot_get_name">
-        <doc xml:whitespace="preserve">Retrieves the name of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the name of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string with the name of @poppler_annot. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string with the name of @poppler_annot. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_page_index"
               c:identifier="poppler_annot_get_page_index"
               version="0.14">
-        <doc xml:whitespace="preserve">Returns the page index to which @poppler_annot is associated, or -1 if unknown</doc>
+        <doc xml:space="preserve">Returns the page index to which @poppler_annot is associated, or -1 if unknown</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">page index or -1</doc>
+          <doc xml:space="preserve">page index or -1</doc>
           <type name="gint" c:type="gint"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="set_color"
               c:identifier="poppler_annot_set_color"
               version="0.16">
-        <doc xml:whitespace="preserve">Sets the color of @poppler_annot.</doc>
+        <doc xml:space="preserve">Sets the color of @poppler_annot.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
           <parameter name="poppler_color"
                      transfer-ownership="none"
                      allow-none="1">
-            <doc xml:whitespace="preserve">a #PopplerColor, or %NULL</doc>
+            <doc xml:space="preserve">a #PopplerColor, or %NULL</doc>
             <type name="Color" c:type="PopplerColor*"/>
           </parameter>
         </parameters>
@@ -420,14 +513,18 @@ See also #poppler_date_parse()</doc>
       <method name="set_contents"
               c:identifier="poppler_annot_set_contents"
               version="0.12">
-        <doc xml:whitespace="preserve">Sets the contents of @poppler_annot to the given value,
+        <doc xml:space="preserve">Sets the contents of @poppler_annot to the given value,
 replacing the current contents.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
           <parameter name="contents" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a text string containing the new contents</doc>
+            <doc xml:space="preserve">a text string containing the new contents</doc>
             <type name="utf8" c:type="const gchar*"/>
           </parameter>
         </parameters>
@@ -435,14 +532,18 @@ replacing the current contents.</doc>
       <method name="set_flags"
               c:identifier="poppler_annot_set_flags"
               version="0.22">
-        <doc xml:whitespace="preserve">Sets the flag field specifying various characteristics of the
+        <doc xml:space="preserve">Sets the flag field specifying various characteristics of the
 @poppler_annot.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnot</doc>
+            <type name="Annot" c:type="PopplerAnnot*"/>
+          </instance-parameter>
           <parameter name="flags" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerAnnotFlag</doc>
+            <doc xml:space="preserve">a #PopplerAnnotFlag</doc>
             <type name="AnnotFlag" c:type="PopplerAnnotFlag"/>
           </parameter>
         </parameters>
@@ -475,24 +576,36 @@ replacing the current contents.</doc>
         <type name="gdouble" c:type="gdouble"/>
       </field>
       <constructor name="new" c:identifier="poppler_annot_callout_line_new">
-        <doc xml:whitespace="preserve">Creates a new empty #PopplerAnnotCalloutLine.</doc>
+        <doc xml:space="preserve">Creates a new empty #PopplerAnnotCalloutLine.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated #PopplerAnnotCalloutLine, %NULL in other case. It must be freed when done.</doc>
+          <doc xml:space="preserve">a new allocated #PopplerAnnotCalloutLine, %NULL in other case. It must be freed when done.</doc>
           <type name="AnnotCalloutLine" c:type="PopplerAnnotCalloutLine*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_annot_callout_line_copy">
-        <doc xml:whitespace="preserve">It does copy @callout to a new #PopplerAnnotCalloutLine.</doc>
+        <doc xml:space="preserve">It does copy @callout to a new #PopplerAnnotCalloutLine.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated #PopplerAnnotCalloutLine as exact copy of @callout, %NULL in other case. It must be freed when done.</doc>
+          <doc xml:space="preserve">a new allocated #PopplerAnnotCalloutLine as exact copy of @callout, %NULL in other case. It must be freed when done.</doc>
           <type name="AnnotCalloutLine" c:type="PopplerAnnotCalloutLine*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="callout" transfer-ownership="none">
+            <doc xml:space="preserve">the #PopplerAnnotCalloutLine to be copied.</doc>
+            <type name="AnnotCalloutLine" c:type="PopplerAnnotCalloutLine*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_annot_callout_line_free">
-        <doc xml:whitespace="preserve">Frees the memory used by #PopplerAnnotCalloutLine.</doc>
+        <doc xml:space="preserve">Frees the memory used by #PopplerAnnotCalloutLine.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="callout" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotCalloutLine</doc>
+            <type name="AnnotCalloutLine" c:type="PopplerAnnotCalloutLine*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <enumeration name="AnnotExternalDataType"
@@ -502,11 +615,13 @@ replacing the current contents.</doc>
       <member name="3d"
               value="0"
               c:identifier="POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D"
-              glib:nick="3d"/>
+              glib:nick="3d">
+      </member>
       <member name="unknown"
               value="1"
               c:identifier="POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+      </member>
     </enumeration>
     <class name="AnnotFileAttachment"
            c:symbol-prefix="annot_file_attachment"
@@ -517,21 +632,35 @@ replacing the current contents.</doc>
       <method name="get_attachment"
               c:identifier="poppler_annot_file_attachment_get_attachment"
               version="0.14">
-        <doc xml:whitespace="preserve">Creates a #PopplerAttachment for the file of the file attachment annotation @annot.
+        <doc xml:space="preserve">Creates a #PopplerAttachment for the file of the file attachment annotation @annot.
 The #PopplerAttachment must be unrefed with g_object_unref by the caller.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">@PopplerAttachment</doc>
+          <doc xml:space="preserve">@PopplerAttachment</doc>
           <type name="Attachment" c:type="PopplerAttachment*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotFileAttachment</doc>
+            <type name="AnnotFileAttachment"
+                  c:type="PopplerAnnotFileAttachment*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_name"
               c:identifier="poppler_annot_file_attachment_get_name"
               version="0.14">
-        <doc xml:whitespace="preserve">Retrieves the name of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the name of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string with the name of @poppler_annot. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string with the name of @poppler_annot. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotFileAttachment</doc>
+            <type name="AnnotFileAttachment"
+                  c:type="PopplerAnnotFileAttachment*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </class>
     <bitfield name="AnnotFlag"
@@ -541,47 +670,58 @@ The #PopplerAttachment must be unrefed with g_object_unref by the caller.</doc>
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_ANNOT_FLAG_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+      </member>
       <member name="invisible"
               value="1"
               c:identifier="POPPLER_ANNOT_FLAG_INVISIBLE"
-              glib:nick="invisible"/>
+              glib:nick="invisible">
+      </member>
       <member name="hidden"
               value="2"
               c:identifier="POPPLER_ANNOT_FLAG_HIDDEN"
-              glib:nick="hidden"/>
+              glib:nick="hidden">
+      </member>
       <member name="print"
               value="4"
               c:identifier="POPPLER_ANNOT_FLAG_PRINT"
-              glib:nick="print"/>
+              glib:nick="print">
+      </member>
       <member name="no_zoom"
               value="8"
               c:identifier="POPPLER_ANNOT_FLAG_NO_ZOOM"
-              glib:nick="no-zoom"/>
+              glib:nick="no-zoom">
+      </member>
       <member name="no_rotate"
               value="16"
               c:identifier="POPPLER_ANNOT_FLAG_NO_ROTATE"
-              glib:nick="no-rotate"/>
+              glib:nick="no-rotate">
+      </member>
       <member name="no_view"
               value="32"
               c:identifier="POPPLER_ANNOT_FLAG_NO_VIEW"
-              glib:nick="no-view"/>
+              glib:nick="no-view">
+      </member>
       <member name="read_only"
               value="64"
               c:identifier="POPPLER_ANNOT_FLAG_READ_ONLY"
-              glib:nick="read-only"/>
+              glib:nick="read-only">
+      </member>
       <member name="locked"
               value="128"
               c:identifier="POPPLER_ANNOT_FLAG_LOCKED"
-              glib:nick="locked"/>
+              glib:nick="locked">
+      </member>
       <member name="toggle_no_view"
               value="256"
               c:identifier="POPPLER_ANNOT_FLAG_TOGGLE_NO_VIEW"
-              glib:nick="toggle-no-view"/>
+              glib:nick="toggle-no-view">
+      </member>
       <member name="locked_contents"
               value="512"
               c:identifier="POPPLER_ANNOT_FLAG_LOCKED_CONTENTS"
-              glib:nick="locked-contents"/>
+              glib:nick="locked-contents">
+      </member>
     </bitfield>
     <class name="AnnotFreeText"
            c:symbol-prefix="annot_free_text"
@@ -591,21 +731,33 @@ The #PopplerAttachment must be unrefed with g_object_unref by the caller.</doc>
            glib:get-type="poppler_annot_free_text_get_type">
       <method name="get_callout_line"
               c:identifier="poppler_annot_free_text_get_callout_line">
-        <doc xml:whitespace="preserve">Retrieves a #PopplerAnnotCalloutLine of four or six numbers specifying a callout
+        <doc xml:space="preserve">Retrieves a #PopplerAnnotCalloutLine of four or six numbers specifying a callout
 line attached to the @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated #PopplerAnnotCalloutLine if the annot has a callout line, %NULL in other case. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated #PopplerAnnotCalloutLine if the annot has a callout line, %NULL in other case. It must be freed with g_free() when done.</doc>
           <type name="AnnotCalloutLine" c:type="PopplerAnnotCalloutLine*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotFreeText</doc>
+            <type name="AnnotFreeText" c:type="PopplerAnnotFreeText*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_quadding"
               c:identifier="poppler_annot_free_text_get_quadding">
-        <doc xml:whitespace="preserve">Retrieves the justification of the text of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the justification of the text of @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerAnnotFreeTextQuadding of @poppler_annot.</doc>
+          <doc xml:space="preserve">#PopplerAnnotFreeTextQuadding of @poppler_annot.</doc>
           <type name="AnnotFreeTextQuadding"
                 c:type="PopplerAnnotFreeTextQuadding"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotFreeText</doc>
+            <type name="AnnotFreeText" c:type="PopplerAnnotFreeText*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </class>
     <enumeration name="AnnotFreeTextQuadding"
@@ -615,22 +767,25 @@ line attached to the @poppler_annot.</doc>
       <member name="left_justified"
               value="0"
               c:identifier="POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED"
-              glib:nick="left-justified"/>
+              glib:nick="left-justified">
+      </member>
       <member name="centered"
               value="1"
               c:identifier="POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED"
-              glib:nick="centered"/>
+              glib:nick="centered">
+      </member>
       <member name="right_justified"
               value="2"
               c:identifier="POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED"
-              glib:nick="right-justified"/>
+              glib:nick="right-justified">
+      </member>
     </enumeration>
     <record name="AnnotMapping"
             c:type="PopplerAnnotMapping"
             glib:type-name="PopplerAnnotMapping"
             glib:get-type="poppler_annot_mapping_get_type"
             c:symbol-prefix="annot_mapping">
-      <doc xml:whitespace="preserve">A #PopplerAnnotMapping structure represents the location
+      <doc xml:space="preserve">A #PopplerAnnotMapping structure represents the location
 of @annot on the page</doc>
       <field name="area" writable="1">
         <type name="Rectangle" c:type="PopplerRectangle"/>
@@ -639,24 +794,36 @@ of @annot on the page</doc>
         <type name="Annot" c:type="PopplerAnnot*"/>
       </field>
       <constructor name="new" c:identifier="poppler_annot_mapping_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerAnnotMapping</doc>
+        <doc xml:space="preserve">Creates a new #PopplerAnnotMapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerAnnotMapping, use poppler_annot_mapping_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerAnnotMapping, use poppler_annot_mapping_free() to free it</doc>
           <type name="AnnotMapping" c:type="PopplerAnnotMapping*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_annot_mapping_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @mapping</doc>
+        <doc xml:space="preserve">Creates a copy of @mapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @mapping</doc>
+          <doc xml:space="preserve">a new allocated copy of @mapping</doc>
           <type name="AnnotMapping" c:type="PopplerAnnotMapping*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMapping to copy</doc>
+            <type name="AnnotMapping" c:type="PopplerAnnotMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_annot_mapping_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerAnnotMapping</doc>
+        <doc xml:space="preserve">Frees the given #PopplerAnnotMapping</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMapping</doc>
+            <type name="AnnotMapping" c:type="PopplerAnnotMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <class name="AnnotMarkup"
@@ -666,98 +833,154 @@ of @annot on the page</doc>
            glib:type-name="PopplerAnnotMarkup"
            glib:get-type="poppler_annot_markup_get_type">
       <method name="get_date" c:identifier="poppler_annot_markup_get_date">
-        <doc xml:whitespace="preserve">Returns the date and time when the annotation was created</doc>
+        <doc xml:space="preserve">Returns the date and time when the annotation was created</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a #GDate representing the date and time when the annotation was created, or %NULL</doc>
+          <doc xml:space="preserve">a #GDate representing the date and time when the annotation was created, or %NULL</doc>
           <type name="GLib.Date" c:type="GDate*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_external_data"
               c:identifier="poppler_annot_markup_get_external_data">
-        <doc xml:whitespace="preserve">Gets the external data type of @poppler_annot.</doc>
+        <doc xml:space="preserve">Gets the external data type of @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerAnnotExternalDataType of @poppler_annot.</doc>
+          <doc xml:space="preserve">#PopplerAnnotExternalDataType of @poppler_annot.</doc>
           <type name="AnnotExternalDataType"
                 c:type="PopplerAnnotExternalDataType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_label" c:identifier="poppler_annot_markup_get_label">
-        <doc xml:whitespace="preserve">Retrieves the label text of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the label text of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">the label text of @poppler_annot.</doc>
+          <doc xml:space="preserve">the label text of @poppler_annot.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_opacity"
               c:identifier="poppler_annot_markup_get_opacity">
-        <doc xml:whitespace="preserve">Retrieves the opacity value of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the opacity value of @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the opacity value of @poppler_annot, between 0 (transparent) and 1 (opaque)</doc>
+          <doc xml:space="preserve">the opacity value of @poppler_annot, between 0 (transparent) and 1 (opaque)</doc>
           <type name="gdouble" c:type="gdouble"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_popup_is_open"
               c:identifier="poppler_annot_markup_get_popup_is_open">
-        <doc xml:whitespace="preserve">Retrieves the state of the popup window related to @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the state of the popup window related to @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the state of @poppler_annot. %TRUE if it's open, %FALSE in other case.</doc>
+          <doc xml:space="preserve">the state of @poppler_annot. %TRUE if it's open, %FALSE in other case.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_popup_rectangle"
               c:identifier="poppler_annot_markup_get_popup_rectangle"
               version="0.12">
-        <doc xml:whitespace="preserve">Retrieves the rectangle of the popup window related to @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the rectangle of the popup window related to @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if #PopplerRectangle was correctly filled, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if #PopplerRectangle was correctly filled, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
           <parameter name="poppler_rect"
                      direction="out"
                      caller-allocates="1"
                      transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerRectangle to store the popup rectangle</doc>
+            <doc xml:space="preserve">a #PopplerRectangle to store the popup rectangle</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_reply_to"
               c:identifier="poppler_annot_markup_get_reply_to">
-        <doc xml:whitespace="preserve">Gets the reply type of @poppler_annot.</doc>
+        <doc xml:space="preserve">Gets the reply type of @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerAnnotMarkupReplyType of @poppler_annot.</doc>
+          <doc xml:space="preserve">#PopplerAnnotMarkupReplyType of @poppler_annot.</doc>
           <type name="AnnotMarkupReplyType"
                 c:type="PopplerAnnotMarkupReplyType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_subject"
               c:identifier="poppler_annot_markup_get_subject">
-        <doc xml:whitespace="preserve">Retrives the subject text of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrives the subject text of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">the subject text of @poppler_annot.</doc>
+          <doc xml:space="preserve">the subject text of @poppler_annot.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="has_popup"
               c:identifier="poppler_annot_markup_has_popup"
               version="0.12">
-        <doc xml:whitespace="preserve">Return %TRUE if the markup annotation has a popup window associated</doc>
+        <doc xml:space="preserve">Return %TRUE if the markup annotation has a popup window associated</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if @poppler_annot has popup, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE, if @poppler_annot has popup, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="set_label"
               c:identifier="poppler_annot_markup_set_label"
               version="0.16">
-        <doc xml:whitespace="preserve">Sets the label text of @poppler_annot, replacing the current one</doc>
+        <doc xml:space="preserve">Sets the label text of @poppler_annot, replacing the current one</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
           <parameter name="label" transfer-ownership="none" allow-none="1">
-            <doc xml:whitespace="preserve">a text string containing the new label, or %NULL</doc>
+            <doc xml:space="preserve">a text string containing the new label, or %NULL</doc>
             <type name="utf8" c:type="const gchar*"/>
           </parameter>
         </parameters>
@@ -765,15 +988,19 @@ of @annot on the page</doc>
       <method name="set_opacity"
               c:identifier="poppler_annot_markup_set_opacity"
               version="0.16">
-        <doc xml:whitespace="preserve">Sets the opacity of @poppler_annot. This value applies to
+        <doc xml:space="preserve">Sets the opacity of @poppler_annot. This value applies to
 all visible elements of @poppler_annot in its closed state,
 but not to the pop-up window that appears when it's openened</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
           <parameter name="opacity" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a constant opacity value, between 0 (transparent) and 1 (opaque)</doc>
+            <doc xml:space="preserve">a constant opacity value, between 0 (transparent) and 1 (opaque)</doc>
             <type name="gdouble" c:type="gdouble"/>
           </parameter>
         </parameters>
@@ -781,14 +1008,18 @@ but not to the pop-up window that appears when it's openened</doc>
       <method name="set_popup"
               c:identifier="poppler_annot_markup_set_popup"
               version="0.16">
-        <doc xml:whitespace="preserve">Associates a new popup window for editing contents of @poppler_annot.
+        <doc xml:space="preserve">Associates a new popup window for editing contents of @poppler_annot.
 Popup window shall be displayed by viewers at @popup_rect on the page.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
           <parameter name="popup_rect" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerRectangle</doc>
+            <doc xml:space="preserve">a #PopplerRectangle</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
         </parameters>
@@ -796,13 +1027,17 @@ Popup window shall be displayed by viewers at @popup_rect on the page.</doc>
       <method name="set_popup_is_open"
               c:identifier="poppler_annot_markup_set_popup_is_open"
               version="0.16">
-        <doc xml:whitespace="preserve">Sets the state of the popup window related to @poppler_annot.</doc>
+        <doc xml:space="preserve">Sets the state of the popup window related to @poppler_annot.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMarkup</doc>
+            <type name="AnnotMarkup" c:type="PopplerAnnotMarkup*"/>
+          </instance-parameter>
           <parameter name="is_open" transfer-ownership="none">
-            <doc xml:whitespace="preserve">whether popup window should initially be displayed open</doc>
+            <doc xml:space="preserve">whether popup window should initially be displayed open</doc>
             <type name="gboolean" c:type="gboolean"/>
           </parameter>
         </parameters>
@@ -815,11 +1050,13 @@ Popup window shall be displayed by viewers at @popup_rect on the page.</doc>
       <member name="r"
               value="0"
               c:identifier="POPPLER_ANNOT_MARKUP_REPLY_TYPE_R"
-              glib:nick="r"/>
+              glib:nick="r">
+      </member>
       <member name="group"
               value="1"
               c:identifier="POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP"
-              glib:nick="group"/>
+              glib:nick="group">
+      </member>
     </enumeration>
     <class name="AnnotMovie"
            c:symbol-prefix="annot_movie"
@@ -830,20 +1067,32 @@ Popup window shall be displayed by viewers at @popup_rect on the page.</doc>
       <method name="get_movie"
               c:identifier="poppler_annot_movie_get_movie"
               version="0.14">
-        <doc xml:whitespace="preserve">Retrieves the movie object (PopplerMovie) stored in the @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the movie object (PopplerMovie) stored in the @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the movie object stored in the @poppler_annot. The returned object is owned by #PopplerAnnotMovie and should not be freed</doc>
+          <doc xml:space="preserve">the movie object stored in the @poppler_annot. The returned object is owned by #PopplerAnnotMovie and should not be freed</doc>
           <type name="Movie" c:type="PopplerMovie*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMovie</doc>
+            <type name="AnnotMovie" c:type="PopplerAnnotMovie*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_title"
               c:identifier="poppler_annot_movie_get_title"
               version="0.14">
-        <doc xml:whitespace="preserve">Retrieves the movie title of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the movie title of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">the title text of @poppler_annot.</doc>
+          <doc xml:space="preserve">the title text of @poppler_annot.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotMovie</doc>
+            <type name="AnnotMovie" c:type="PopplerAnnotMovie*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </class>
     <class name="AnnotScreen"
@@ -855,11 +1104,17 @@ Popup window shall be displayed by viewers at @popup_rect on the page.</doc>
       <method name="get_action"
               c:identifier="poppler_annot_screen_get_action"
               version="0.14">
-        <doc xml:whitespace="preserve">Retrieves the action (#PopplerAction) that shall be performed when @poppler_annot is activated</doc>
+        <doc xml:space="preserve">Retrieves the action (#PopplerAction) that shall be performed when @poppler_annot is activated</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the action to perform. The returned object is owned by @poppler_annot and should not be freed</doc>
+          <doc xml:space="preserve">the action to perform. The returned object is owned by @poppler_annot and should not be freed</doc>
           <type name="Action" c:type="PopplerAction*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotScreen</doc>
+            <type name="AnnotScreen" c:type="PopplerAnnotScreen*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </class>
     <class name="AnnotText"
@@ -871,49 +1126,67 @@ Popup window shall be displayed by viewers at @popup_rect on the page.</doc>
       <constructor name="new"
                    c:identifier="poppler_annot_text_new"
                    version="0.16">
-        <doc xml:whitespace="preserve">Creates a new Text annotation that will be
+        <doc xml:space="preserve">Creates a new Text annotation that will be
 located on @rect when added to a page. See
 poppler_page_add_annot()</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A newly created #PopplerAnnotText annotation</doc>
+          <doc xml:space="preserve">A newly created #PopplerAnnotText annotation</doc>
           <type name="Annot" c:type="PopplerAnnot*"/>
         </return-value>
         <parameters>
           <parameter name="doc" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerDocument</doc>
+            <doc xml:space="preserve">a #PopplerDocument</doc>
             <type name="Document" c:type="PopplerDocument*"/>
           </parameter>
           <parameter name="rect" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerRectangle</doc>
+            <doc xml:space="preserve">a #PopplerRectangle</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="get_icon" c:identifier="poppler_annot_text_get_icon">
-        <doc xml:whitespace="preserve">Gets name of the icon of @poppler_annot.</doc>
+        <doc xml:space="preserve">Gets name of the icon of @poppler_annot.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the icon name</doc>
+          <doc xml:space="preserve">a new allocated string containing the icon name</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotText</doc>
+            <type name="AnnotText" c:type="PopplerAnnotText*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_is_open" c:identifier="poppler_annot_text_get_is_open">
-        <doc xml:whitespace="preserve">Retrieves the state of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the state of @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the state of @poppler_annot. %TRUE if it's open, %FALSE in other case.</doc>
+          <doc xml:space="preserve">the state of @poppler_annot. %TRUE if it's open, %FALSE in other case.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotText</doc>
+            <type name="AnnotText" c:type="PopplerAnnotText*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_state" c:identifier="poppler_annot_text_get_state">
-        <doc xml:whitespace="preserve">Retrieves the state of @poppler_annot.</doc>
+        <doc xml:space="preserve">Retrieves the state of @poppler_annot.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerAnnotTextState of @poppler_annot.</doc>
+          <doc xml:space="preserve">#PopplerAnnotTextState of @poppler_annot.</doc>
           <type name="AnnotTextState" c:type="PopplerAnnotTextState"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotText</doc>
+            <type name="AnnotText" c:type="PopplerAnnotText*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="set_icon"
               c:identifier="poppler_annot_text_set_icon"
               version="0.16">
-        <doc xml:whitespace="preserve">Sets the icon of @poppler_annot. The following predefined
+        <doc xml:space="preserve">Sets the icon of @poppler_annot. The following predefined
 icons are currently supported:
 &lt;variablelist&gt;
  &lt;varlistentry&gt;
@@ -948,8 +1221,12 @@ icons are currently supported:
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotText</doc>
+            <type name="AnnotText" c:type="PopplerAnnotText*"/>
+          </instance-parameter>
           <parameter name="icon" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the name of an icon</doc>
+            <doc xml:space="preserve">the name of an icon</doc>
             <type name="utf8" c:type="const gchar*"/>
           </parameter>
         </parameters>
@@ -957,13 +1234,17 @@ icons are currently supported:
       <method name="set_is_open"
               c:identifier="poppler_annot_text_set_is_open"
               version="0.16">
-        <doc xml:whitespace="preserve">Sets whether @poppler_annot should initially be displayed open</doc>
+        <doc xml:space="preserve">Sets whether @poppler_annot should initially be displayed open</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_annot" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerAnnotText</doc>
+            <type name="AnnotText" c:type="PopplerAnnotText*"/>
+          </instance-parameter>
           <parameter name="is_open" transfer-ownership="none">
-            <doc xml:whitespace="preserve">whether annotation should initially be displayed open</doc>
+            <doc xml:space="preserve">whether annotation should initially be displayed open</doc>
             <type name="gboolean" c:type="gboolean"/>
           </parameter>
         </parameters>
@@ -976,35 +1257,43 @@ icons are currently supported:
       <member name="marked"
               value="0"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_MARKED"
-              glib:nick="marked"/>
+              glib:nick="marked">
+      </member>
       <member name="unmarked"
               value="1"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_UNMARKED"
-              glib:nick="unmarked"/>
+              glib:nick="unmarked">
+      </member>
       <member name="accepted"
               value="2"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_ACCEPTED"
-              glib:nick="accepted"/>
+              glib:nick="accepted">
+      </member>
       <member name="rejected"
               value="3"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_REJECTED"
-              glib:nick="rejected"/>
+              glib:nick="rejected">
+      </member>
       <member name="cancelled"
               value="4"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_CANCELLED"
-              glib:nick="cancelled"/>
+              glib:nick="cancelled">
+      </member>
       <member name="completed"
               value="5"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_COMPLETED"
-              glib:nick="completed"/>
+              glib:nick="completed">
+      </member>
       <member name="none"
               value="6"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_NONE"
-              glib:nick="none"/>
+              glib:nick="none">
+      </member>
       <member name="unknown"
               value="7"
               c:identifier="POPPLER_ANNOT_TEXT_STATE_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+      </member>
     </enumeration>
     <enumeration name="AnnotType"
                  glib:type-name="PopplerAnnotType"
@@ -1013,107 +1302,133 @@ icons are currently supported:
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_ANNOT_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+      </member>
       <member name="text"
               value="1"
               c:identifier="POPPLER_ANNOT_TEXT"
-              glib:nick="text"/>
+              glib:nick="text">
+      </member>
       <member name="link"
               value="2"
               c:identifier="POPPLER_ANNOT_LINK"
-              glib:nick="link"/>
+              glib:nick="link">
+      </member>
       <member name="free_text"
               value="3"
               c:identifier="POPPLER_ANNOT_FREE_TEXT"
-              glib:nick="free-text"/>
+              glib:nick="free-text">
+      </member>
       <member name="line"
               value="4"
               c:identifier="POPPLER_ANNOT_LINE"
-              glib:nick="line"/>
+              glib:nick="line">
+      </member>
       <member name="square"
               value="5"
               c:identifier="POPPLER_ANNOT_SQUARE"
-              glib:nick="square"/>
+              glib:nick="square">
+      </member>
       <member name="circle"
               value="6"
               c:identifier="POPPLER_ANNOT_CIRCLE"
-              glib:nick="circle"/>
+              glib:nick="circle">
+      </member>
       <member name="polygon"
               value="7"
               c:identifier="POPPLER_ANNOT_POLYGON"
-              glib:nick="polygon"/>
+              glib:nick="polygon">
+      </member>
       <member name="poly_line"
               value="8"
               c:identifier="POPPLER_ANNOT_POLY_LINE"
-              glib:nick="poly-line"/>
+              glib:nick="poly-line">
+      </member>
       <member name="highlight"
               value="9"
               c:identifier="POPPLER_ANNOT_HIGHLIGHT"
-              glib:nick="highlight"/>
+              glib:nick="highlight">
+      </member>
       <member name="underline"
               value="10"
               c:identifier="POPPLER_ANNOT_UNDERLINE"
-              glib:nick="underline"/>
+              glib:nick="underline">
+      </member>
       <member name="squiggly"
               value="11"
               c:identifier="POPPLER_ANNOT_SQUIGGLY"
-              glib:nick="squiggly"/>
+              glib:nick="squiggly">
+      </member>
       <member name="strike_out"
               value="12"
               c:identifier="POPPLER_ANNOT_STRIKE_OUT"
-              glib:nick="strike-out"/>
+              glib:nick="strike-out">
+      </member>
       <member name="stamp"
               value="13"
               c:identifier="POPPLER_ANNOT_STAMP"
-              glib:nick="stamp"/>
+              glib:nick="stamp">
+      </member>
       <member name="caret"
               value="14"
               c:identifier="POPPLER_ANNOT_CARET"
-              glib:nick="caret"/>
+              glib:nick="caret">
+      </member>
       <member name="ink"
               value="15"
               c:identifier="POPPLER_ANNOT_INK"
-              glib:nick="ink"/>
+              glib:nick="ink">
+      </member>
       <member name="popup"
               value="16"
               c:identifier="POPPLER_ANNOT_POPUP"
-              glib:nick="popup"/>
+              glib:nick="popup">
+      </member>
       <member name="file_attachment"
               value="17"
               c:identifier="POPPLER_ANNOT_FILE_ATTACHMENT"
-              glib:nick="file-attachment"/>
+              glib:nick="file-attachment">
+      </member>
       <member name="sound"
               value="18"
               c:identifier="POPPLER_ANNOT_SOUND"
-              glib:nick="sound"/>
+              glib:nick="sound">
+      </member>
       <member name="movie"
               value="19"
               c:identifier="POPPLER_ANNOT_MOVIE"
-              glib:nick="movie"/>
+              glib:nick="movie">
+      </member>
       <member name="widget"
               value="20"
               c:identifier="POPPLER_ANNOT_WIDGET"
-              glib:nick="widget"/>
+              glib:nick="widget">
+      </member>
       <member name="screen"
               value="21"
               c:identifier="POPPLER_ANNOT_SCREEN"
-              glib:nick="screen"/>
+              glib:nick="screen">
+      </member>
       <member name="printer_mark"
               value="22"
               c:identifier="POPPLER_ANNOT_PRINTER_MARK"
-              glib:nick="printer-mark"/>
+              glib:nick="printer-mark">
+      </member>
       <member name="trap_net"
               value="23"
               c:identifier="POPPLER_ANNOT_TRAP_NET"
-              glib:nick="trap-net"/>
+              glib:nick="trap-net">
+      </member>
       <member name="watermark"
               value="24"
               c:identifier="POPPLER_ANNOT_WATERMARK"
-              glib:nick="watermark"/>
+              glib:nick="watermark">
+      </member>
       <member name="3d"
               value="25"
               c:identifier="POPPLER_ANNOT_3D"
-              glib:nick="3d"/>
+              glib:nick="3d">
+      </member>
     </enumeration>
     <class name="Attachment"
            c:symbol-prefix="attachment"
@@ -1122,16 +1437,20 @@ icons are currently supported:
            glib:type-name="PopplerAttachment"
            glib:get-type="poppler_attachment_get_type">
       <method name="save" c:identifier="poppler_attachment_save" throws="1">
-        <doc xml:whitespace="preserve">Saves @attachment to a file indicated by @filename.  If @error is set, %FALSE
+        <doc xml:space="preserve">Saves @attachment to a file indicated by @filename.  If @error is set, %FALSE
 will be returned. Possible errors include those in the #G_FILE_ERROR domain
 and whatever the save function generates.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if the file successfully saved</doc>
+          <doc xml:space="preserve">%TRUE, if the file successfully saved</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="attachment" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerAttachment.</doc>
+            <type name="Attachment" c:type="PopplerAttachment*"/>
+          </instance-parameter>
           <parameter name="filename" transfer-ownership="none">
-            <doc xml:whitespace="preserve">name of file to save</doc>
+            <doc xml:space="preserve">name of file to save</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -1139,26 +1458,30 @@ and whatever the save function generates.</doc>
       <method name="save_to_callback"
               c:identifier="poppler_attachment_save_to_callback"
               throws="1">
-        <doc xml:whitespace="preserve">Saves @attachment by feeding the produced data to @save_func. Can be used
+        <doc xml:space="preserve">Saves @attachment by feeding the produced data to @save_func. Can be used
 when you want to store the attachment to something other than a file, such as
 an in-memory buffer or a socket. If @error is set, %FALSE will be
 returned. Possible errors include those in the #G_FILE_ERROR domain and
 whatever the save function generates.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if the save successfully completed</doc>
+          <doc xml:space="preserve">%TRUE, if the save successfully completed</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="attachment" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerAttachment.</doc>
+            <type name="Attachment" c:type="PopplerAttachment*"/>
+          </instance-parameter>
           <parameter name="save_func"
                      transfer-ownership="none"
                      scope="call"
                      closure="1">
-            <doc xml:whitespace="preserve">a function that is called to save each block of data that the save routine generates.</doc>
+            <doc xml:space="preserve">a function that is called to save each block of data that the save routine generates.</doc>
             <type name="AttachmentSaveFunc"
                   c:type="PopplerAttachmentSaveFunc"/>
           </parameter>
           <parameter name="user_data" transfer-ownership="none">
-            <doc xml:whitespace="preserve">user data to pass to the save function.</doc>
+            <doc xml:space="preserve">user data to pass to the save function.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
         </parameters>
@@ -1188,29 +1511,29 @@ whatever the save function generates.</doc>
     <callback name="AttachmentSaveFunc"
               c:type="PopplerAttachmentSaveFunc"
               throws="1">
-      <doc xml:whitespace="preserve">Specifies the type of the function passed to
+      <doc xml:space="preserve">Specifies the type of the function passed to
 poppler_attachment_save_to_callback().  It is called once for each block of
 bytes that is "written" by poppler_attachment_save_to_callback().  If
 successful it should return %TRUE.  If an error occurs it should set
 @error and return %FALSE, in which case poppler_attachment_save_to_callback()
 will fail with the same error.</doc>
       <return-value transfer-ownership="none">
-        <doc xml:whitespace="preserve">%TRUE if successful, %FALSE (with @error set) if failed.</doc>
+        <doc xml:space="preserve">%TRUE if successful, %FALSE (with @error set) if failed.</doc>
         <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="buf" transfer-ownership="none">
-          <doc xml:whitespace="preserve">buffer containing bytes to be written.</doc>
+          <doc xml:space="preserve">buffer containing bytes to be written.</doc>
           <array length="1" zero-terminated="0" c:type="gchar*">
             <type name="guint8"/>
           </array>
         </parameter>
         <parameter name="count" transfer-ownership="none">
-          <doc xml:whitespace="preserve">number of bytes in @buf.</doc>
+          <doc xml:space="preserve">number of bytes in @buf.</doc>
           <type name="gsize" c:type="gsize"/>
         </parameter>
         <parameter name="data" transfer-ownership="none" closure="2">
-          <doc xml:whitespace="preserve">user data passed to poppler_attachment_save_to_callback()</doc>
+          <doc xml:space="preserve">user data passed to poppler_attachment_save_to_callback()</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
@@ -1222,22 +1545,25 @@ will fail with the same error.</doc>
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_BACKEND_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+      </member>
       <member name="splash"
               value="1"
               c:identifier="POPPLER_BACKEND_SPLASH"
-              glib:nick="splash"/>
+              glib:nick="splash">
+      </member>
       <member name="cairo"
               value="2"
               c:identifier="POPPLER_BACKEND_CAIRO"
-              glib:nick="cairo"/>
+              glib:nick="cairo">
+      </member>
     </enumeration>
     <record name="Color"
             c:type="PopplerColor"
             glib:type-name="PopplerColor"
             glib:get-type="poppler_color_get_type"
             c:symbol-prefix="color">
-      <doc xml:whitespace="preserve">A #PopplerColor describes a RGB color. Color components
+      <doc xml:space="preserve">A #PopplerColor describes a RGB color. Color components
 are values between 0 and 65535</doc>
       <field name="red" writable="1">
         <type name="guint16" c:type="guint16"/>
@@ -1249,24 +1575,36 @@ are values between 0 and 65535</doc>
         <type name="guint16" c:type="guint16"/>
       </field>
       <constructor name="new" c:identifier="poppler_color_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerColor</doc>
+        <doc xml:space="preserve">Creates a new #PopplerColor</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerColor, use poppler_color_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerColor, use poppler_color_free() to free it</doc>
           <type name="Color" c:type="PopplerColor*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_color_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @color</doc>
+        <doc xml:space="preserve">Creates a copy of @color</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @color</doc>
+          <doc xml:space="preserve">a new allocated copy of @color</doc>
           <type name="Color" c:type="PopplerColor*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="color" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerColor to copy</doc>
+            <type name="Color" c:type="PopplerColor*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_color_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerColor</doc>
+        <doc xml:space="preserve">Frees the given #PopplerColor</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="color" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerColor</doc>
+            <type name="Color" c:type="PopplerColor*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <record name="Dest"
@@ -1274,7 +1612,7 @@ are values between 0 and 65535</doc>
             glib:type-name="PopplerDest"
             glib:get-type="poppler_dest_get_type"
             c:symbol-prefix="dest">
-      <doc xml:whitespace="preserve">Data structure for holding a destination</doc>
+      <doc xml:space="preserve">Data structure for holding a destination</doc>
       <field name="type" writable="1">
         <type name="DestType" c:type="PopplerDestType"/>
       </field>
@@ -1309,64 +1647,96 @@ are values between 0 and 65535</doc>
         <type name="guint" c:type="guint"/>
       </field>
       <method name="copy" c:identifier="poppler_dest_copy">
-        <doc xml:whitespace="preserve">Copies @dest, creating an identical #PopplerDest.</doc>
+        <doc xml:space="preserve">Copies @dest, creating an identical #PopplerDest.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new destination identical to @dest</doc>
+          <doc xml:space="preserve">a new destination identical to @dest</doc>
           <type name="Dest" c:type="PopplerDest*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="dest" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerDest</doc>
+            <type name="Dest" c:type="PopplerDest*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_dest_free">
-        <doc xml:whitespace="preserve">Frees @dest</doc>
+        <doc xml:space="preserve">Frees @dest</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="dest" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerDest</doc>
+            <type name="Dest" c:type="PopplerDest*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <enumeration name="DestType"
                  glib:type-name="PopplerDestType"
                  glib:get-type="poppler_dest_type_get_type"
                  c:type="PopplerDestType">
-      <doc xml:whitespace="preserve">Destination types</doc>
+      <doc xml:space="preserve">Destination types</doc>
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_DEST_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+        <doc xml:space="preserve">unknown destination</doc>
+      </member>
       <member name="xyz"
               value="1"
               c:identifier="POPPLER_DEST_XYZ"
-              glib:nick="xyz"/>
+              glib:nick="xyz">
+        <doc xml:space="preserve">go to page with coordinates (left, top) positioned at the upper-left corner of the window and the contents of the page magnified by the factor zoom</doc>
+      </member>
       <member name="fit"
               value="2"
               c:identifier="POPPLER_DEST_FIT"
-              glib:nick="fit"/>
+              glib:nick="fit">
+        <doc xml:space="preserve">go to page with its contents magnified just enough to fit the entire page within the window both horizontally and vertically</doc>
+      </member>
       <member name="fith"
               value="3"
               c:identifier="POPPLER_DEST_FITH"
-              glib:nick="fith"/>
+              glib:nick="fith">
+        <doc xml:space="preserve">go to page with the vertical coordinate top positioned at the top edge of the window and the contents of the page magnified just enough to fit the entire width of the page within the window</doc>
+      </member>
       <member name="fitv"
               value="4"
               c:identifier="POPPLER_DEST_FITV"
-              glib:nick="fitv"/>
+              glib:nick="fitv">
+        <doc xml:space="preserve">go to page with the horizontal coordinate left positioned at the left edge of the window and the contents of the page magnified just enough to fit the entire height of the page within the window</doc>
+      </member>
       <member name="fitr"
               value="5"
               c:identifier="POPPLER_DEST_FITR"
-              glib:nick="fitr"/>
+              glib:nick="fitr">
+        <doc xml:space="preserve">go to page with its contents magnified just enough to fit the rectangle specified by the coordinates left, bottom, right, and top entirely within the window both horizontally and vertically</doc>
+      </member>
       <member name="fitb"
               value="6"
               c:identifier="POPPLER_DEST_FITB"
-              glib:nick="fitb"/>
+              glib:nick="fitb">
+        <doc xml:space="preserve">go to page with its contents magnified just enough to fit its bounding box entirely within the window both horizontally and vertically</doc>
+      </member>
       <member name="fitbh"
               value="7"
               c:identifier="POPPLER_DEST_FITBH"
-              glib:nick="fitbh"/>
+              glib:nick="fitbh">
+        <doc xml:space="preserve">go to page with the vertical coordinate top positioned at the top edge of the window and the contents of the page magnified just enough to fit the entire width of its bounding box within the window</doc>
+      </member>
       <member name="fitbv"
               value="8"
               c:identifier="POPPLER_DEST_FITBV"
-              glib:nick="fitbv"/>
+              glib:nick="fitbv">
+        <doc xml:space="preserve">go to page with the horizontal coordinate left positioned at the left edge of the window and the contents of the page magnified just enough to fit the entire height of its bounding box within the window</doc>
+      </member>
       <member name="named"
               value="9"
               c:identifier="POPPLER_DEST_NAMED"
-              glib:nick="named"/>
+              glib:nick="named">
+        <doc xml:space="preserve">got to page specified by a name. See poppler_document_find_dest()</doc>
+      </member>
     </enumeration>
     <class name="Document"
            c:symbol-prefix="document"
@@ -1377,24 +1747,24 @@ are values between 0 and 65535</doc>
       <constructor name="new_from_data"
                    c:identifier="poppler_document_new_from_data"
                    throws="1">
-        <doc xml:whitespace="preserve">Creates a new #PopplerDocument.  If %NULL is returned, then @error will be
+        <doc xml:space="preserve">Creates a new #PopplerDocument.  If %NULL is returned, then @error will be
 set. Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR
 domains.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A newly created #PopplerDocument, or %NULL</doc>
+          <doc xml:space="preserve">A newly created #PopplerDocument, or %NULL</doc>
           <type name="Document" c:type="PopplerDocument*"/>
         </return-value>
         <parameters>
           <parameter name="data" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the pdf data contained in a char array</doc>
+            <doc xml:space="preserve">the pdf data contained in a char array</doc>
             <type name="utf8" c:type="char*"/>
           </parameter>
           <parameter name="length" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the length of #data</doc>
+            <doc xml:space="preserve">the length of #data</doc>
             <type name="gint" c:type="int"/>
           </parameter>
           <parameter name="password" transfer-ownership="none" allow-none="1">
-            <doc xml:whitespace="preserve">password to unlock the file with, or %NULL</doc>
+            <doc xml:space="preserve">password to unlock the file with, or %NULL</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -1402,20 +1772,20 @@ domains.</doc>
       <constructor name="new_from_file"
                    c:identifier="poppler_document_new_from_file"
                    throws="1">
-        <doc xml:whitespace="preserve">Creates a new #PopplerDocument.  If %NULL is returned, then @error will be
+        <doc xml:space="preserve">Creates a new #PopplerDocument.  If %NULL is returned, then @error will be
 set. Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR
 domains.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A newly created #PopplerDocument, or %NULL</doc>
+          <doc xml:space="preserve">A newly created #PopplerDocument, or %NULL</doc>
           <type name="Document" c:type="PopplerDocument*"/>
         </return-value>
         <parameters>
           <parameter name="uri" transfer-ownership="none">
-            <doc xml:whitespace="preserve">uri of the file to load</doc>
+            <doc xml:space="preserve">uri of the file to load</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
           <parameter name="password" transfer-ownership="none" allow-none="1">
-            <doc xml:whitespace="preserve">password to unlock the file with, or %NULL</doc>
+            <doc xml:space="preserve">password to unlock the file with, or %NULL</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -1424,26 +1794,26 @@ domains.</doc>
                    c:identifier="poppler_document_new_from_gfile"
                    version="0.22"
                    throws="1">
-        <doc xml:whitespace="preserve">Creates a new #PopplerDocument reading the PDF contents from @file.
+        <doc xml:space="preserve">Creates a new #PopplerDocument reading the PDF contents from @file.
 Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR
 domains.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerDocument, or %NULL</doc>
+          <doc xml:space="preserve">a new #PopplerDocument, or %NULL</doc>
           <type name="Document" c:type="PopplerDocument*"/>
         </return-value>
         <parameters>
           <parameter name="file" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #GFile to load</doc>
+            <doc xml:space="preserve">a #GFile to load</doc>
             <type name="Gio.File" c:type="GFile*"/>
           </parameter>
           <parameter name="password" transfer-ownership="none" allow-none="1">
-            <doc xml:whitespace="preserve">password to unlock the file with, or %NULL</doc>
+            <doc xml:space="preserve">password to unlock the file with, or %NULL</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
           <parameter name="cancellable"
                      transfer-ownership="none"
                      allow-none="1">
-            <doc xml:whitespace="preserve">a #GCancellable, or %NULL</doc>
+            <doc xml:space="preserve">a #GCancellable, or %NULL</doc>
             <type name="Gio.Cancellable" c:type="GCancellable*"/>
           </parameter>
         </parameters>
@@ -1452,101 +1822,133 @@ domains.</doc>
                    c:identifier="poppler_document_new_from_stream"
                    version="0.22"
                    throws="1">
-        <doc xml:whitespace="preserve">Creates a new #PopplerDocument reading the PDF contents from @stream.
+        <doc xml:space="preserve">Creates a new #PopplerDocument reading the PDF contents from @stream.
 Note that the given #GInputStream must be seekable or %G_IO_ERROR_NOT_SUPPORTED
 will be returned.
 Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR
 domains.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerDocument, or %NULL</doc>
+          <doc xml:space="preserve">a new #PopplerDocument, or %NULL</doc>
           <type name="Document" c:type="PopplerDocument*"/>
         </return-value>
         <parameters>
           <parameter name="stream" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #GInputStream to read from</doc>
+            <doc xml:space="preserve">a #GInputStream to read from</doc>
             <type name="Gio.InputStream" c:type="GInputStream*"/>
           </parameter>
           <parameter name="length" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the stream length, or -1 if not known</doc>
+            <doc xml:space="preserve">the stream length, or -1 if not known</doc>
             <type name="gint64" c:type="goffset"/>
           </parameter>
           <parameter name="password" transfer-ownership="none" allow-none="1">
-            <doc xml:whitespace="preserve">password to unlock the file with, or %NULL</doc>
+            <doc xml:space="preserve">password to unlock the file with, or %NULL</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
           <parameter name="cancellable"
                      transfer-ownership="none"
                      allow-none="1">
-            <doc xml:whitespace="preserve">a #GCancellable, or %NULL</doc>
+            <doc xml:space="preserve">a #GCancellable, or %NULL</doc>
             <type name="Gio.Cancellable" c:type="GCancellable*"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="find_dest" c:identifier="poppler_document_find_dest">
-        <doc xml:whitespace="preserve">Finds named destination @link_name in @document</doc>
+        <doc xml:space="preserve">Finds named destination @link_name in @document</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">The #PopplerDest destination or %NULL if @link_name is not a destination. Returned value must be freed with #poppler_dest_free</doc>
+          <doc xml:space="preserve">The #PopplerDest destination or %NULL if @link_name is not a destination. Returned value must be freed with #poppler_dest_free</doc>
           <type name="Dest" c:type="PopplerDest*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="link_name" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a named destination</doc>
+            <doc xml:space="preserve">a named destination</doc>
             <type name="utf8" c:type="const gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_attachments"
               c:identifier="poppler_document_get_attachments">
-        <doc xml:whitespace="preserve">Returns a #GList containing #PopplerAttachment&lt;!-- --&gt;s.  These attachments
+        <doc xml:space="preserve">Returns a #GList containing #PopplerAttachment&lt;!-- --&gt;s.  These attachments
 are unowned, and must be unreffed, and the list must be freed with
 g_list_free().</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a list of available attachments.</doc>
+          <doc xml:space="preserve">a list of available attachments.</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="Attachment"/>
           </type>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_author"
               c:identifier="poppler_document_get_author"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the author of the document</doc>
+        <doc xml:space="preserve">Returns the author of the document</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the author of @document, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing the author of @document, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_creation_date"
               c:identifier="poppler_document_get_creation_date"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the date the document was created as seconds since the Epoch</doc>
+        <doc xml:space="preserve">Returns the date the document was created as seconds since the Epoch</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the date the document was created, or -1</doc>
+          <doc xml:space="preserve">the date the document was created, or -1</doc>
           <type name="glong" c:type="time_t"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_creator"
               c:identifier="poppler_document_get_creator"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the creator of the document. If the document was converted
+        <doc xml:space="preserve">Returns the creator of the document. If the document was converted
 from another format, the creator is the name of the product
 that created the original document from which it was converted.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the creator of @document, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing the creator of @document, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_form_field"
               c:identifier="poppler_document_get_form_field">
-        <doc xml:whitespace="preserve">Returns the #PopplerFormField for the given @id. It must be freed with
+        <doc xml:space="preserve">Returns the #PopplerFormField for the given @id. It must be freed with
 g_object_unref()</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerFormField or %NULL if not found</doc>
+          <doc xml:space="preserve">a new #PopplerFormField or %NULL if not found</doc>
           <type name="FormField" c:type="PopplerFormField*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="id" transfer-ownership="none">
-            <doc xml:whitespace="preserve">an id of a #PopplerFormField</doc>
+            <doc xml:space="preserve">an id of a #PopplerFormField</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
@@ -1554,7 +1956,7 @@ g_object_unref()</doc>
       <method name="get_id"
               c:identifier="poppler_document_get_id"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the PDF file identifier represented as two byte string arrays of size 32.
+        <doc xml:space="preserve">Returns the PDF file identifier represented as two byte string arrays of size 32.
 @permanent_id is the permanent identifier that is built based on the file
 contents at the time it was originally created, so that this identifer
 never changes. @update_id is the update identifier that is built based on
@@ -1563,16 +1965,20 @@ the file contents at the time it was last updated.
 Note that returned strings are not null-terminated, they have a fixed
 size of 32 bytes.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if the @document contains an id, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if the @document contains an id, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="permanent_id"
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="full"
                      allow-none="1">
-            <doc xml:whitespace="preserve">location to store an allocated string, use g_free() to free the returned string</doc>
+            <doc xml:space="preserve">location to store an allocated string, use g_free() to free the returned string</doc>
             <type name="utf8" c:type="gchar**"/>
           </parameter>
           <parameter name="update_id"
@@ -1580,7 +1986,7 @@ size of 32 bytes.</doc>
                      caller-allocates="0"
                      transfer-ownership="full"
                      allow-none="1">
-            <doc xml:whitespace="preserve">location to store an allocated string, use g_free() to free the returned string</doc>
+            <doc xml:space="preserve">location to store an allocated string, use g_free() to free the returned string</doc>
             <type name="utf8" c:type="gchar**"/>
           </parameter>
         </parameters>
@@ -1588,75 +1994,113 @@ size of 32 bytes.</doc>
       <method name="get_keywords"
               c:identifier="poppler_document_get_keywords"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the keywords associated to the document</doc>
+        <doc xml:space="preserve">Returns the keywords associated to the document</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing keywords associated to @document, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing keywords associated to @document, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_metadata"
               c:identifier="poppler_document_get_metadata"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the XML metadata string of the document</doc>
+        <doc xml:space="preserve">Returns the XML metadata string of the document</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the XML metadata, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing the XML metadata, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_modification_date"
               c:identifier="poppler_document_get_modification_date"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the date the document was most recently modified as seconds since the Epoch</doc>
+        <doc xml:space="preserve">Returns the date the document was most recently modified as seconds since the Epoch</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the date the document was most recently modified, or -1</doc>
+          <doc xml:space="preserve">the date the document was most recently modified, or -1</doc>
           <type name="glong" c:type="time_t"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_n_attachments"
               c:identifier="poppler_document_get_n_attachments"
               version="0.18">
-        <doc xml:whitespace="preserve">Returns the number of attachments in a loaded document.
+        <doc xml:space="preserve">Returns the number of attachments in a loaded document.
 See also poppler_document_get_attachments()</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">Number of attachments</doc>
+          <doc xml:space="preserve">Number of attachments</doc>
           <type name="guint" c:type="guint"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_n_pages" c:identifier="poppler_document_get_n_pages">
-        <doc xml:whitespace="preserve">Returns the number of pages in a loaded document.</doc>
+        <doc xml:space="preserve">Returns the number of pages in a loaded document.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">Number of pages</doc>
+          <doc xml:space="preserve">Number of pages</doc>
           <type name="gint" c:type="int"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_page" c:identifier="poppler_document_get_page">
-        <doc xml:whitespace="preserve">Returns the #PopplerPage indexed at @index.  This object is owned by the
+        <doc xml:space="preserve">Returns the #PopplerPage indexed at @index.  This object is owned by the
 caller.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">The #PopplerPage at @index</doc>
+          <doc xml:space="preserve">The #PopplerPage at @index</doc>
           <type name="Page" c:type="PopplerPage*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="index" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a page index</doc>
+            <doc xml:space="preserve">a page index</doc>
             <type name="gint" c:type="int"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_page_by_label"
               c:identifier="poppler_document_get_page_by_label">
-        <doc xml:whitespace="preserve">Returns the #PopplerPage reference by @label.  This object is owned by the
+        <doc xml:space="preserve">Returns the #PopplerPage reference by @label.  This object is owned by the
 caller.  @label is a human-readable string representation of the page number,
 and can be document specific.  Typically, it is a value such as "iii" or "3".
 
 By default, "1" refers to the first page.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">The #PopplerPage referenced by @label</doc>
+          <doc xml:space="preserve">The #PopplerPage referenced by @label</doc>
           <type name="Page" c:type="PopplerPage*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="label" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a page label</doc>
+            <doc xml:space="preserve">a page label</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -1664,36 +2108,52 @@ By default, "1" refers to the first page.</doc>
       <method name="get_page_layout"
               c:identifier="poppler_document_get_page_layout"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the page layout that should be used when the document is opened</doc>
+        <doc xml:space="preserve">Returns the page layout that should be used when the document is opened</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">a #PopplerPageLayout that should be used when the document is opened</doc>
+          <doc xml:space="preserve">a #PopplerPageLayout that should be used when the document is opened</doc>
           <type name="PageLayout" c:type="PopplerPageLayout"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_page_mode"
               c:identifier="poppler_document_get_page_mode"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns a #PopplerPageMode representing how the document should
+        <doc xml:space="preserve">Returns a #PopplerPageMode representing how the document should
 be initially displayed when opened.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">a #PopplerPageMode that should be used when document is opened</doc>
+          <doc xml:space="preserve">a #PopplerPageMode that should be used when document is opened</doc>
           <type name="PageMode" c:type="PopplerPageMode"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_pdf_version"
               c:identifier="poppler_document_get_pdf_version"
               version="0.16">
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the major and minor PDF version numbers</doc>
+          <doc xml:space="preserve">the major and minor PDF version numbers</doc>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="major_version"
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="full"
                      allow-none="1">
-            <doc xml:whitespace="preserve">return location for the PDF major version number</doc>
+            <doc xml:space="preserve">return location for the PDF major version number</doc>
             <type name="guint" c:type="guint*"/>
           </parameter>
           <parameter name="minor_version"
@@ -1701,7 +2161,7 @@ be initially displayed when opened.</doc>
                      caller-allocates="0"
                      transfer-ownership="full"
                      allow-none="1">
-            <doc xml:whitespace="preserve">return location for the PDF minor version number</doc>
+            <doc xml:space="preserve">return location for the PDF minor version number</doc>
             <type name="guint" c:type="guint*"/>
           </parameter>
         </parameters>
@@ -1709,81 +2169,127 @@ be initially displayed when opened.</doc>
       <method name="get_pdf_version_string"
               c:identifier="poppler_document_get_pdf_version_string"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the PDF version of @document as a string (e.g. PDF-1.6)</doc>
+        <doc xml:space="preserve">Returns the PDF version of @document as a string (e.g. PDF-1.6)</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the PDF version of @document, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing the PDF version of @document, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_permissions"
               c:identifier="poppler_document_get_permissions"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the flags specifying which operations are permitted when the document is opened.</doc>
+        <doc xml:space="preserve">Returns the flags specifying which operations are permitted when the document is opened.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">a set of falgs from  #PopplerPermissions enumeration</doc>
+          <doc xml:space="preserve">a set of falgs from  #PopplerPermissions enumeration</doc>
           <type name="Permissions" c:type="PopplerPermissions"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_producer"
               c:identifier="poppler_document_get_producer"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the producer of the document. If the document was converted
+        <doc xml:space="preserve">Returns the producer of the document. If the document was converted
 from another format, the producer is the name of the product
 that converted it to PDF</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the producer of @document, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing the producer of @document, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_subject"
               c:identifier="poppler_document_get_subject"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the subject of the document</doc>
+        <doc xml:space="preserve">Returns the subject of the document</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the subject of @document, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing the subject of @document, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_title"
               c:identifier="poppler_document_get_title"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the document's title</doc>
+        <doc xml:space="preserve">Returns the document's title</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the title of @document, or %NULL</doc>
+          <doc xml:space="preserve">a new allocated string containing the title of @document, or %NULL</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="has_attachments"
               c:identifier="poppler_document_has_attachments">
-        <doc xml:whitespace="preserve">Returns %TRUE of @document has any attachments.</doc>
+        <doc xml:space="preserve">Returns %TRUE of @document has any attachments.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if @document has attachments.</doc>
+          <doc xml:space="preserve">%TRUE, if @document has attachments.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_linearized"
               c:identifier="poppler_document_is_linearized"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns whether @document is linearized or not. Linearization of PDF
+        <doc xml:space="preserve">Returns whether @document is linearized or not. Linearization of PDF
 enables efficient incremental access of the PDF file in a network environment.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if @document is linearized, %FALSE otherwhise</doc>
+          <doc xml:space="preserve">%TRUE if @document is linearized, %FALSE otherwhise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="save" c:identifier="poppler_document_save" throws="1">
-        <doc xml:whitespace="preserve">Saves @document. Any change made in the document such as
+        <doc xml:space="preserve">Saves @document. Any change made in the document such as
 form fields filled, annotations added or modified
 will be saved.
 If @error is set, %FALSE will be returned. Possible errors
 include those in the #G_FILE_ERROR domain.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if the document was successfully saved</doc>
+          <doc xml:space="preserve">%TRUE, if the document was successfully saved</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="uri" transfer-ownership="none">
-            <doc xml:whitespace="preserve">uri of file to save</doc>
+            <doc xml:space="preserve">uri of file to save</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -1791,85 +2297,89 @@ include those in the #G_FILE_ERROR domain.</doc>
       <method name="save_a_copy"
               c:identifier="poppler_document_save_a_copy"
               throws="1">
-        <doc xml:whitespace="preserve">Saves a copy of the original @document.
+        <doc xml:space="preserve">Saves a copy of the original @document.
 Any change made in the document such as 
 form fields filled by the user will not be saved. 
 If @error is set, %FALSE will be returned. Possible errors
 include those in the #G_FILE_ERROR domain.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if the document was successfully saved</doc>
+          <doc xml:space="preserve">%TRUE, if the document was successfully saved</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="document" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerDocument</doc>
+            <type name="Document" c:type="PopplerDocument*"/>
+          </instance-parameter>
           <parameter name="uri" transfer-ownership="none">
-            <doc xml:whitespace="preserve">uri of file to save</doc>
+            <doc xml:space="preserve">uri of file to save</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
       </method>
       <property name="author" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The author of the document</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The author of the document</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="creation-date" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The date the document was created as seconds since the Epoch, or -1</doc>
-        <type name="gint"/>
+        <doc xml:space="preserve">The date the document was created as seconds since the Epoch, or -1</doc>
+        <type name="gint" c:type="gint"/>
       </property>
       <property name="creator" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The creator of the document. See also poppler_document_get_creator()</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The creator of the document. See also poppler_document_get_creator()</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="format" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The PDF version as string. See also poppler_document_get_pdf_version_string()</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The PDF version as string. See also poppler_document_get_pdf_version_string()</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="format-major" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The PDF major version number. See also poppler_document_get_pdf_version()</doc>
-        <type name="guint"/>
+        <doc xml:space="preserve">The PDF major version number. See also poppler_document_get_pdf_version()</doc>
+        <type name="guint" c:type="guint"/>
       </property>
       <property name="format-minor" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The PDF minor version number. See also poppler_document_get_pdf_version()</doc>
-        <type name="guint"/>
+        <doc xml:space="preserve">The PDF minor version number. See also poppler_document_get_pdf_version()</doc>
+        <type name="guint" c:type="guint"/>
       </property>
       <property name="keywords" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The keywords associated to the document</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The keywords associated to the document</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="linearized" transfer-ownership="none">
-        <doc xml:whitespace="preserve">Whether document is linearized. See also poppler_document_is_linearized()</doc>
-        <type name="gboolean"/>
+        <doc xml:space="preserve">Whether document is linearized. See also poppler_document_is_linearized()</doc>
+        <type name="gboolean" c:type="gboolean"/>
       </property>
       <property name="metadata" transfer-ownership="none">
-        <doc xml:whitespace="preserve">Document metadata in XML format, or %NULL</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">Document metadata in XML format, or %NULL</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="mod-date" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The date the document was most recently modified as seconds since the Epoch, or -1</doc>
-        <type name="gint"/>
+        <doc xml:space="preserve">The date the document was most recently modified as seconds since the Epoch, or -1</doc>
+        <type name="gint" c:type="gint"/>
       </property>
       <property name="page-layout" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The page layout that should be used when the document is opened</doc>
+        <doc xml:space="preserve">The page layout that should be used when the document is opened</doc>
         <type name="PageLayout"/>
       </property>
       <property name="page-mode" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The mode that should be used when the document is opened</doc>
+        <doc xml:space="preserve">The mode that should be used when the document is opened</doc>
         <type name="PageMode"/>
       </property>
       <property name="permissions" transfer-ownership="none">
-        <doc xml:whitespace="preserve">Flags specifying which operations are permitted when the document is opened</doc>
+        <doc xml:space="preserve">Flags specifying which operations are permitted when the document is opened</doc>
         <type name="Permissions"/>
       </property>
       <property name="producer" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The producer of the document. See also poppler_document_get_producer()</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The producer of the document. See also poppler_document_get_producer()</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="subject" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The subject of the document</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The subject of the document</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="title" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The document's title or %NULL</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The document's title or %NULL</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
       <property name="viewer-preferences" transfer-ownership="none">
         <type name="ViewerPreferences"/>
@@ -1880,27 +2390,37 @@ include those in the #G_FILE_ERROR domain.</doc>
                  glib:get-type="poppler_error_get_type"
                  c:type="PopplerError"
                  glib:error-domain="poppler-quark">
-      <doc xml:whitespace="preserve">Error codes returned by #PopplerDocument</doc>
+      <doc xml:space="preserve">Error codes returned by #PopplerDocument</doc>
       <member name="invalid"
               value="0"
               c:identifier="POPPLER_ERROR_INVALID"
-              glib:nick="invalid"/>
+              glib:nick="invalid">
+        <doc xml:space="preserve">Generic error when a document opration fails</doc>
+      </member>
       <member name="encrypted"
               value="1"
               c:identifier="POPPLER_ERROR_ENCRYPTED"
-              glib:nick="encrypted"/>
+              glib:nick="encrypted">
+        <doc xml:space="preserve">Document is encrypted</doc>
+      </member>
       <member name="open_file"
               value="2"
               c:identifier="POPPLER_ERROR_OPEN_FILE"
-              glib:nick="open-file"/>
+              glib:nick="open-file">
+        <doc xml:space="preserve">File could not be opened for writing when saving document</doc>
+      </member>
       <member name="bad_catalog"
               value="3"
               c:identifier="POPPLER_ERROR_BAD_CATALOG"
-              glib:nick="bad-catalog"/>
+              glib:nick="bad-catalog">
+        <doc xml:space="preserve">Failed to read the document catalog</doc>
+      </member>
       <member name="damaged"
               value="4"
               c:identifier="POPPLER_ERROR_DAMAGED"
-              glib:nick="damaged"/>
+              glib:nick="damaged">
+        <doc xml:space="preserve">Document is damaged</doc>
+      </member>
       <function name="quark" c:identifier="poppler_error_quark">
         <return-value transfer-ownership="none">
           <type name="GLib.Quark" c:type="GQuark"/>
@@ -1912,23 +2432,30 @@ include those in the #G_FILE_ERROR domain.</doc>
               glib:type-name="PopplerFindFlags"
               glib:get-type="poppler_find_flags_get_type"
               c:type="PopplerFindFlags">
-      <doc xml:whitespace="preserve">Flags using while searching text in a page</doc>
+      <doc xml:space="preserve">Flags using while searching text in a page</doc>
       <member name="default"
               value="0"
               c:identifier="POPPLER_FIND_DEFAULT"
-              glib:nick="default"/>
+              glib:nick="default">
+      </member>
       <member name="case_sensitive"
               value="1"
               c:identifier="POPPLER_FIND_CASE_SENSITIVE"
-              glib:nick="case-sensitive"/>
+              glib:nick="case-sensitive">
+        <doc xml:space="preserve">do case sensitive search</doc>
+      </member>
       <member name="backwards"
               value="2"
               c:identifier="POPPLER_FIND_BACKWARDS"
-              glib:nick="backwards"/>
+              glib:nick="backwards">
+        <doc xml:space="preserve">search backwards</doc>
+      </member>
       <member name="whole_words_only"
               value="4"
               c:identifier="POPPLER_FIND_WHOLE_WORDS_ONLY"
-              glib:nick="whole-words-only"/>
+              glib:nick="whole-words-only">
+        <doc xml:space="preserve">search only whole words</doc>
+      </member>
     </bitfield>
     <class name="FontInfo"
            c:symbol-prefix="font_info"
@@ -1937,14 +2464,14 @@ include those in the #G_FILE_ERROR domain.</doc>
            glib:type-name="PopplerFontInfo"
            glib:get-type="poppler_font_info_get_type">
       <constructor name="new" c:identifier="poppler_font_info_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerFontInfo object</doc>
+        <doc xml:space="preserve">Creates a new #PopplerFontInfo object</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerFontInfo instance</doc>
+          <doc xml:space="preserve">a new #PopplerFontInfo instance</doc>
           <type name="FontInfo" c:type="PopplerFontInfo*"/>
         </return-value>
         <parameters>
           <parameter name="document" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerDocument</doc>
+            <doc xml:space="preserve">a #PopplerDocument</doc>
             <type name="Document" c:type="PopplerDocument*"/>
           </parameter>
         </parameters>
@@ -1953,9 +2480,14 @@ include those in the #G_FILE_ERROR domain.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="font_info" transfer-ownership="none">
+            <type name="FontInfo" c:type="PopplerFontInfo*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="scan" c:identifier="poppler_font_info_scan">
-        <doc xml:whitespace="preserve">Scans the document associated with @font_info for fonts. At most
+        <doc xml:space="preserve">Scans the document associated with @font_info for fonts. At most
 @n_pages will be scanned starting from the current iterator. @iter will
 point to the first font scanned.
 
@@ -1974,19 +2506,23 @@ while (poppler_font_info_scan (font_info, 20, &amp;fonts_iter)) {
 }
 &lt;/programlisting&gt;&lt;/informalexample&gt;</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if there are more fonts left to scan</doc>
+          <doc xml:space="preserve">%TRUE, if there are more fonts left to scan</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="font_info" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontInfo</doc>
+            <type name="FontInfo" c:type="PopplerFontInfo*"/>
+          </instance-parameter>
           <parameter name="n_pages" transfer-ownership="none">
-            <doc xml:whitespace="preserve">number of pages to scan</doc>
+            <doc xml:space="preserve">number of pages to scan</doc>
             <type name="gint" c:type="int"/>
           </parameter>
           <parameter name="iter"
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="full">
-            <doc xml:whitespace="preserve">return location for a #PopplerFontsIter</doc>
+            <doc xml:space="preserve">return location for a #PopplerFontsIter</doc>
             <type name="FontsIter" c:type="PopplerFontsIter**"/>
           </parameter>
         </parameters>
@@ -1996,55 +2532,79 @@ while (poppler_font_info_scan (font_info, 20, &amp;fonts_iter)) {
                  glib:type-name="PopplerFontType"
                  glib:get-type="poppler_font_type_get_type"
                  c:type="PopplerFontType">
-      <doc xml:whitespace="preserve">Font types</doc>
+      <doc xml:space="preserve">Font types</doc>
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_FONT_TYPE_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+        <doc xml:space="preserve">unknown font type</doc>
+      </member>
       <member name="type1"
               value="1"
               c:identifier="POPPLER_FONT_TYPE_TYPE1"
-              glib:nick="type1"/>
+              glib:nick="type1">
+        <doc xml:space="preserve">Type 1 font type</doc>
+      </member>
       <member name="type1c"
               value="2"
               c:identifier="POPPLER_FONT_TYPE_TYPE1C"
-              glib:nick="type1c"/>
+              glib:nick="type1c">
+        <doc xml:space="preserve">Type 1 font type embedded in Compact Font Format (CFF) font program</doc>
+      </member>
       <member name="type1cot"
               value="3"
               c:identifier="POPPLER_FONT_TYPE_TYPE1COT"
-              glib:nick="type1cot"/>
+              glib:nick="type1cot">
+        <doc xml:space="preserve">Type 1 font type embedded in OpenType font program</doc>
+      </member>
       <member name="type3"
               value="4"
               c:identifier="POPPLER_FONT_TYPE_TYPE3"
-              glib:nick="type3"/>
+              glib:nick="type3">
+        <doc xml:space="preserve">A font type that is defined with PDF graphics operators</doc>
+      </member>
       <member name="truetype"
               value="5"
               c:identifier="POPPLER_FONT_TYPE_TRUETYPE"
-              glib:nick="truetype"/>
+              glib:nick="truetype">
+        <doc xml:space="preserve">TrueType font type</doc>
+      </member>
       <member name="truetypeot"
               value="6"
               c:identifier="POPPLER_FONT_TYPE_TRUETYPEOT"
-              glib:nick="truetypeot"/>
+              glib:nick="truetypeot">
+        <doc xml:space="preserve">TrueType font type embedded in OpenType font program</doc>
+      </member>
       <member name="cid_type0"
               value="7"
               c:identifier="POPPLER_FONT_TYPE_CID_TYPE0"
-              glib:nick="cid-type0"/>
+              glib:nick="cid-type0">
+        <doc xml:space="preserve">CIDFont type based on Type 1 font technology</doc>
+      </member>
       <member name="cid_type0c"
               value="8"
               c:identifier="POPPLER_FONT_TYPE_CID_TYPE0C"
-              glib:nick="cid-type0c"/>
+              glib:nick="cid-type0c">
+        <doc xml:space="preserve">CIDFont type based on Type 1 font technology embedded in CFF font program</doc>
+      </member>
       <member name="cid_type0cot"
               value="9"
               c:identifier="POPPLER_FONT_TYPE_CID_TYPE0COT"
-              glib:nick="cid-type0cot"/>
+              glib:nick="cid-type0cot">
+        <doc xml:space="preserve">CIDFont type based on Type 1 font technology embedded in OpenType font program</doc>
+      </member>
       <member name="cid_type2"
               value="10"
               c:identifier="POPPLER_FONT_TYPE_CID_TYPE2"
-              glib:nick="cid-type2"/>
+              glib:nick="cid-type2">
+        <doc xml:space="preserve">CIDFont type based on TrueType font technology</doc>
+      </member>
       <member name="cid_type2ot"
               value="11"
               c:identifier="POPPLER_FONT_TYPE_CID_TYPE2OT"
-              glib:nick="cid-type2ot"/>
+              glib:nick="cid-type2ot">
+        <doc xml:space="preserve">CIDFont type based on TrueType font technology embedded in OpenType font program</doc>
+      </member>
     </enumeration>
     <record name="FontsIter"
             c:type="PopplerFontsIter"
@@ -2052,89 +2612,155 @@ while (poppler_font_info_scan (font_info, 20, &amp;fonts_iter)) {
             glib:get-type="poppler_fonts_iter_get_type"
             c:symbol-prefix="fonts_iter">
       <method name="copy" c:identifier="poppler_fonts_iter_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @iter</doc>
+        <doc xml:space="preserve">Creates a copy of @iter</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @iter</doc>
+          <doc xml:space="preserve">a new allocated copy of @iter</doc>
           <type name="FontsIter" c:type="PopplerFontsIter*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter to copy</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_fonts_iter_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerFontsIter</doc>
+        <doc xml:space="preserve">Frees the given #PopplerFontsIter</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_encoding"
               c:identifier="poppler_fonts_iter_get_encoding"
               version="0.20">
-        <doc xml:whitespace="preserve">Returns the encoding of the font associated with @iter</doc>
+        <doc xml:space="preserve">Returns the encoding of the font associated with @iter</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the font encoding</doc>
+          <doc xml:space="preserve">the font encoding</doc>
           <type name="utf8" c:type="const char*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_file_name"
               c:identifier="poppler_fonts_iter_get_file_name">
-        <doc xml:whitespace="preserve">The filename of the font associated with @iter or %NULL if
+        <doc xml:space="preserve">The filename of the font associated with @iter or %NULL if
 the font is embedded</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the filename of the font or %NULL if font is embedded</doc>
+          <doc xml:space="preserve">the filename of the font or %NULL if font is embedded</doc>
           <type name="utf8" c:type="const char*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_font_type"
               c:identifier="poppler_fonts_iter_get_font_type">
-        <doc xml:whitespace="preserve">Returns the type of the font associated with @iter</doc>
+        <doc xml:space="preserve">Returns the type of the font associated with @iter</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the font type</doc>
+          <doc xml:space="preserve">the font type</doc>
           <type name="FontType" c:type="PopplerFontType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_full_name"
               c:identifier="poppler_fonts_iter_get_full_name">
-        <doc xml:whitespace="preserve">Returns the full name of the font associated with @iter</doc>
+        <doc xml:space="preserve">Returns the full name of the font associated with @iter</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the font full name</doc>
+          <doc xml:space="preserve">the font full name</doc>
           <type name="utf8" c:type="const char*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_name" c:identifier="poppler_fonts_iter_get_name">
-        <doc xml:whitespace="preserve">Returns the name of the font associated with @iter</doc>
+        <doc xml:space="preserve">Returns the name of the font associated with @iter</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the font name</doc>
+          <doc xml:space="preserve">the font name</doc>
           <type name="utf8" c:type="const char*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_substitute_name"
               c:identifier="poppler_fonts_iter_get_substitute_name"
               version="0.20">
-        <doc xml:whitespace="preserve">The name of the substitute font of the font associated with @iter or %NULL if
+        <doc xml:space="preserve">The name of the substitute font of the font associated with @iter or %NULL if
 the font is embedded</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the name of the substitute font or %NULL if font is embedded</doc>
+          <doc xml:space="preserve">the name of the substitute font or %NULL if font is embedded</doc>
           <type name="utf8" c:type="const char*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_embedded" c:identifier="poppler_fonts_iter_is_embedded">
-        <doc xml:whitespace="preserve">Returns whether the font associated with @iter is embedded in the document</doc>
+        <doc xml:space="preserve">Returns whether the font associated with @iter is embedded in the document</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if font is emebdded, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if font is emebdded, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_subset" c:identifier="poppler_fonts_iter_is_subset">
-        <doc xml:whitespace="preserve">Returns whether the font associated with @iter is a subset of another font</doc>
+        <doc xml:space="preserve">Returns whether the font associated with @iter is a subset of another font</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if font is a subset, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if font is a subset, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="next" c:identifier="poppler_fonts_iter_next">
-        <doc xml:whitespace="preserve">Sets @iter to point to the next font</doc>
+        <doc xml:space="preserve">Sets @iter to point to the next font</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if @iter was set to the next font</doc>
+          <doc xml:space="preserve">%TRUE, if @iter was set to the next font</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFontsIter</doc>
+            <type name="FontsIter" c:type="PopplerFontsIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <enumeration name="FormButtonType"
@@ -2144,15 +2770,18 @@ the font is embedded</doc>
       <member name="push"
               value="0"
               c:identifier="POPPLER_FORM_BUTTON_PUSH"
-              glib:nick="push"/>
+              glib:nick="push">
+      </member>
       <member name="check"
               value="1"
               c:identifier="POPPLER_FORM_BUTTON_CHECK"
-              glib:nick="check"/>
+              glib:nick="check">
+      </member>
       <member name="radio"
               value="2"
               c:identifier="POPPLER_FORM_BUTTON_RADIO"
-              glib:nick="radio"/>
+              glib:nick="radio">
+      </member>
     </enumeration>
     <enumeration name="FormChoiceType"
                  glib:type-name="PopplerFormChoiceType"
@@ -2161,11 +2790,13 @@ the font is embedded</doc>
       <member name="combo"
               value="0"
               c:identifier="POPPLER_FORM_CHOICE_COMBO"
-              glib:nick="combo"/>
+              glib:nick="combo">
+      </member>
       <member name="list"
               value="1"
               c:identifier="POPPLER_FORM_CHOICE_LIST"
-              glib:nick="list"/>
+              glib:nick="list">
+      </member>
     </enumeration>
     <class name="FormField"
            c:symbol-prefix="form_field"
@@ -2175,296 +2806,472 @@ the font is embedded</doc>
            glib:get-type="poppler_form_field_get_type">
       <method name="button_get_button_type"
               c:identifier="poppler_form_field_button_get_button_type">
-        <doc xml:whitespace="preserve">Gets the button type of @field</doc>
+        <doc xml:space="preserve">Gets the button type of @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerFormButtonType of @field</doc>
+          <doc xml:space="preserve">#PopplerFormButtonType of @field</doc>
           <type name="FormButtonType" c:type="PopplerFormButtonType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="button_get_state"
               c:identifier="poppler_form_field_button_get_state">
-        <doc xml:whitespace="preserve">Queries a #PopplerFormField and returns its current state. Returns %TRUE if
+        <doc xml:space="preserve">Queries a #PopplerFormField and returns its current state. Returns %TRUE if
 @field is pressed in and %FALSE if it is raised.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">current state of @field</doc>
+          <doc xml:space="preserve">current state of @field</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="button_set_state"
               c:identifier="poppler_form_field_button_set_state">
-        <doc xml:whitespace="preserve">Sets the status of @field. Set to %TRUE if you want the #PopplerFormField
+        <doc xml:space="preserve">Sets the status of @field. Set to %TRUE if you want the #PopplerFormField
 to be 'pressed in', and %FALSE to raise it.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
           <parameter name="state" transfer-ownership="none">
-            <doc xml:whitespace="preserve">%TRUE or %FALSE</doc>
+            <doc xml:space="preserve">%TRUE or %FALSE</doc>
             <type name="gboolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="choice_can_select_multiple"
               c:identifier="poppler_form_field_choice_can_select_multiple">
-        <doc xml:whitespace="preserve">Checks whether @field allows multiple choices to be selected</doc>
+        <doc xml:space="preserve">Checks whether @field allows multiple choices to be selected</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if @field allows multiple choices to be selected</doc>
+          <doc xml:space="preserve">%TRUE if @field allows multiple choices to be selected</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="choice_commit_on_change"
               c:identifier="poppler_form_field_choice_commit_on_change">
         <return-value transfer-ownership="none">
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="choice_do_spell_check"
               c:identifier="poppler_form_field_choice_do_spell_check">
-        <doc xml:whitespace="preserve">Checks whether spell checking should be done for the contents of @field</doc>
+        <doc xml:space="preserve">Checks whether spell checking should be done for the contents of @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if spell checking should be done for @field</doc>
+          <doc xml:space="preserve">%TRUE if spell checking should be done for @field</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="choice_get_choice_type"
               c:identifier="poppler_form_field_choice_get_choice_type">
-        <doc xml:whitespace="preserve">Gets the choice type of @field</doc>
+        <doc xml:space="preserve">Gets the choice type of @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerFormChoiceType of @field</doc>
+          <doc xml:space="preserve">#PopplerFormChoiceType of @field</doc>
           <type name="FormChoiceType" c:type="PopplerFormChoiceType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="choice_get_item"
               c:identifier="poppler_form_field_choice_get_item">
-        <doc xml:whitespace="preserve">Returns the contents of the item on @field at the given index</doc>
+        <doc xml:space="preserve">Returns the contents of the item on @field at the given index</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
           <parameter name="index" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the index of the item</doc>
+            <doc xml:space="preserve">the index of the item</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="choice_get_n_items"
               c:identifier="poppler_form_field_choice_get_n_items">
-        <doc xml:whitespace="preserve">Returns the number of items on @field</doc>
+        <doc xml:space="preserve">Returns the number of items on @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the number of items on @field</doc>
+          <doc xml:space="preserve">the number of items on @field</doc>
           <type name="gint" c:type="gint"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="choice_get_text"
               c:identifier="poppler_form_field_choice_get_text">
-        <doc xml:whitespace="preserve">Retrieves the contents of @field.</doc>
+        <doc xml:space="preserve">Retrieves the contents of @field.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="choice_is_editable"
               c:identifier="poppler_form_field_choice_is_editable">
-        <doc xml:whitespace="preserve">Checks whether @field is editable</doc>
+        <doc xml:space="preserve">Checks whether @field is editable</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if @field is editable</doc>
+          <doc xml:space="preserve">%TRUE if @field is editable</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="choice_is_item_selected"
               c:identifier="poppler_form_field_choice_is_item_selected">
-        <doc xml:whitespace="preserve">Checks whether the item at the given index on @field is currently selected</doc>
+        <doc xml:space="preserve">Checks whether the item at the given index on @field is currently selected</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if item at @index is currently selected</doc>
+          <doc xml:space="preserve">%TRUE if item at @index is currently selected</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
           <parameter name="index" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the index of the item</doc>
+            <doc xml:space="preserve">the index of the item</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="choice_select_item"
               c:identifier="poppler_form_field_choice_select_item">
-        <doc xml:whitespace="preserve">Selects the item at the given index on @field</doc>
+        <doc xml:space="preserve">Selects the item at the given index on @field</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
           <parameter name="index" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the index of the item</doc>
+            <doc xml:space="preserve">the index of the item</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="choice_set_text"
               c:identifier="poppler_form_field_choice_set_text">
-        <doc xml:whitespace="preserve">Sets the text in @field to the given value, replacing the current contents</doc>
+        <doc xml:space="preserve">Sets the text in @field to the given value, replacing the current contents</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
           <parameter name="text" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the new text</doc>
+            <doc xml:space="preserve">the new text</doc>
             <type name="utf8" c:type="const gchar*"/>
           </parameter>
         </parameters>
       </method>
       <method name="choice_toggle_item"
               c:identifier="poppler_form_field_choice_toggle_item">
-        <doc xml:whitespace="preserve">Changes the state of the item at the given index</doc>
+        <doc xml:space="preserve">Changes the state of the item at the given index</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
           <parameter name="index" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the index of the item</doc>
+            <doc xml:space="preserve">the index of the item</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="choice_unselect_all"
               c:identifier="poppler_form_field_choice_unselect_all">
-        <doc xml:whitespace="preserve">Unselects all the items on @field</doc>
+        <doc xml:space="preserve">Unselects all the items on @field</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_action"
               c:identifier="poppler_form_field_get_action"
               version="0.18">
-        <doc xml:whitespace="preserve">Retrieves the action (#PopplerAction) that shall be
+        <doc xml:space="preserve">Retrieves the action (#PopplerAction) that shall be
 performed when @field is activated, or %NULL</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the action to perform. The returned object is owned by @field and should not be freed</doc>
+          <doc xml:space="preserve">the action to perform. The returned object is owned by @field and should not be freed</doc>
           <type name="Action" c:type="PopplerAction*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_field_type"
               c:identifier="poppler_form_field_get_field_type">
-        <doc xml:whitespace="preserve">Gets the type of @field</doc>
+        <doc xml:space="preserve">Gets the type of @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerFormFieldType of @field</doc>
+          <doc xml:space="preserve">#PopplerFormFieldType of @field</doc>
           <type name="FormFieldType" c:type="PopplerFormFieldType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_font_size"
               c:identifier="poppler_form_field_get_font_size">
-        <doc xml:whitespace="preserve">Gets the font size of @field</doc>
+        <doc xml:space="preserve">Gets the font size of @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the font size of @field</doc>
+          <doc xml:space="preserve">the font size of @field</doc>
           <type name="gdouble" c:type="gdouble"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_id" c:identifier="poppler_form_field_get_id">
-        <doc xml:whitespace="preserve">Gets the id of @field</doc>
+        <doc xml:space="preserve">Gets the id of @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the id of @field</doc>
+          <doc xml:space="preserve">the id of @field</doc>
           <type name="gint" c:type="gint"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_mapping_name"
               c:identifier="poppler_form_field_get_mapping_name"
               version="0.16">
-        <doc xml:whitespace="preserve">Gets the mapping name of @field that is used when
+        <doc xml:space="preserve">Gets the mapping name of @field that is used when
 exporting interactive form field data from the document</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_name"
               c:identifier="poppler_form_field_get_name"
               version="0.16">
-        <doc xml:whitespace="preserve">Gets the fully qualified name of @field. It's constructed by concatenating
+        <doc xml:space="preserve">Gets the fully qualified name of @field. It's constructed by concatenating
 the partial field names of the field and all of its ancestors.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_partial_name"
               c:identifier="poppler_form_field_get_partial_name"
               version="0.16">
-        <doc xml:whitespace="preserve">Gets the partial name of @field.</doc>
+        <doc xml:space="preserve">Gets the partial name of @field.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_read_only"
               c:identifier="poppler_form_field_is_read_only">
-        <doc xml:whitespace="preserve">Checks whether @field is read only</doc>
+        <doc xml:space="preserve">Checks whether @field is read only</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if @field is read only</doc>
+          <doc xml:space="preserve">%TRUE if @field is read only</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_do_scroll"
               c:identifier="poppler_form_field_text_do_scroll">
         <return-value transfer-ownership="none">
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_do_spell_check"
               c:identifier="poppler_form_field_text_do_spell_check">
-        <doc xml:whitespace="preserve">Checks whether spell checking should be done for the contents of @field</doc>
+        <doc xml:space="preserve">Checks whether spell checking should be done for the contents of @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if spell checking should be done for @field</doc>
+          <doc xml:space="preserve">%TRUE if spell checking should be done for @field</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_get_max_len"
               c:identifier="poppler_form_field_text_get_max_len">
-        <doc xml:whitespace="preserve">Retrieves the maximum allowed length of the text in @field</doc>
+        <doc xml:space="preserve">Retrieves the maximum allowed length of the text in @field</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the maximum allowed number of characters in @field, or -1 if there is no maximum.</doc>
+          <doc xml:space="preserve">the maximum allowed number of characters in @field, or -1 if there is no maximum.</doc>
           <type name="gint" c:type="gint"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_get_text"
               c:identifier="poppler_form_field_text_get_text">
-        <doc xml:whitespace="preserve">Retrieves the contents of @field.</doc>
+        <doc xml:space="preserve">Retrieves the contents of @field.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
+          <doc xml:space="preserve">a new allocated string. It must be freed with g_free() when done.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_get_text_type"
               c:identifier="poppler_form_field_text_get_text_type">
-        <doc xml:whitespace="preserve">Gets the text type of @field.</doc>
+        <doc xml:space="preserve">Gets the text type of @field.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">#PopplerFormTextType of @field</doc>
+          <doc xml:space="preserve">#PopplerFormTextType of @field</doc>
           <type name="FormTextType" c:type="PopplerFormTextType"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_is_password"
               c:identifier="poppler_form_field_text_is_password">
-        <doc xml:whitespace="preserve">Checks whether content of @field is a password and it must be hidden</doc>
+        <doc xml:space="preserve">Checks whether content of @field is a password and it must be hidden</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if the content of @field is a password</doc>
+          <doc xml:space="preserve">%TRUE if the content of @field is a password</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_is_rich_text"
               c:identifier="poppler_form_field_text_is_rich_text">
-        <doc xml:whitespace="preserve">Checks whether the contents of @field are rich text</doc>
+        <doc xml:space="preserve">Checks whether the contents of @field are rich text</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if the contents of @field are rich text</doc>
+          <doc xml:space="preserve">%TRUE if the contents of @field are rich text</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="text_set_text"
               c:identifier="poppler_form_field_text_set_text">
-        <doc xml:whitespace="preserve">Sets the text in @field to the given value, replacing the current contents.</doc>
+        <doc xml:space="preserve">Sets the text in @field to the given value, replacing the current contents.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="field" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormField</doc>
+            <type name="FormField" c:type="PopplerFormField*"/>
+          </instance-parameter>
           <parameter name="text" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the new text</doc>
+            <doc xml:space="preserve">the new text</doc>
             <type name="utf8" c:type="const gchar*"/>
           </parameter>
         </parameters>
@@ -2475,7 +3282,7 @@ the partial field names of the field and all of its ancestors.</doc>
             glib:type-name="PopplerFormFieldMapping"
             glib:get-type="poppler_form_field_mapping_get_type"
             c:symbol-prefix="form_field_mapping">
-      <doc xml:whitespace="preserve">A #PopplerFormFieldMapping structure represents the location
+      <doc xml:space="preserve">A #PopplerFormFieldMapping structure represents the location
 of @field on the page</doc>
       <field name="area" writable="1">
         <type name="Rectangle" c:type="PopplerRectangle"/>
@@ -2484,24 +3291,36 @@ of @field on the page</doc>
         <type name="FormField" c:type="PopplerFormField*"/>
       </field>
       <constructor name="new" c:identifier="poppler_form_field_mapping_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerFormFieldMapping</doc>
+        <doc xml:space="preserve">Creates a new #PopplerFormFieldMapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerFormFieldMapping, use poppler_form_field_mapping_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerFormFieldMapping, use poppler_form_field_mapping_free() to free it</doc>
           <type name="FormFieldMapping" c:type="PopplerFormFieldMapping*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_form_field_mapping_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @mapping</doc>
+        <doc xml:space="preserve">Creates a copy of @mapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @mapping</doc>
+          <doc xml:space="preserve">a new allocated copy of @mapping</doc>
           <type name="FormFieldMapping" c:type="PopplerFormFieldMapping*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormFieldMapping to copy</doc>
+            <type name="FormFieldMapping" c:type="PopplerFormFieldMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_form_field_mapping_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerFormFieldMapping</doc>
+        <doc xml:space="preserve">Frees the given #PopplerFormFieldMapping</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerFormFieldMapping</doc>
+            <type name="FormFieldMapping" c:type="PopplerFormFieldMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <enumeration name="FormFieldType"
@@ -2511,23 +3330,28 @@ of @field on the page</doc>
       <member name="unknown"
               value="0"
               c:identifier="POPPLER_FORM_FIELD_UNKNOWN"
-              glib:nick="unknown"/>
+              glib:nick="unknown">
+      </member>
       <member name="button"
               value="1"
               c:identifier="POPPLER_FORM_FIELD_BUTTON"
-              glib:nick="button"/>
+              glib:nick="button">
+      </member>
       <member name="text"
               value="2"
               c:identifier="POPPLER_FORM_FIELD_TEXT"
-              glib:nick="text"/>
+              glib:nick="text">
+      </member>
       <member name="choice"
               value="3"
               c:identifier="POPPLER_FORM_FIELD_CHOICE"
-              glib:nick="choice"/>
+              glib:nick="choice">
+      </member>
       <member name="signature"
               value="4"
               c:identifier="POPPLER_FORM_FIELD_SIGNATURE"
-              glib:nick="signature"/>
+              glib:nick="signature">
+      </member>
     </enumeration>
     <enumeration name="FormTextType"
                  glib:type-name="PopplerFormTextType"
@@ -2536,17 +3360,21 @@ of @field on the page</doc>
       <member name="normal"
               value="0"
               c:identifier="POPPLER_FORM_TEXT_NORMAL"
-              glib:nick="normal"/>
+              glib:nick="normal">
+      </member>
       <member name="multiline"
               value="1"
               c:identifier="POPPLER_FORM_TEXT_MULTILINE"
-              glib:nick="multiline"/>
+              glib:nick="multiline">
+      </member>
       <member name="file_select"
               value="2"
               c:identifier="POPPLER_FORM_TEXT_FILE_SELECT"
-              glib:nick="file-select"/>
+              glib:nick="file-select">
+      </member>
     </enumeration>
     <constant name="HAS_CAIRO" value="1" c:type="POPPLER_HAS_CAIRO">
+      <doc xml:space="preserve">Defined if poppler was compiled with cairo support.</doc>
       <type name="gint" c:type="gint"/>
     </constant>
     <record name="ImageMapping"
@@ -2554,7 +3382,7 @@ of @field on the page</doc>
             glib:type-name="PopplerImageMapping"
             glib:get-type="poppler_image_mapping_get_type"
             c:symbol-prefix="image_mapping">
-      <doc xml:whitespace="preserve">A #PopplerImageMapping structure represents the location
+      <doc xml:space="preserve">A #PopplerImageMapping structure represents the location
 of an image on the page</doc>
       <field name="area" writable="1">
         <type name="Rectangle" c:type="PopplerRectangle"/>
@@ -2563,24 +3391,36 @@ of an image on the page</doc>
         <type name="gint" c:type="gint"/>
       </field>
       <constructor name="new" c:identifier="poppler_image_mapping_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerImageMapping</doc>
+        <doc xml:space="preserve">Creates a new #PopplerImageMapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerImageMapping, use poppler_image_mapping_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerImageMapping, use poppler_image_mapping_free() to free it</doc>
           <type name="ImageMapping" c:type="PopplerImageMapping*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_image_mapping_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @mapping</doc>
+        <doc xml:space="preserve">Creates a copy of @mapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @mapping</doc>
+          <doc xml:space="preserve">a new allocated copy of @mapping</doc>
           <type name="ImageMapping" c:type="PopplerImageMapping*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerImageMapping to copy</doc>
+            <type name="ImageMapping" c:type="PopplerImageMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_image_mapping_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerImageMapping</doc>
+        <doc xml:space="preserve">Frees the given #PopplerImageMapping</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerImageMapping</doc>
+            <type name="ImageMapping" c:type="PopplerImageMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <record name="IndexIter"
@@ -2589,7 +3429,7 @@ of an image on the page</doc>
             glib:get-type="poppler_index_iter_get_type"
             c:symbol-prefix="index_iter">
       <constructor name="new" c:identifier="poppler_index_iter_new">
-        <doc xml:whitespace="preserve">Returns the root #PopplerIndexIter for @document, or %NULL.  This must be
+        <doc xml:space="preserve">Returns the root #PopplerIndexIter for @document, or %NULL.  This must be
 freed with poppler_index_iter_free().
 
 Certain documents have an index associated with them.  This index can be used
@@ -2622,62 +3462,98 @@ walk_index (PopplerIndexIter *iter)
 }
 &lt;/programlisting&gt;&lt;/informalexample&gt;</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerIndexIter</doc>
+          <doc xml:space="preserve">a new #PopplerIndexIter</doc>
           <type name="IndexIter" c:type="PopplerIndexIter*"/>
         </return-value>
         <parameters>
           <parameter name="document" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerDocument</doc>
+            <doc xml:space="preserve">a #PopplerDocument</doc>
             <type name="Document" c:type="PopplerDocument*"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="copy" c:identifier="poppler_index_iter_copy">
-        <doc xml:whitespace="preserve">Creates a new #PopplerIndexIter as a copy of @iter.  This must be freed with
+        <doc xml:space="preserve">Creates a new #PopplerIndexIter as a copy of @iter.  This must be freed with
 poppler_index_iter_free().</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerIndexIter</doc>
+          <doc xml:space="preserve">a new #PopplerIndexIter</doc>
           <type name="IndexIter" c:type="PopplerIndexIter*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerIndexIter</doc>
+            <type name="IndexIter" c:type="PopplerIndexIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_index_iter_free">
-        <doc xml:whitespace="preserve">Frees @iter.</doc>
+        <doc xml:space="preserve">Frees @iter.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerIndexIter</doc>
+            <type name="IndexIter" c:type="PopplerIndexIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_action" c:identifier="poppler_index_iter_get_action">
-        <doc xml:whitespace="preserve">Returns the #PopplerAction associated with @iter.  It must be freed with
+        <doc xml:space="preserve">Returns the #PopplerAction associated with @iter.  It must be freed with
 poppler_action_free().</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerAction</doc>
+          <doc xml:space="preserve">a new #PopplerAction</doc>
           <type name="Action" c:type="PopplerAction*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerIndexIter</doc>
+            <type name="IndexIter" c:type="PopplerIndexIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_child" c:identifier="poppler_index_iter_get_child">
-        <doc xml:whitespace="preserve">Returns a newly created child of @parent, or %NULL if the iter has no child.
+        <doc xml:space="preserve">Returns a newly created child of @parent, or %NULL if the iter has no child.
 See poppler_index_iter_new() for more information on this function.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerIndexIter</doc>
+          <doc xml:space="preserve">a new #PopplerIndexIter</doc>
           <type name="IndexIter" c:type="PopplerIndexIter*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="parent" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerIndexIter</doc>
+            <type name="IndexIter" c:type="PopplerIndexIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_open" c:identifier="poppler_index_iter_is_open">
-        <doc xml:whitespace="preserve">Returns whether this node should be expanded by default to the user.  The
+        <doc xml:space="preserve">Returns whether this node should be expanded by default to the user.  The
 document can provide a hint as to how the document's index should be expanded
 initially.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if the document wants @iter to be expanded</doc>
+          <doc xml:space="preserve">%TRUE, if the document wants @iter to be expanded</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerIndexIter</doc>
+            <type name="IndexIter" c:type="PopplerIndexIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="next" c:identifier="poppler_index_iter_next">
-        <doc xml:whitespace="preserve">Sets @iter to point to the next action at the current level, if valid.  See
+        <doc xml:space="preserve">Sets @iter to point to the next action at the current level, if valid.  See
 poppler_index_iter_new() for more information.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if @iter was set to the next action</doc>
+          <doc xml:space="preserve">%TRUE, if @iter was set to the next action</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerIndexIter</doc>
+            <type name="IndexIter" c:type="PopplerIndexIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <class name="Layer"
@@ -2689,53 +3565,89 @@ poppler_index_iter_new() for more information.</doc>
       <method name="get_radio_button_group_id"
               c:identifier="poppler_layer_get_radio_button_group_id"
               version="0.12">
-        <doc xml:whitespace="preserve">Returns the numeric ID the radio button group associated with @layer.</doc>
+        <doc xml:space="preserve">Returns the numeric ID the radio button group associated with @layer.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the ID of the radio button group associated with @layer, or 0 if the layer is not associated to any radio button group</doc>
+          <doc xml:space="preserve">the ID of the radio button group associated with @layer, or 0 if the layer is not associated to any radio button group</doc>
           <type name="gint" c:type="gint"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="layer" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayer</doc>
+            <type name="Layer" c:type="PopplerLayer*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_title"
               c:identifier="poppler_layer_get_title"
               version="0.12">
-        <doc xml:whitespace="preserve">Returns the name of the layer suitable for
+        <doc xml:space="preserve">Returns the name of the layer suitable for
 presentation as a title in a viewer's GUI</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">a string containing the title of the layer</doc>
+          <doc xml:space="preserve">a string containing the title of the layer</doc>
           <type name="utf8" c:type="const gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="layer" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayer</doc>
+            <type name="Layer" c:type="PopplerLayer*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="hide" c:identifier="poppler_layer_hide" version="0.12">
-        <doc xml:whitespace="preserve">Hides @layer. If @layer is the parent of other nested layers,
+        <doc xml:space="preserve">Hides @layer. If @layer is the parent of other nested layers,
 such layers will be also hidden and will be blocked until @layer
 is shown again</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="layer" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayer</doc>
+            <type name="Layer" c:type="PopplerLayer*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_parent"
               c:identifier="poppler_layer_is_parent"
               version="0.12">
-        <doc xml:whitespace="preserve">Returns whether @layer is parent of other nested layers.</doc>
+        <doc xml:space="preserve">Returns whether @layer is parent of other nested layers.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if @layer is a parent layer</doc>
+          <doc xml:space="preserve">%TRUE if @layer is a parent layer</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="layer" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayer</doc>
+            <type name="Layer" c:type="PopplerLayer*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_visible"
               c:identifier="poppler_layer_is_visible"
               version="0.12">
-        <doc xml:whitespace="preserve">Returns whether @layer is visible</doc>
+        <doc xml:space="preserve">Returns whether @layer is visible</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if @layer is visible</doc>
+          <doc xml:space="preserve">%TRUE if @layer is visible</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="layer" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayer</doc>
+            <type name="Layer" c:type="PopplerLayer*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="show" c:identifier="poppler_layer_show" version="0.12">
-        <doc xml:whitespace="preserve">Shows @layer</doc>
+        <doc xml:space="preserve">Shows @layer</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="layer" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayer</doc>
+            <type name="Layer" c:type="PopplerLayer*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </class>
     <record name="LayersIter"
@@ -2751,65 +3663,101 @@ is shown again</doc>
         </return-value>
         <parameters>
           <parameter name="document" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerDocument</doc>
+            <doc xml:space="preserve">a #PopplerDocument</doc>
             <type name="Document" c:type="PopplerDocument*"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="copy" c:identifier="poppler_layers_iter_copy">
-        <doc xml:whitespace="preserve">Creates a new #PopplerLayersIter as a copy of @iter.  This must be freed with
+        <doc xml:space="preserve">Creates a new #PopplerLayersIter as a copy of @iter.  This must be freed with
 poppler_layers_iter_free().</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerLayersIter  Since 0.12</doc>
+          <doc xml:space="preserve">a new #PopplerLayersIter  Since 0.12</doc>
           <type name="LayersIter" c:type="PopplerLayersIter*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayersIter</doc>
+            <type name="LayersIter" c:type="PopplerLayersIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free"
               c:identifier="poppler_layers_iter_free"
               version="0.12">
-        <doc xml:whitespace="preserve">Frees @iter.</doc>
+        <doc xml:space="preserve">Frees @iter.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayersIter</doc>
+            <type name="LayersIter" c:type="PopplerLayersIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_child"
               c:identifier="poppler_layers_iter_get_child"
               version="0.12">
-        <doc xml:whitespace="preserve">Returns a newly created child of @parent, or %NULL if the iter has no child.
+        <doc xml:space="preserve">Returns a newly created child of @parent, or %NULL if the iter has no child.
 See poppler_layers_iter_new() for more information on this function.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerLayersIter, or %NULL</doc>
+          <doc xml:space="preserve">a new #PopplerLayersIter, or %NULL</doc>
           <type name="LayersIter" c:type="PopplerLayersIter*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="parent" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayersIter</doc>
+            <type name="LayersIter" c:type="PopplerLayersIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_layer"
               c:identifier="poppler_layers_iter_get_layer"
               version="0.12">
-        <doc xml:whitespace="preserve">Returns the #PopplerLayer associated with @iter.</doc>
+        <doc xml:space="preserve">Returns the #PopplerLayer associated with @iter.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerLayer, or %NULL if there isn't any layer associated with @iter</doc>
+          <doc xml:space="preserve">a new #PopplerLayer, or %NULL if there isn't any layer associated with @iter</doc>
           <type name="Layer" c:type="PopplerLayer*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayersIter</doc>
+            <type name="LayersIter" c:type="PopplerLayersIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_title"
               c:identifier="poppler_layers_iter_get_title"
               version="0.12">
-        <doc xml:whitespace="preserve">Returns the title associated with @iter.  It must be freed with
+        <doc xml:space="preserve">Returns the title associated with @iter.  It must be freed with
 g_free().</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new string containing the @iter's title or %NULL if @iter doesn't have a title. The returned string should be freed with g_free() when no longer needed.</doc>
+          <doc xml:space="preserve">a new string containing the @iter's title or %NULL if @iter doesn't have a title. The returned string should be freed with g_free() when no longer needed.</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayersIter</doc>
+            <type name="LayersIter" c:type="PopplerLayersIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="next"
               c:identifier="poppler_layers_iter_next"
               version="0.12">
-        <doc xml:whitespace="preserve">Sets @iter to point to the next action at the current level, if valid.  See
+        <doc xml:space="preserve">Sets @iter to point to the next action at the current level, if valid.  See
 poppler_layers_iter_new() for more information.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if @iter was set to the next action</doc>
+          <doc xml:space="preserve">%TRUE, if @iter was set to the next action</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="iter" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLayersIter</doc>
+            <type name="LayersIter" c:type="PopplerLayersIter*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <record name="LinkMapping"
@@ -2817,7 +3765,7 @@ poppler_layers_iter_new() for more information.</doc>
             glib:type-name="PopplerLinkMapping"
             glib:get-type="poppler_link_mapping_get_type"
             c:symbol-prefix="link_mapping">
-      <doc xml:whitespace="preserve">A #PopplerLinkMapping structure represents the location
+      <doc xml:space="preserve">A #PopplerLinkMapping structure represents the location
 of @action on the page</doc>
       <field name="area" writable="1">
         <type name="Rectangle" c:type="PopplerRectangle"/>
@@ -2826,33 +3774,60 @@ of @action on the page</doc>
         <type name="Action" c:type="PopplerAction*"/>
       </field>
       <constructor name="new" c:identifier="poppler_link_mapping_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerLinkMapping</doc>
+        <doc xml:space="preserve">Creates a new #PopplerLinkMapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerLinkMapping, use poppler_link_mapping_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerLinkMapping, use poppler_link_mapping_free() to free it</doc>
           <type name="LinkMapping" c:type="PopplerLinkMapping*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_link_mapping_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @mapping</doc>
+        <doc xml:space="preserve">Creates a copy of @mapping</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @mapping</doc>
+          <doc xml:space="preserve">a new allocated copy of @mapping</doc>
           <type name="LinkMapping" c:type="PopplerLinkMapping*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLinkMapping to copy</doc>
+            <type name="LinkMapping" c:type="PopplerLinkMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_link_mapping_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerLinkMapping</doc>
+        <doc xml:space="preserve">Frees the given #PopplerLinkMapping</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="mapping" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerLinkMapping</doc>
+            <type name="LinkMapping" c:type="PopplerLinkMapping*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
-    <constant name="MAJOR_VERSION" value="0" c:type="POPPLER_MAJOR_VERSION">
+    <constant name="MAJOR_VERSION"
+              value="0"
+              c:type="POPPLER_MAJOR_VERSION"
+              version="0.12">
+      <doc xml:space="preserve">The major version number of the poppler header files (e.g. in poppler version
+0.1.2 this is 0.)</doc>
       <type name="gint" c:type="gint"/>
     </constant>
-    <constant name="MICRO_VERSION" value="1" c:type="POPPLER_MICRO_VERSION">
+    <constant name="MICRO_VERSION"
+              value="1"
+              c:type="POPPLER_MICRO_VERSION"
+              version="0.12">
+      <doc xml:space="preserve">The micro version number of the poppler header files (e.g. in poppler version
+0.1.2 this is 2.)</doc>
       <type name="gint" c:type="gint"/>
     </constant>
-    <constant name="MINOR_VERSION" value="22" c:type="POPPLER_MINOR_VERSION">
+    <constant name="MINOR_VERSION"
+              value="24"
+              c:type="POPPLER_MINOR_VERSION"
+              version="0.12">
+      <doc xml:space="preserve">The major version number of the poppler header files (e.g. in poppler version
+0.1.2 this is 1.)</doc>
       <type name="gint" c:type="gint"/>
     </constant>
     <class name="Media"
@@ -2864,49 +3839,71 @@ of @action on the page</doc>
       <method name="get_filename"
               c:identifier="poppler_media_get_filename"
               version="0.14">
-        <doc xml:whitespace="preserve">Returns the media clip filename, in case of non-embedded media. filename might be
+        <doc xml:space="preserve">Returns the media clip filename, in case of non-embedded media. filename might be
 a local relative or absolute path or a URI</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">a filename, return value is owned by #PopplerMedia and should not be freed</doc>
+          <doc xml:space="preserve">a filename, return value is owned by #PopplerMedia and should not be freed</doc>
           <type name="utf8" c:type="const gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_media" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMedia</doc>
+            <type name="Media" c:type="PopplerMedia*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_mime_type"
               c:identifier="poppler_media_get_mime_type"
               version="0.14">
-        <doc xml:whitespace="preserve">Returns the media clip mime-type</doc>
+        <doc xml:space="preserve">Returns the media clip mime-type</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">the mime-type, return value is owned by #PopplerMedia and should not be freed</doc>
+          <doc xml:space="preserve">the mime-type, return value is owned by #PopplerMedia and should not be freed</doc>
           <type name="utf8" c:type="const gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_media" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMedia</doc>
+            <type name="Media" c:type="PopplerMedia*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="is_embedded"
               c:identifier="poppler_media_is_embedded"
               version="0.14">
-        <doc xml:whitespace="preserve">Whether the media clip is embedded in the PDF. If the result is %TRUE, the embedded stream
+        <doc xml:space="preserve">Whether the media clip is embedded in the PDF. If the result is %TRUE, the embedded stream
 can be saved with poppler_media_save() or poppler_media_save_to_callback() function.
 If the result is %FALSE, the media clip filename can be retrieved with
 poppler_media_get_filename() function.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if media clip is embedded, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if media clip is embedded, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_media" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMedia</doc>
+            <type name="Media" c:type="PopplerMedia*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="save"
               c:identifier="poppler_media_save"
               version="0.14"
               throws="1">
-        <doc xml:whitespace="preserve">Saves embedded stream of @poppler_media to a file indicated by @filename.
+        <doc xml:space="preserve">Saves embedded stream of @poppler_media to a file indicated by @filename.
 If @error is set, %FALSE will be returned.
 Possible errors include those in the #G_FILE_ERROR domain
 and whatever the save function generates.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if the file successfully saved</doc>
+          <doc xml:space="preserve">%TRUE, if the file successfully saved</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_media" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMedia</doc>
+            <type name="Media" c:type="PopplerMedia*"/>
+          </instance-parameter>
           <parameter name="filename" transfer-ownership="none">
-            <doc xml:whitespace="preserve">name of file to save</doc>
+            <doc xml:space="preserve">name of file to save</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -2915,25 +3912,29 @@ and whatever the save function generates.</doc>
               c:identifier="poppler_media_save_to_callback"
               version="0.14"
               throws="1">
-        <doc xml:whitespace="preserve">Saves embedded stream of @poppler_media by feeding the produced data to @save_func. Can be used
+        <doc xml:space="preserve">Saves embedded stream of @poppler_media by feeding the produced data to @save_func. Can be used
 when you want to store the media clip stream to something other than a file, such as
 an in-memory buffer or a socket. If @error is set, %FALSE will be
 returned. Possible errors include those in the #G_FILE_ERROR domain and
 whatever the save function generates.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if the save successfully completed</doc>
+          <doc xml:space="preserve">%TRUE, if the save successfully completed</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="poppler_media" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMedia</doc>
+            <type name="Media" c:type="PopplerMedia*"/>
+          </instance-parameter>
           <parameter name="save_func"
                      transfer-ownership="none"
                      scope="call"
                      closure="1">
-            <doc xml:whitespace="preserve">a function that is called to save each block of data that the save routine generates.</doc>
+            <doc xml:space="preserve">a function that is called to save each block of data that the save routine generates.</doc>
             <type name="MediaSaveFunc" c:type="PopplerMediaSaveFunc"/>
           </parameter>
           <parameter name="user_data" transfer-ownership="none">
-            <doc xml:whitespace="preserve">user data to pass to the save function.</doc>
+            <doc xml:space="preserve">user data to pass to the save function.</doc>
             <type name="gpointer" c:type="gpointer"/>
           </parameter>
         </parameters>
@@ -2943,29 +3944,29 @@ whatever the save function generates.</doc>
               c:type="PopplerMediaSaveFunc"
               version="0.14"
               throws="1">
-      <doc xml:whitespace="preserve">Specifies the type of the function passed to
+      <doc xml:space="preserve">Specifies the type of the function passed to
 poppler_media_save_to_callback().  It is called once for each block of
 bytes that is "written" by poppler_media_save_to_callback().  If
 successful it should return %TRUE.  If an error occurs it should set
 @error and return %FALSE, in which case poppler_media_save_to_callback()
 will fail with the same error.</doc>
       <return-value transfer-ownership="none">
-        <doc xml:whitespace="preserve">%TRUE if successful, %FALSE (with @error set) if failed.</doc>
+        <doc xml:space="preserve">%TRUE if successful, %FALSE (with @error set) if failed.</doc>
         <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="buf" transfer-ownership="none">
-          <doc xml:whitespace="preserve">buffer containing bytes to be written.</doc>
+          <doc xml:space="preserve">buffer containing bytes to be written.</doc>
           <array length="1" zero-terminated="0" c:type="gchar*">
             <type name="guint8"/>
           </array>
         </parameter>
         <parameter name="count" transfer-ownership="none">
-          <doc xml:whitespace="preserve">number of bytes in @buf.</doc>
+          <doc xml:space="preserve">number of bytes in @buf.</doc>
           <type name="gsize" c:type="gsize"/>
         </parameter>
         <parameter name="data" transfer-ownership="none" closure="2">
-          <doc xml:whitespace="preserve">user data passed to poppler_media_save_to_callback()</doc>
+          <doc xml:space="preserve">user data passed to poppler_media_save_to_callback()</doc>
           <type name="gpointer" c:type="gpointer"/>
         </parameter>
       </parameters>
@@ -2979,31 +3980,49 @@ will fail with the same error.</doc>
       <method name="get_filename"
               c:identifier="poppler_movie_get_filename"
               version="0.14">
-        <doc xml:whitespace="preserve">Returns the local filename identifying a self-describing movie file</doc>
+        <doc xml:space="preserve">Returns the local filename identifying a self-describing movie file</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">a local filename, return value is owned by #PopplerMovie and should not be freed</doc>
+          <doc xml:space="preserve">a local filename, return value is owned by #PopplerMovie and should not be freed</doc>
           <type name="utf8" c:type="const gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_movie" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMovie</doc>
+            <type name="Movie" c:type="PopplerMovie*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="need_poster"
               c:identifier="poppler_movie_need_poster"
               version="0.14">
-        <doc xml:whitespace="preserve">Returns whether a poster image representing the Movie
+        <doc xml:space="preserve">Returns whether a poster image representing the Movie
 shall be displayed. The poster image must be retrieved
 from the movie file.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if move needs a poster image, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if move needs a poster image, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_movie" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMovie</doc>
+            <type name="Movie" c:type="PopplerMovie*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="show_controls"
               c:identifier="poppler_movie_show_controls"
               version="0.14">
-        <doc xml:whitespace="preserve">Returns whether to display a movie controller bar while playing the movie</doc>
+        <doc xml:space="preserve">Returns whether to display a movie controller bar while playing the movie</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if controller bar should be displayed, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if controller bar should be displayed, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="poppler_movie" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerMovie</doc>
+            <type name="Movie" c:type="PopplerMovie*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </class>
     <enumeration name="Orientation"
@@ -3013,19 +4032,23 @@ from the movie file.</doc>
       <member name="portrait"
               value="0"
               c:identifier="POPPLER_ORIENTATION_PORTRAIT"
-              glib:nick="portrait"/>
+              glib:nick="portrait">
+      </member>
       <member name="landscape"
               value="1"
               c:identifier="POPPLER_ORIENTATION_LANDSCAPE"
-              glib:nick="landscape"/>
+              glib:nick="landscape">
+      </member>
       <member name="upsidedown"
               value="2"
               c:identifier="POPPLER_ORIENTATION_UPSIDEDOWN"
-              glib:nick="upsidedown"/>
+              glib:nick="upsidedown">
+      </member>
       <member name="seascape"
               value="3"
               c:identifier="POPPLER_ORIENTATION_SEASCAPE"
-              glib:nick="seascape"/>
+              glib:nick="seascape">
+      </member>
     </enumeration>
     <class name="PSFile"
            c:symbol-prefix="ps_file"
@@ -3034,63 +4057,77 @@ from the movie file.</doc>
            glib:type-name="PopplerPSFile"
            glib:get-type="poppler_ps_file_get_type">
       <constructor name="new" c:identifier="poppler_ps_file_new">
-        <doc xml:whitespace="preserve">Create a new postscript file to render to</doc>
+        <doc xml:space="preserve">Create a new postscript file to render to</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a PopplerPSFile</doc>
+          <doc xml:space="preserve">a PopplerPSFile</doc>
           <type name="PSFile" c:type="PopplerPSFile*"/>
         </return-value>
         <parameters>
           <parameter name="document" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerDocument</doc>
+            <doc xml:space="preserve">a #PopplerDocument</doc>
             <type name="Document" c:type="PopplerDocument*"/>
           </parameter>
           <parameter name="filename" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the path of the output filename</doc>
+            <doc xml:space="preserve">the path of the output filename</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
           <parameter name="first_page" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the first page to print</doc>
+            <doc xml:space="preserve">the first page to print</doc>
             <type name="gint" c:type="int"/>
           </parameter>
           <parameter name="n_pages" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the number of pages to print</doc>
+            <doc xml:space="preserve">the number of pages to print</doc>
             <type name="gint" c:type="int"/>
           </parameter>
         </parameters>
       </constructor>
       <method name="free" c:identifier="poppler_ps_file_free">
-        <doc xml:whitespace="preserve">Frees @ps_file</doc>
+        <doc xml:space="preserve">Frees @ps_file</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="ps_file" transfer-ownership="none">
+            <doc xml:space="preserve">a PopplerPSFile</doc>
+            <type name="PSFile" c:type="PopplerPSFile*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="set_duplex" c:identifier="poppler_ps_file_set_duplex">
-        <doc xml:whitespace="preserve">Enable or disable Duplex printing.</doc>
+        <doc xml:space="preserve">Enable or disable Duplex printing.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="ps_file" transfer-ownership="none">
+            <doc xml:space="preserve">a PopplerPSFile which was not yet printed to</doc>
+            <type name="PSFile" c:type="PopplerPSFile*"/>
+          </instance-parameter>
           <parameter name="duplex" transfer-ownership="none">
-            <doc xml:whitespace="preserve">whether to force duplex printing (on printers which support this)</doc>
+            <doc xml:space="preserve">whether to force duplex printing (on printers which support this)</doc>
             <type name="gboolean" c:type="gboolean"/>
           </parameter>
         </parameters>
       </method>
       <method name="set_paper_size"
               c:identifier="poppler_ps_file_set_paper_size">
-        <doc xml:whitespace="preserve">Set the output paper size. These values will end up in the
+        <doc xml:space="preserve">Set the output paper size. These values will end up in the
 DocumentMedia, the BoundingBox DSC comments and other places in the
 generated PostScript.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="ps_file" transfer-ownership="none">
+            <doc xml:space="preserve">a PopplerPSFile which was not yet printed to.</doc>
+            <type name="PSFile" c:type="PopplerPSFile*"/>
+          </instance-parameter>
           <parameter name="width" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the paper width in 1/72 inch</doc>
+            <doc xml:space="preserve">the paper width in 1/72 inch</doc>
             <type name="gdouble" c:type="double"/>
           </parameter>
           <parameter name="height" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the paper height in 1/72 inch</doc>
+            <doc xml:space="preserve">the paper height in 1/72 inch</doc>
             <type name="gdouble" c:type="double"/>
           </parameter>
         </parameters>
@@ -3104,7 +4141,7 @@ generated PostScript.</doc>
            glib:get-type="poppler_page_get_type">
       <function name="free_annot_mapping"
                 c:identifier="poppler_page_free_annot_mapping">
-        <doc xml:whitespace="preserve">Frees a list of #PopplerAnnotMapping&lt;!-- --&gt;s allocated by
+        <doc xml:space="preserve">Frees a list of #PopplerAnnotMapping&lt;!-- --&gt;s allocated by
 poppler_page_get_annot_mapping().  It also unreferences the #PopplerAnnot&lt;!-- --&gt;s
 that each mapping contains, so if you want to keep them around, you need to
 reference them with g_object_ref().</doc>
@@ -3113,7 +4150,7 @@ reference them with g_object_ref().</doc>
         </return-value>
         <parameters>
           <parameter name="list" transfer-ownership="none">
-            <doc xml:whitespace="preserve">A list of #PopplerAnnotMapping&lt;!-- --&gt;s</doc>
+            <doc xml:space="preserve">A list of #PopplerAnnotMapping&lt;!-- --&gt;s</doc>
             <type name="GLib.List" c:type="GList*">
               <type name="AnnotMapping"/>
             </type>
@@ -3122,14 +4159,14 @@ reference them with g_object_ref().</doc>
       </function>
       <function name="free_form_field_mapping"
                 c:identifier="poppler_page_free_form_field_mapping">
-        <doc xml:whitespace="preserve">Frees a list of #PopplerFormFieldMapping&lt;!-- --&gt;s allocated by
+        <doc xml:space="preserve">Frees a list of #PopplerFormFieldMapping&lt;!-- --&gt;s allocated by
 poppler_page_get_form_field_mapping().</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list" transfer-ownership="none">
-            <doc xml:whitespace="preserve">A list of #PopplerFormFieldMapping&lt;!-- --&gt;s</doc>
+            <doc xml:space="preserve">A list of #PopplerFormFieldMapping&lt;!-- --&gt;s</doc>
             <type name="GLib.List" c:type="GList*">
               <type name="FormFieldMapping"/>
             </type>
@@ -3138,14 +4175,14 @@ poppler_page_get_form_field_mapping().</doc>
       </function>
       <function name="free_image_mapping"
                 c:identifier="poppler_page_free_image_mapping">
-        <doc xml:whitespace="preserve">Frees a list of #PopplerImageMapping&lt;!-- --&gt;s allocated by
+        <doc xml:space="preserve">Frees a list of #PopplerImageMapping&lt;!-- --&gt;s allocated by
 poppler_page_get_image_mapping().</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list" transfer-ownership="none">
-            <doc xml:whitespace="preserve">A list of #PopplerImageMapping&lt;!-- --&gt;s</doc>
+            <doc xml:space="preserve">A list of #PopplerImageMapping&lt;!-- --&gt;s</doc>
             <type name="GLib.List" c:type="GList*">
               <type name="ImageMapping"/>
             </type>
@@ -3154,7 +4191,7 @@ poppler_page_get_image_mapping().</doc>
       </function>
       <function name="free_link_mapping"
                 c:identifier="poppler_page_free_link_mapping">
-        <doc xml:whitespace="preserve">Frees a list of #PopplerLinkMapping&lt;!-- --&gt;s allocated by
+        <doc xml:space="preserve">Frees a list of #PopplerLinkMapping&lt;!-- --&gt;s allocated by
 poppler_page_get_link_mapping().  It also frees the #PopplerAction&lt;!-- --&gt;s
 that each mapping contains, so if you want to keep them around, you need to
 copy them with poppler_action_copy().</doc>
@@ -3163,7 +4200,7 @@ copy them with poppler_action_copy().</doc>
         </return-value>
         <parameters>
           <parameter name="list" transfer-ownership="none">
-            <doc xml:whitespace="preserve">A list of #PopplerLinkMapping&lt;!-- --&gt;s</doc>
+            <doc xml:space="preserve">A list of #PopplerLinkMapping&lt;!-- --&gt;s</doc>
             <type name="GLib.List" c:type="GList*">
               <type name="LinkMapping"/>
             </type>
@@ -3173,14 +4210,14 @@ copy them with poppler_action_copy().</doc>
       <function name="free_text_attributes"
                 c:identifier="poppler_page_free_text_attributes"
                 version="0.18">
-        <doc xml:whitespace="preserve">Frees a list of #PopplerTextAttributes&lt;!-- --&gt;s allocated by
+        <doc xml:space="preserve">Frees a list of #PopplerTextAttributes&lt;!-- --&gt;s allocated by
 poppler_page_get_text_attributes().</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="list" transfer-ownership="none">
-            <doc xml:whitespace="preserve">A list of #PopplerTextAttributes&lt;!-- --&gt;s</doc>
+            <doc xml:space="preserve">A list of #PopplerTextAttributes&lt;!-- --&gt;s</doc>
             <type name="GLib.List" c:type="GList*">
               <type name="TextAttributes"/>
             </type>
@@ -3190,13 +4227,13 @@ poppler_page_get_text_attributes().</doc>
       <function name="selection_region_free"
                 c:identifier="poppler_page_selection_region_free"
                 deprecated="0.16">
-        <doc xml:whitespace="preserve">Frees @region</doc>
+        <doc xml:space="preserve">Frees @region</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
           <parameter name="region" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #GList of #PopplerRectangle</doc>
+            <doc xml:space="preserve">a #GList of #PopplerRectangle</doc>
             <type name="GLib.List" c:type="GList*">
               <type name="Rectangle"/>
             </type>
@@ -3206,30 +4243,38 @@ poppler_page_get_text_attributes().</doc>
       <method name="add_annot"
               c:identifier="poppler_page_add_annot"
               version="0.16">
-        <doc xml:whitespace="preserve">Adds annotation @annot to @page.</doc>
+        <doc xml:space="preserve">Adds annotation @annot to @page.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="annot" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerAnnot to add</doc>
+            <doc xml:space="preserve">a #PopplerAnnot to add</doc>
             <type name="Annot" c:type="PopplerAnnot*"/>
           </parameter>
         </parameters>
       </method>
       <method name="find_text" c:identifier="poppler_page_find_text">
-        <doc xml:whitespace="preserve">Finds @text in @page with the default options (%POPPLER_FIND_DEFAULT) and
+        <doc xml:space="preserve">Finds @text in @page with the default options (%POPPLER_FIND_DEFAULT) and
 returns a #GList of rectangles for each occurance of the text on the page.
 The coordinates are in PDF points.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a #GList of #PopplerRectangle,</doc>
+          <doc xml:space="preserve">a #GList of #PopplerRectangle,</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="Rectangle"/>
           </type>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="text" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the text to search for (UTF-8 encoded)</doc>
+            <doc xml:space="preserve">the text to search for (UTF-8 encoded)</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
         </parameters>
@@ -3237,147 +4282,205 @@ The coordinates are in PDF points.</doc>
       <method name="find_text_with_options"
               c:identifier="poppler_page_find_text_with_options"
               version="0.22">
-        <doc xml:whitespace="preserve">Finds @text in @page with the given #PopplerFindFlags options and
+        <doc xml:space="preserve">Finds @text in @page with the given #PopplerFindFlags options and
 returns a #GList of rectangles for each occurance of the text on the page.
 The coordinates are in PDF points.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a #GList of #PopplerRectangle,</doc>
+          <doc xml:space="preserve">a #GList of #PopplerRectangle,</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="Rectangle"/>
           </type>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="text" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the text to search for (UTF-8 encoded)</doc>
+            <doc xml:space="preserve">the text to search for (UTF-8 encoded)</doc>
             <type name="utf8" c:type="const char*"/>
           </parameter>
           <parameter name="options" transfer-ownership="none">
-            <doc xml:whitespace="preserve">find options</doc>
+            <doc xml:space="preserve">find options</doc>
             <type name="FindFlags" c:type="PopplerFindFlags"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_annot_mapping"
               c:identifier="poppler_page_get_annot_mapping">
-        <doc xml:whitespace="preserve">Returns a list of #PopplerAnnotMapping items that map from a location on
+        <doc xml:space="preserve">Returns a list of #PopplerAnnotMapping items that map from a location on
 @page to a #PopplerAnnot.  This list must be freed with
 poppler_page_free_annot_mapping() when done.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A #GList of #PopplerAnnotMapping</doc>
+          <doc xml:space="preserve">A #GList of #PopplerAnnotMapping</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="AnnotMapping"/>
           </type>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_crop_box" c:identifier="poppler_page_get_crop_box">
-        <doc xml:whitespace="preserve">Retrurns the crop box of @page</doc>
+        <doc xml:space="preserve">Retrurns the crop box of @page</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="rect"
                      direction="out"
                      caller-allocates="1"
                      transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerRectangle to fill</doc>
+            <doc xml:space="preserve">a #PopplerRectangle to fill</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_duration" c:identifier="poppler_page_get_duration">
-        <doc xml:whitespace="preserve">Returns the duration of @page</doc>
+        <doc xml:space="preserve">Returns the duration of @page</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">duration in seconds of @page or -1.</doc>
+          <doc xml:space="preserve">duration in seconds of @page or -1.</doc>
           <type name="gdouble" c:type="double"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_form_field_mapping"
               c:identifier="poppler_page_get_form_field_mapping">
-        <doc xml:whitespace="preserve">Returns a list of #PopplerFormFieldMapping items that map from a
+        <doc xml:space="preserve">Returns a list of #PopplerFormFieldMapping items that map from a
 location on @page to a form field.  This list must be freed
 with poppler_page_free_form_field_mapping() when done.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A #GList of #PopplerFormFieldMapping</doc>
+          <doc xml:space="preserve">A #GList of #PopplerFormFieldMapping</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="FormFieldMapping"/>
           </type>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_image" c:identifier="poppler_page_get_image">
-        <doc xml:whitespace="preserve">Returns a cairo surface for the image of the @page</doc>
+        <doc xml:space="preserve">Returns a cairo surface for the image of the @page</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A cairo surface for the image</doc>
+          <doc xml:space="preserve">A cairo surface for the image</doc>
           <type name="cairo.Surface" c:type="cairo_surface_t*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="image_id" transfer-ownership="none">
-            <doc xml:whitespace="preserve">The image identifier</doc>
+            <doc xml:space="preserve">The image identifier</doc>
             <type name="gint" c:type="gint"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_image_mapping"
               c:identifier="poppler_page_get_image_mapping">
-        <doc xml:whitespace="preserve">Returns a list of #PopplerImageMapping items that map from a
+        <doc xml:space="preserve">Returns a list of #PopplerImageMapping items that map from a
 location on @page to an image of the page. This list must be freed
 with poppler_page_free_image_mapping() when done.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A #GList of #PopplerImageMapping</doc>
+          <doc xml:space="preserve">A #GList of #PopplerImageMapping</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="ImageMapping"/>
           </type>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_index" c:identifier="poppler_page_get_index">
-        <doc xml:whitespace="preserve">Returns the index of @page</doc>
+        <doc xml:space="preserve">Returns the index of @page</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">index value of @page</doc>
+          <doc xml:space="preserve">index value of @page</doc>
           <type name="gint" c:type="int"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_label"
               c:identifier="poppler_page_get_label"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns the label of @page. Note that page labels
+        <doc xml:space="preserve">Returns the label of @page. Note that page labels
 and page indices might not coincide.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated string containing the label of @page, or %NULL if @page doesn't have a label</doc>
+          <doc xml:space="preserve">a new allocated string containing the label of @page, or %NULL if @page doesn't have a label</doc>
           <type name="utf8" c:type="gchar*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_link_mapping"
               c:identifier="poppler_page_get_link_mapping">
-        <doc xml:whitespace="preserve">Returns a list of #PopplerLinkMapping items that map from a
+        <doc xml:space="preserve">Returns a list of #PopplerLinkMapping items that map from a
 location on @page to a #PopplerAction.  This list must be freed
 with poppler_page_free_link_mapping() when done.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A #GList of #PopplerLinkMapping</doc>
+          <doc xml:space="preserve">A #GList of #PopplerLinkMapping</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="LinkMapping"/>
           </type>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_selected_region"
               c:identifier="poppler_page_get_selected_region"
               version="0.16">
-        <doc xml:whitespace="preserve">Returns a region containing the area that would be rendered by
+        <doc xml:space="preserve">Returns a region containing the area that would be rendered by
 poppler_page_render_selection().
 The returned region must be freed with cairo_region_destroy()</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a cairo_region_t</doc>
+          <doc xml:space="preserve">a cairo_region_t</doc>
           <type name="cairo.Region" c:type="cairo_region_t*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="scale" transfer-ownership="none">
-            <doc xml:whitespace="preserve">scale specified as pixels per point</doc>
+            <doc xml:space="preserve">scale specified as pixels per point</doc>
             <type name="gdouble" c:type="gdouble"/>
           </parameter>
           <parameter name="style" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerSelectionStyle</doc>
+            <doc xml:space="preserve">a #PopplerSelectionStyle</doc>
             <type name="SelectionStyle" c:type="PopplerSelectionStyle"/>
           </parameter>
           <parameter name="selection" transfer-ownership="none">
-            <doc xml:whitespace="preserve">start and end point of selection as a rectangle</doc>
+            <doc xml:space="preserve">start and end point of selection as a rectangle</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
         </parameters>
@@ -3385,18 +4488,22 @@ The returned region must be freed with cairo_region_destroy()</doc>
       <method name="get_selected_text"
               c:identifier="poppler_page_get_selected_text"
               version="0.16">
-        <doc xml:whitespace="preserve">Retrieves the contents of the specified @selection as text.</doc>
+        <doc xml:space="preserve">Retrieves the contents of the specified @selection as text.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a pointer to the contents of the @selection as a string</doc>
+          <doc xml:space="preserve">a pointer to the contents of the @selection as a string</doc>
           <type name="utf8" c:type="char*"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="style" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerSelectionStyle</doc>
+            <doc xml:space="preserve">a #PopplerSelectionStyle</doc>
             <type name="SelectionStyle" c:type="PopplerSelectionStyle"/>
           </parameter>
           <parameter name="selection" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the #PopplerRectangle including the text</doc>
+            <doc xml:space="preserve">the #PopplerRectangle including the text</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
         </parameters>
@@ -3405,43 +4512,51 @@ The returned region must be freed with cairo_region_destroy()</doc>
               c:identifier="poppler_page_get_selection_region"
               deprecated="Use poppler_page_get_selected_region() instead."
               deprecated-version="0.16">
-        <doc xml:whitespace="preserve">Returns a region containing the area that would be rendered by
+        <doc xml:space="preserve">Returns a region containing the area that would be rendered by
 poppler_page_render_selection() as a #GList of
 #PopplerRectangle. The returned list must be freed with
 poppler_page_selection_region_free().</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a #GList of #PopplerRectangle</doc>
+          <doc xml:space="preserve">a #GList of #PopplerRectangle</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="Rectangle"/>
           </type>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="scale" transfer-ownership="none">
-            <doc xml:whitespace="preserve">scale specified as pixels per point</doc>
+            <doc xml:space="preserve">scale specified as pixels per point</doc>
             <type name="gdouble" c:type="gdouble"/>
           </parameter>
           <parameter name="style" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerSelectionStyle</doc>
+            <doc xml:space="preserve">a #PopplerSelectionStyle</doc>
             <type name="SelectionStyle" c:type="PopplerSelectionStyle"/>
           </parameter>
           <parameter name="selection" transfer-ownership="none">
-            <doc xml:whitespace="preserve">start and end point of selection as a rectangle</doc>
+            <doc xml:space="preserve">start and end point of selection as a rectangle</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_size" c:identifier="poppler_page_get_size">
-        <doc xml:whitespace="preserve">Gets the size of @page at the current scale and rotation.</doc>
+        <doc xml:space="preserve">Gets the size of @page at the current scale and rotation.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="width"
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="full"
                      allow-none="1">
-            <doc xml:whitespace="preserve">return location for the width of @page</doc>
+            <doc xml:space="preserve">return location for the width of @page</doc>
             <type name="gdouble" c:type="double*"/>
           </parameter>
           <parameter name="height"
@@ -3449,7 +4564,7 @@ poppler_page_selection_region_free().</doc>
                      caller-allocates="0"
                      transfer-ownership="full"
                      allow-none="1">
-            <doc xml:whitespace="preserve">return location for the height of @page</doc>
+            <doc xml:space="preserve">return location for the height of @page</doc>
             <type name="gdouble" c:type="double*"/>
           </parameter>
         </parameters>
@@ -3457,46 +4572,62 @@ poppler_page_selection_region_free().</doc>
       <method name="get_text"
               c:identifier="poppler_page_get_text"
               version="0.16">
-        <doc xml:whitespace="preserve">Retrieves the text of @page.</doc>
+        <doc xml:space="preserve">Retrieves the text of @page.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a pointer to the text of the @page as a string</doc>
+          <doc xml:space="preserve">a pointer to the text of the @page as a string</doc>
           <type name="utf8" c:type="char*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_text_attributes"
               c:identifier="poppler_page_get_text_attributes"
               version="0.18">
-        <doc xml:whitespace="preserve">Obtains the attributes of the text as a GList of #PopplerTextAttributes.
+        <doc xml:space="preserve">Obtains the attributes of the text as a GList of #PopplerTextAttributes.
 This list must be freed with poppler_page_free_text_attributes() when done.
 
 Each list element is a #PopplerTextAttributes struct where start_index and
 end_index indicates the range of text (as returned by poppler_page_get_text())
 to which text attributes apply.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">A #GList of #PopplerTextAttributes</doc>
+          <doc xml:space="preserve">A #GList of #PopplerTextAttributes</doc>
           <type name="GLib.List" c:type="GList*">
             <type name="TextAttributes"/>
           </type>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_text_layout"
               c:identifier="poppler_page_get_text_layout"
               version="0.16">
-        <doc xml:whitespace="preserve">Obtains the layout of the text as a list of #PopplerRectangle
+        <doc xml:space="preserve">Obtains the layout of the text as a list of #PopplerRectangle
 This array must be freed with g_free () when done.
 
 The position in the array represents an offset in the text returned by
 poppler_page_get_text()</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE if the page contains text, %FALSE otherwise</doc>
+          <doc xml:space="preserve">%TRUE if the page contains text, %FALSE otherwise</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="rectangles"
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="container">
-            <doc xml:whitespace="preserve">return location for an array of #PopplerRectangle</doc>
+            <doc xml:space="preserve">return location for an array of #PopplerRectangle</doc>
             <array length="1" zero-terminated="0" c:type="PopplerRectangle**">
               <type name="Rectangle" c:type="PopplerRectangle*"/>
             </array>
@@ -3505,70 +4636,90 @@ poppler_page_get_text()</doc>
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="full">
-            <doc xml:whitespace="preserve">length of returned array</doc>
+            <doc xml:space="preserve">length of returned array</doc>
             <type name="guint" c:type="guint*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_thumbnail" c:identifier="poppler_page_get_thumbnail">
-        <doc xml:whitespace="preserve">Get the embedded thumbnail for the specified page.  If the document
+        <doc xml:space="preserve">Get the embedded thumbnail for the specified page.  If the document
 doesn't have an embedded thumbnail for the page, this function
 returns %NULL.</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">the tumbnail as a cairo_surface_t or %NULL if the document doesn't have a thumbnail for this page.</doc>
+          <doc xml:space="preserve">the tumbnail as a cairo_surface_t or %NULL if the document doesn't have a thumbnail for this page.</doc>
           <type name="cairo.Surface" c:type="cairo_surface_t*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">the #PopplerPage to get the thumbnail for</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="get_thumbnail_size"
               c:identifier="poppler_page_get_thumbnail_size">
-        <doc xml:whitespace="preserve">Returns %TRUE if @page has a thumbnail associated with it.  It also
+        <doc xml:space="preserve">Returns %TRUE if @page has a thumbnail associated with it.  It also
 fills in @width and @height with the width and height of the
 thumbnail.  The values of width and height are not changed if no
 appropriate thumbnail exists.</doc>
         <return-value transfer-ownership="none">
-          <doc xml:whitespace="preserve">%TRUE, if @page has a thumbnail associated with it.</doc>
+          <doc xml:space="preserve">%TRUE, if @page has a thumbnail associated with it.</doc>
           <type name="gboolean" c:type="gboolean"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">A #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="width"
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="full">
-            <doc xml:whitespace="preserve">return location for width</doc>
+            <doc xml:space="preserve">return location for width</doc>
             <type name="gint" c:type="int*"/>
           </parameter>
           <parameter name="height"
                      direction="out"
                      caller-allocates="0"
                      transfer-ownership="full">
-            <doc xml:whitespace="preserve">return location for height</doc>
+            <doc xml:space="preserve">return location for height</doc>
             <type name="gint" c:type="int*"/>
           </parameter>
         </parameters>
       </method>
       <method name="get_transition" c:identifier="poppler_page_get_transition">
-        <doc xml:whitespace="preserve">Returns the transition effect of @page</doc>
+        <doc xml:space="preserve">Returns the transition effect of @page</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a #PopplerPageTransition or %NULL.</doc>
+          <doc xml:space="preserve">a #PopplerPageTransition or %NULL.</doc>
           <type name="PageTransition" c:type="PopplerPageTransition*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="remove_annot"
               c:identifier="poppler_page_remove_annot"
               version="0.22">
-        <doc xml:whitespace="preserve">Removes annotation @annot from @page</doc>
+        <doc xml:space="preserve">Removes annotation @annot from @page</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="annot" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerAnnot to remove</doc>
+            <doc xml:space="preserve">a #PopplerAnnot to remove</doc>
             <type name="Annot" c:type="PopplerAnnot*"/>
           </parameter>
         </parameters>
       </method>
       <method name="render" c:identifier="poppler_page_render">
-        <doc xml:whitespace="preserve">Render the page to the given cairo context. This function
+        <doc xml:space="preserve">Render the page to the given cairo context. This function
 is for rendering a page that will be displayed. If you want
 to render a page that will be printed use
 poppler_page_render_for_printing() instead</doc>
@@ -3576,21 +4727,29 @@ poppler_page_render_for_printing() instead</doc>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">the page to render from</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="cairo" transfer-ownership="none">
-            <doc xml:whitespace="preserve">cairo context to render to</doc>
+            <doc xml:space="preserve">cairo context to render to</doc>
             <type name="cairo.Context" c:type="cairo_t*"/>
           </parameter>
         </parameters>
       </method>
       <method name="render_for_printing"
               c:identifier="poppler_page_render_for_printing">
-        <doc xml:whitespace="preserve">Render the page to the given cairo context for printing.</doc>
+        <doc xml:space="preserve">Render the page to the given cairo context for printing.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">the page to render from</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="cairo" transfer-ownership="none">
-            <doc xml:whitespace="preserve">cairo context to render to</doc>
+            <doc xml:space="preserve">cairo context to render to</doc>
             <type name="cairo.Context" c:type="cairo_t*"/>
           </parameter>
         </parameters>
@@ -3598,25 +4757,29 @@ poppler_page_render_for_printing() instead</doc>
       <method name="render_for_printing_with_options"
               c:identifier="poppler_page_render_for_printing_with_options"
               version="0.16">
-        <doc xml:whitespace="preserve">Render the page to the given cairo context for printing
+        <doc xml:space="preserve">Render the page to the given cairo context for printing
 with the specified options</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">the page to render from</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="cairo" transfer-ownership="none">
-            <doc xml:whitespace="preserve">cairo context to render to</doc>
+            <doc xml:space="preserve">cairo context to render to</doc>
             <type name="cairo.Context" c:type="cairo_t*"/>
           </parameter>
           <parameter name="options" transfer-ownership="none">
-            <doc xml:whitespace="preserve">print options</doc>
+            <doc xml:space="preserve">print options</doc>
             <type name="PrintFlags" c:type="PopplerPrintFlags"/>
           </parameter>
         </parameters>
       </method>
       <method name="render_selection"
               c:identifier="poppler_page_render_selection">
-        <doc xml:whitespace="preserve">Render the selection specified by @selection for @page to
+        <doc xml:space="preserve">Render the selection specified by @selection for @page to
 the given cairo context.  The selection will be rendered, using
 @glyph_color for the glyphs and @background_color for the selection
 background.
@@ -3628,123 +4791,159 @@ only render the changed part of the selection.</doc>
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">the #PopplerPage for which to render selection</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="cairo" transfer-ownership="none">
-            <doc xml:whitespace="preserve">cairo context to render to</doc>
+            <doc xml:space="preserve">cairo context to render to</doc>
             <type name="cairo.Context" c:type="cairo_t*"/>
           </parameter>
           <parameter name="selection" transfer-ownership="none">
-            <doc xml:whitespace="preserve">start and end point of selection as a rectangle</doc>
+            <doc xml:space="preserve">start and end point of selection as a rectangle</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
           <parameter name="old_selection" transfer-ownership="none">
-            <doc xml:whitespace="preserve">previous selection</doc>
+            <doc xml:space="preserve">previous selection</doc>
             <type name="Rectangle" c:type="PopplerRectangle*"/>
           </parameter>
           <parameter name="style" transfer-ownership="none">
-            <doc xml:whitespace="preserve">a #PopplerSelectionStyle</doc>
+            <doc xml:space="preserve">a #PopplerSelectionStyle</doc>
             <type name="SelectionStyle" c:type="PopplerSelectionStyle"/>
           </parameter>
           <parameter name="glyph_color" transfer-ownership="none">
-            <doc xml:whitespace="preserve">color to use for drawing glyphs</doc>
+            <doc xml:space="preserve">color to use for drawing glyphs</doc>
             <type name="Color" c:type="PopplerColor*"/>
           </parameter>
           <parameter name="background_color" transfer-ownership="none">
-            <doc xml:whitespace="preserve">color to use for the selection background</doc>
+            <doc xml:space="preserve">color to use for the selection background</doc>
             <type name="Color" c:type="PopplerColor*"/>
           </parameter>
         </parameters>
       </method>
       <method name="render_to_ps" c:identifier="poppler_page_render_to_ps">
-        <doc xml:whitespace="preserve">Render the page on a postscript file</doc>
+        <doc xml:space="preserve">Render the page on a postscript file</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
         <parameters>
+          <instance-parameter name="page" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPage</doc>
+            <type name="Page" c:type="PopplerPage*"/>
+          </instance-parameter>
           <parameter name="ps_file" transfer-ownership="none">
-            <doc xml:whitespace="preserve">the PopplerPSFile to render to</doc>
+            <doc xml:space="preserve">the PopplerPSFile to render to</doc>
             <type name="PSFile" c:type="PopplerPSFile*"/>
           </parameter>
         </parameters>
       </method>
       <property name="label" transfer-ownership="none">
-        <doc xml:whitespace="preserve">The label of the page or %NULL. See also poppler_page_get_label()</doc>
-        <type name="utf8"/>
+        <doc xml:space="preserve">The label of the page or %NULL. See also poppler_page_get_label()</doc>
+        <type name="utf8" c:type="gchar*"/>
       </property>
     </class>
     <enumeration name="PageLayout"
                  glib:type-name="PopplerPageLayout"
                  glib:get-type="poppler_page_layout_get_type"
                  c:type="PopplerPageLayout">
-      <doc xml:whitespace="preserve">Page layout types</doc>
+      <doc xml:space="preserve">Page layout types</doc>
       <member name="unset"
               value="0"
               c:identifier="POPPLER_PAGE_LAYOUT_UNSET"
-              glib:nick="unset"/>
+              glib:nick="unset">
+        <doc xml:space="preserve">no specific layout set</doc>
+      </member>
       <member name="single_page"
               value="1"
               c:identifier="POPPLER_PAGE_LAYOUT_SINGLE_PAGE"
-              glib:nick="single-page"/>
+              glib:nick="single-page">
+        <doc xml:space="preserve">one page at a time</doc>
+      </member>
       <member name="one_column"
               value="2"
               c:identifier="POPPLER_PAGE_LAYOUT_ONE_COLUMN"
-              glib:nick="one-column"/>
+              glib:nick="one-column">
+        <doc xml:space="preserve">pages in one column</doc>
+      </member>
       <member name="two_column_left"
               value="3"
               c:identifier="POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT"
-              glib:nick="two-column-left"/>
+              glib:nick="two-column-left">
+        <doc xml:space="preserve">pages in two columns with odd numbered pages on the left</doc>
+      </member>
       <member name="two_column_right"
               value="4"
               c:identifier="POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT"
-              glib:nick="two-column-right"/>
+              glib:nick="two-column-right">
+        <doc xml:space="preserve">pages in two columns with odd numbered pages on the right</doc>
+      </member>
       <member name="two_page_left"
               value="5"
               c:identifier="POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT"
-              glib:nick="two-page-left"/>
+              glib:nick="two-page-left">
+        <doc xml:space="preserve">two pages at a time with odd numbered pages on the left</doc>
+      </member>
       <member name="two_page_right"
               value="6"
               c:identifier="POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT"
-              glib:nick="two-page-right"/>
+              glib:nick="two-page-right">
+        <doc xml:space="preserve">two pages at a time with odd numbered pages on the right</doc>
+      </member>
     </enumeration>
     <enumeration name="PageMode"
                  glib:type-name="PopplerPageMode"
                  glib:get-type="poppler_page_mode_get_type"
                  c:type="PopplerPageMode">
-      <doc xml:whitespace="preserve">Page modes</doc>
+      <doc xml:space="preserve">Page modes</doc>
       <member name="unset"
               value="0"
               c:identifier="POPPLER_PAGE_MODE_UNSET"
-              glib:nick="unset"/>
+              glib:nick="unset">
+        <doc xml:space="preserve">no specific mode set</doc>
+      </member>
       <member name="none"
               value="1"
               c:identifier="POPPLER_PAGE_MODE_NONE"
-              glib:nick="none"/>
+              glib:nick="none">
+        <doc xml:space="preserve">neither document outline nor thumbnails visible</doc>
+      </member>
       <member name="use_outlines"
               value="2"
               c:identifier="POPPLER_PAGE_MODE_USE_OUTLINES"
-              glib:nick="use-outlines"/>
+              glib:nick="use-outlines">
+        <doc xml:space="preserve">document outline visible</doc>
+      </member>
       <member name="use_thumbs"
               value="3"
               c:identifier="POPPLER_PAGE_MODE_USE_THUMBS"
-              glib:nick="use-thumbs"/>
+              glib:nick="use-thumbs">
+        <doc xml:space="preserve">thumbnails visible</doc>
+      </member>
       <member name="full_screen"
               value="4"
               c:identifier="POPPLER_PAGE_MODE_FULL_SCREEN"
-              glib:nick="full-screen"/>
+              glib:nick="full-screen">
+        <doc xml:space="preserve">full-screen mode</doc>
+      </member>
       <member name="use_oc"
               value="5"
               c:identifier="POPPLER_PAGE_MODE_USE_OC"
-              glib:nick="use-oc"/>
+              glib:nick="use-oc">
+        <doc xml:space="preserve">layers panel visible</doc>
+      </member>
       <member name="use_attachments"
               value="6"
               c:identifier="POPPLER_PAGE_MODE_USE_ATTACHMENTS"
-              glib:nick="use-attachments"/>
+              glib:nick="use-attachments">
+        <doc xml:space="preserve">attachments panel visible</doc>
+      </member>
     </enumeration>
     <record name="PageTransition"
             c:type="PopplerPageTransition"
             glib:type-name="PopplerPageTransition"
             glib:get-type="poppler_page_transition_get_type"
             c:symbol-prefix="page_transition">
-      <doc xml:whitespace="preserve">A #PopplerPageTransition structures describes a visual transition
+      <doc xml:space="preserve">A #PopplerPageTransition structures describes a visual transition
 to use when moving between pages during a presentation</doc>
       <field name="type" writable="1">
         <type name="PageTransitionType" c:type="PopplerPageTransitionType"/>
@@ -3770,181 +4969,251 @@ to use when moving between pages during a presentation</doc>
         <type name="gboolean" c:type="gboolean"/>
       </field>
       <constructor name="new" c:identifier="poppler_page_transition_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerPageTransition</doc>
+        <doc xml:space="preserve">Creates a new #PopplerPageTransition</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerPageTransition, use poppler_page_transition_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerPageTransition, use poppler_page_transition_free() to free it</doc>
           <type name="PageTransition" c:type="PopplerPageTransition*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_page_transition_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @transition</doc>
+        <doc xml:space="preserve">Creates a copy of @transition</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @transition</doc>
+          <doc xml:space="preserve">a new allocated copy of @transition</doc>
           <type name="PageTransition" c:type="PopplerPageTransition*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="transition" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPageTransition to copy</doc>
+            <type name="PageTransition" c:type="PopplerPageTransition*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_page_transition_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerPageTransition</doc>
+        <doc xml:space="preserve">Frees the given #PopplerPageTransition</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="transition" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerPageTransition</doc>
+            <type name="PageTransition" c:type="PopplerPageTransition*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <enumeration name="PageTransitionAlignment"
                  glib:type-name="PopplerPageTransitionAlignment"
                  glib:get-type="poppler_page_transition_alignment_get_type"
                  c:type="PopplerPageTransitionAlignment">
-      <doc xml:whitespace="preserve">Page transition alignment types for #POPPLER_PAGE_TRANSITION_SPLIT
+      <doc xml:space="preserve">Page transition alignment types for #POPPLER_PAGE_TRANSITION_SPLIT
 and #POPPLER_PAGE_TRANSITION_BLINDS transition types</doc>
       <member name="horizontal"
               value="0"
               c:identifier="POPPLER_PAGE_TRANSITION_HORIZONTAL"
-              glib:nick="horizontal"/>
+              glib:nick="horizontal">
+        <doc xml:space="preserve">horizontal dimension</doc>
+      </member>
       <member name="vertical"
               value="1"
               c:identifier="POPPLER_PAGE_TRANSITION_VERTICAL"
-              glib:nick="vertical"/>
+              glib:nick="vertical">
+        <doc xml:space="preserve">vertical dimension</doc>
+      </member>
     </enumeration>
     <enumeration name="PageTransitionDirection"
                  glib:type-name="PopplerPageTransitionDirection"
                  glib:get-type="poppler_page_transition_direction_get_type"
                  c:type="PopplerPageTransitionDirection">
-      <doc xml:whitespace="preserve">Page transition direction types for #POPPLER_PAGE_TRANSITION_SPLIT,
+      <doc xml:space="preserve">Page transition direction types for #POPPLER_PAGE_TRANSITION_SPLIT,
 #POPPLER_PAGE_TRANSITION_BOX and #POPPLER_PAGE_TRANSITION_FLY transition types</doc>
       <member name="inward"
               value="0"
               c:identifier="POPPLER_PAGE_TRANSITION_INWARD"
-              glib:nick="inward"/>
+              glib:nick="inward">
+        <doc xml:space="preserve">inward from the edges of the page</doc>
+      </member>
       <member name="outward"
               value="1"
               c:identifier="POPPLER_PAGE_TRANSITION_OUTWARD"
-              glib:nick="outward"/>
+              glib:nick="outward">
+        <doc xml:space="preserve">outward from the center of the page</doc>
+      </member>
     </enumeration>
     <enumeration name="PageTransitionType"
                  glib:type-name="PopplerPageTransitionType"
                  glib:get-type="poppler_page_transition_type_get_type"
                  c:type="PopplerPageTransitionType">
-      <doc xml:whitespace="preserve">Page transition types</doc>
+      <doc xml:space="preserve">Page transition types</doc>
       <member name="replace"
               value="0"
               c:identifier="POPPLER_PAGE_TRANSITION_REPLACE"
-              glib:nick="replace"/>
+              glib:nick="replace">
+        <doc xml:space="preserve">the new page replace the old one</doc>
+      </member>
       <member name="split"
               value="1"
               c:identifier="POPPLER_PAGE_TRANSITION_SPLIT"
-              glib:nick="split"/>
+              glib:nick="split">
+        <doc xml:space="preserve">two lines sweep across the screen, revealing the new page</doc>
+      </member>
       <member name="blinds"
               value="2"
               c:identifier="POPPLER_PAGE_TRANSITION_BLINDS"
-              glib:nick="blinds"/>
+              glib:nick="blinds">
+        <doc xml:space="preserve">multiple lines, evenly spaced across the screen, synchronously sweep in the same direction to reveal the new page</doc>
+      </member>
       <member name="box"
               value="3"
               c:identifier="POPPLER_PAGE_TRANSITION_BOX"
-              glib:nick="box"/>
+              glib:nick="box">
+        <doc xml:space="preserve">a rectangular box sweeps inward from the edges of the page or outward from the center revealing the new page</doc>
+      </member>
       <member name="wipe"
               value="4"
               c:identifier="POPPLER_PAGE_TRANSITION_WIPE"
-              glib:nick="wipe"/>
+              glib:nick="wipe">
+        <doc xml:space="preserve">a single line sweeps across the screen from one edge to the other revealing the new page</doc>
+      </member>
       <member name="dissolve"
               value="5"
               c:identifier="POPPLER_PAGE_TRANSITION_DISSOLVE"
-              glib:nick="dissolve"/>
+              glib:nick="dissolve">
+        <doc xml:space="preserve">the old page dissolves gradually to reveal the new one</doc>
+      </member>
       <member name="glitter"
               value="6"
               c:identifier="POPPLER_PAGE_TRANSITION_GLITTER"
-              glib:nick="glitter"/>
+              glib:nick="glitter">
+        <doc xml:space="preserve">similar to #POPPLER_PAGE_TRANSITION_DISSOLVE, except that the effect sweeps across the page in a wide band moving from one side of the screen to the other</doc>
+      </member>
       <member name="fly"
               value="7"
               c:identifier="POPPLER_PAGE_TRANSITION_FLY"
-              glib:nick="fly"/>
+              glib:nick="fly">
+        <doc xml:space="preserve">changes are flown out or in to or from a location that is offscreen</doc>
+      </member>
       <member name="push"
               value="8"
               c:identifier="POPPLER_PAGE_TRANSITION_PUSH"
-              glib:nick="push"/>
+              glib:nick="push">
+        <doc xml:space="preserve">the old page slides off the screen while the new page slides in</doc>
+      </member>
       <member name="cover"
               value="9"
               c:identifier="POPPLER_PAGE_TRANSITION_COVER"
-              glib:nick="cover"/>
+              glib:nick="cover">
+        <doc xml:space="preserve">the new page slides on to the screen covering the old page</doc>
+      </member>
       <member name="uncover"
               value="10"
               c:identifier="POPPLER_PAGE_TRANSITION_UNCOVER"
-              glib:nick="uncover"/>
+              glib:nick="uncover">
+        <doc xml:space="preserve">the old page slides off the screen uncovering the new page</doc>
+      </member>
       <member name="fade"
               value="11"
               c:identifier="POPPLER_PAGE_TRANSITION_FADE"
-              glib:nick="fade"/>
+              glib:nick="fade">
+        <doc xml:space="preserve">the new page gradually becomes visible through the old one</doc>
+      </member>
     </enumeration>
     <bitfield name="Permissions"
               glib:type-name="PopplerPermissions"
               glib:get-type="poppler_permissions_get_type"
               c:type="PopplerPermissions">
-      <doc xml:whitespace="preserve">Permissions</doc>
+      <doc xml:space="preserve">Permissions</doc>
       <member name="ok_to_print"
               value="1"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_PRINT"
-              glib:nick="ok-to-print"/>
+              glib:nick="ok-to-print">
+        <doc xml:space="preserve">document can be printer</doc>
+      </member>
       <member name="ok_to_modify"
               value="2"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_MODIFY"
-              glib:nick="ok-to-modify"/>
+              glib:nick="ok-to-modify">
+        <doc xml:space="preserve">document contents can be modified</doc>
+      </member>
       <member name="ok_to_copy"
               value="4"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_COPY"
-              glib:nick="ok-to-copy"/>
+              glib:nick="ok-to-copy">
+        <doc xml:space="preserve">document can be copied</doc>
+      </member>
       <member name="ok_to_add_notes"
               value="8"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_ADD_NOTES"
-              glib:nick="ok-to-add-notes"/>
+              glib:nick="ok-to-add-notes">
+        <doc xml:space="preserve">annotations can added to the document</doc>
+      </member>
       <member name="ok_to_fill_form"
               value="16"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_FILL_FORM"
-              glib:nick="ok-to-fill-form"/>
+              glib:nick="ok-to-fill-form">
+        <doc xml:space="preserve">interactive form fields can be filled in</doc>
+      </member>
       <member name="ok_to_extract_contents"
               value="32"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS"
-              glib:nick="ok-to-extract-contents"/>
+              glib:nick="ok-to-extract-contents">
+        <doc xml:space="preserve">extract text and graphics (in support of accessibility to users with disabilities or for other purposes). Since 0.18</doc>
+      </member>
       <member name="ok_to_assemble"
               value="64"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_ASSEMBLE"
-              glib:nick="ok-to-assemble"/>
+              glib:nick="ok-to-assemble">
+        <doc xml:space="preserve">assemble the document (insert, rotate, or delete pages and create bookmarks or thumbnail images). Since 0.18</doc>
+      </member>
       <member name="ok_to_print_high_resolution"
               value="128"
               c:identifier="POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION"
-              glib:nick="ok-to-print-high-resolution"/>
+              glib:nick="ok-to-print-high-resolution">
+        <doc xml:space="preserve">document can be printer at high resolution. Since 0.18</doc>
+      </member>
       <member name="full"
               value="255"
               c:identifier="POPPLER_PERMISSIONS_FULL"
-              glib:nick="full"/>
+              glib:nick="full">
+        <doc xml:space="preserve">document permits all operations</doc>
+      </member>
     </bitfield>
     <bitfield name="PrintFlags"
               version="0.16"
               glib:type-name="PopplerPrintFlags"
               glib:get-type="poppler_print_flags_get_type"
               c:type="PopplerPrintFlags">
-      <doc xml:whitespace="preserve">Printing flags</doc>
+      <doc xml:space="preserve">Printing flags</doc>
       <member name="document"
               value="0"
               c:identifier="POPPLER_PRINT_DOCUMENT"
-              glib:nick="document"/>
+              glib:nick="document">
+        <doc xml:space="preserve">print main document contents</doc>
+      </member>
       <member name="markup_annots"
               value="1"
               c:identifier="POPPLER_PRINT_MARKUP_ANNOTS"
-              glib:nick="markup-annots"/>
+              glib:nick="markup-annots">
+        <doc xml:space="preserve">print document and markup annotations</doc>
+      </member>
       <member name="stamp_annots_only"
               value="2"
               c:identifier="POPPLER_PRINT_STAMP_ANNOTS_ONLY"
-              glib:nick="stamp-annots-only"/>
+              glib:nick="stamp-annots-only">
+        <doc xml:space="preserve">print document and only stamp annotations</doc>
+      </member>
       <member name="all"
               value="1"
               c:identifier="POPPLER_PRINT_ALL"
-              glib:nick="all"/>
+              glib:nick="all">
+        <doc xml:space="preserve">print main document contents and all markup annotations</doc>
+      </member>
     </bitfield>
     <record name="Rectangle"
             c:type="PopplerRectangle"
             glib:type-name="PopplerRectangle"
             glib:get-type="poppler_rectangle_get_type"
             c:symbol-prefix="rectangle">
-      <doc xml:whitespace="preserve">A #PopplerRectangle is used to describe
+      <doc xml:space="preserve">A #PopplerRectangle is used to describe
 locations on a page and bounding boxes</doc>
       <field name="x1" writable="1">
         <type name="gdouble" c:type="gdouble"/>
@@ -3959,43 +5228,61 @@ locations on a page and bounding boxes</doc>
         <type name="gdouble" c:type="gdouble"/>
       </field>
       <constructor name="new" c:identifier="poppler_rectangle_new">
-        <doc xml:whitespace="preserve">Creates a new #PopplerRectangle</doc>
+        <doc xml:space="preserve">Creates a new #PopplerRectangle</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerRectangle, use poppler_rectangle_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerRectangle, use poppler_rectangle_free() to free it</doc>
           <type name="Rectangle" c:type="PopplerRectangle*"/>
         </return-value>
       </constructor>
       <method name="copy" c:identifier="poppler_rectangle_copy">
-        <doc xml:whitespace="preserve">Creates a copy of @rectangle</doc>
+        <doc xml:space="preserve">Creates a copy of @rectangle</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @rectangle</doc>
+          <doc xml:space="preserve">a new allocated copy of @rectangle</doc>
           <type name="Rectangle" c:type="PopplerRectangle*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="rectangle" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerRectangle to copy</doc>
+            <type name="Rectangle" c:type="PopplerRectangle*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free" c:identifier="poppler_rectangle_free">
-        <doc xml:whitespace="preserve">Frees the given #PopplerRectangle</doc>
+        <doc xml:space="preserve">Frees the given #PopplerRectangle</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="rectangle" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerRectangle</doc>
+            <type name="Rectangle" c:type="PopplerRectangle*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <enumeration name="SelectionStyle"
                  glib:type-name="PopplerSelectionStyle"
                  glib:get-type="poppler_selection_style_get_type"
                  c:type="PopplerSelectionStyle">
-      <doc xml:whitespace="preserve">Selection styles</doc>
+      <doc xml:space="preserve">Selection styles</doc>
       <member name="glyph"
               value="0"
               c:identifier="POPPLER_SELECTION_GLYPH"
-              glib:nick="glyph"/>
+              glib:nick="glyph">
+        <doc xml:space="preserve">glyph is the minimum unit for selection</doc>
+      </member>
       <member name="word"
               value="1"
               c:identifier="POPPLER_SELECTION_WORD"
-              glib:nick="word"/>
+              glib:nick="word">
+        <doc xml:space="preserve">word is the minimum unit for selection</doc>
+      </member>
       <member name="line"
               value="2"
               c:identifier="POPPLER_SELECTION_LINE"
-              glib:nick="line"/>
+              glib:nick="line">
+        <doc xml:space="preserve">line is the minimum unit for selection</doc>
+      </member>
     </enumeration>
     <record name="TextAttributes"
             c:type="PopplerTextAttributes"
@@ -4003,7 +5290,7 @@ locations on a page and bounding boxes</doc>
             glib:type-name="PopplerTextAttributes"
             glib:get-type="poppler_text_attributes_get_type"
             c:symbol-prefix="text_attributes">
-      <doc xml:whitespace="preserve">A #PopplerTextAttributes is used to describe text attributes of a range of text</doc>
+      <doc xml:space="preserve">A #PopplerTextAttributes is used to describe text attributes of a range of text</doc>
       <field name="font_name" writable="1">
         <type name="utf8" c:type="gchar*"/>
       </field>
@@ -4025,67 +5312,95 @@ locations on a page and bounding boxes</doc>
       <constructor name="new"
                    c:identifier="poppler_text_attributes_new"
                    version="0.18">
-        <doc xml:whitespace="preserve">Creates a new #PopplerTextAttributes</doc>
+        <doc xml:space="preserve">Creates a new #PopplerTextAttributes</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new #PopplerTextAttributes, use poppler_text_attributes_free() to free it</doc>
+          <doc xml:space="preserve">a new #PopplerTextAttributes, use poppler_text_attributes_free() to free it</doc>
           <type name="TextAttributes" c:type="PopplerTextAttributes*"/>
         </return-value>
       </constructor>
       <method name="copy"
               c:identifier="poppler_text_attributes_copy"
               version="0.18">
-        <doc xml:whitespace="preserve">Creates a copy of @text_attrs</doc>
+        <doc xml:space="preserve">Creates a copy of @text_attrs</doc>
         <return-value transfer-ownership="full">
-          <doc xml:whitespace="preserve">a new allocated copy of @text_attrs</doc>
+          <doc xml:space="preserve">a new allocated copy of @text_attrs</doc>
           <type name="TextAttributes" c:type="PopplerTextAttributes*"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="text_attrs" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerTextAttributes to copy</doc>
+            <type name="TextAttributes" c:type="PopplerTextAttributes*"/>
+          </instance-parameter>
+        </parameters>
       </method>
       <method name="free"
               c:identifier="poppler_text_attributes_free"
               version="0.18">
-        <doc xml:whitespace="preserve">Frees the given #PopplerTextAttributes</doc>
+        <doc xml:space="preserve">Frees the given #PopplerTextAttributes</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
         </return-value>
+        <parameters>
+          <instance-parameter name="text_attrs" transfer-ownership="none">
+            <doc xml:space="preserve">a #PopplerTextAttributes</doc>
+            <type name="TextAttributes" c:type="PopplerTextAttributes*"/>
+          </instance-parameter>
+        </parameters>
       </method>
     </record>
     <bitfield name="ViewerPreferences"
               glib:type-name="PopplerViewerPreferences"
               glib:get-type="poppler_viewer_preferences_get_type"
               c:type="PopplerViewerPreferences">
-      <doc xml:whitespace="preserve">Viewer preferences</doc>
+      <doc xml:space="preserve">Viewer preferences</doc>
       <member name="unset"
               value="0"
               c:identifier="POPPLER_VIEWER_PREFERENCES_UNSET"
-              glib:nick="unset"/>
+              glib:nick="unset">
+        <doc xml:space="preserve">no preferences set</doc>
+      </member>
       <member name="hide_toolbar"
               value="1"
               c:identifier="POPPLER_VIEWER_PREFERENCES_HIDE_TOOLBAR"
-              glib:nick="hide-toolbar"/>
+              glib:nick="hide-toolbar">
+        <doc xml:space="preserve">hider toolbars when document is active</doc>
+      </member>
       <member name="hide_menubar"
               value="2"
               c:identifier="POPPLER_VIEWER_PREFERENCES_HIDE_MENUBAR"
-              glib:nick="hide-menubar"/>
+              glib:nick="hide-menubar">
+        <doc xml:space="preserve">hide menu bar when document is active</doc>
+      </member>
       <member name="hide_windowui"
               value="4"
               c:identifier="POPPLER_VIEWER_PREFERENCES_HIDE_WINDOWUI"
-              glib:nick="hide-windowui"/>
+              glib:nick="hide-windowui">
+        <doc xml:space="preserve">hide UI elements in document's window</doc>
+      </member>
       <member name="fit_window"
               value="8"
               c:identifier="POPPLER_VIEWER_PREFERENCES_FIT_WINDOW"
-              glib:nick="fit-window"/>
+              glib:nick="fit-window">
+        <doc xml:space="preserve">resize document's window to fit the size of the first displayed page</doc>
+      </member>
       <member name="center_window"
               value="16"
               c:identifier="POPPLER_VIEWER_PREFERENCES_CENTER_WINDOW"
-              glib:nick="center-window"/>
+              glib:nick="center-window">
+        <doc xml:space="preserve">position the document's window in the center of the screen</doc>
+      </member>
       <member name="display_doc_title"
               value="32"
               c:identifier="POPPLER_VIEWER_PREFERENCES_DISPLAY_DOC_TITLE"
-              glib:nick="display-doc-title"/>
+              glib:nick="display-doc-title">
+        <doc xml:space="preserve">display document title in window's title bar</doc>
+      </member>
       <member name="direction_rtl"
               value="64"
               c:identifier="POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL"
-              glib:nick="direction-rtl"/>
+              glib:nick="direction-rtl">
+        <doc xml:space="preserve">the predominant reading order for text is right to left</doc>
+      </member>
     </bitfield>
     <record name="_AttachmentClass" c:type="_PopplerAttachmentClass">
       <field name="parent_class" writable="1">
@@ -4095,19 +5410,19 @@ locations on a page and bounding boxes</doc>
     <function name="date_parse"
               c:identifier="poppler_date_parse"
               version="0.12">
-      <doc xml:whitespace="preserve">Parses a PDF format date string and converts it to a #time_t. Returns #FALSE
+      <doc xml:space="preserve">Parses a PDF format date string and converts it to a #time_t. Returns #FALSE
 if the parsing fails or the input string is not a valid PDF format date string</doc>
       <return-value transfer-ownership="none">
-        <doc xml:whitespace="preserve">#TRUE, if @timet was set</doc>
+        <doc xml:space="preserve">#TRUE, if @timet was set</doc>
         <type name="gboolean" c:type="gboolean"/>
       </return-value>
       <parameters>
         <parameter name="date" transfer-ownership="none">
-          <doc xml:whitespace="preserve">string to parse</doc>
+          <doc xml:space="preserve">string to parse</doc>
           <type name="utf8" c:type="const gchar*"/>
         </parameter>
         <parameter name="timet" transfer-ownership="none">
-          <doc xml:whitespace="preserve">an uninitialized #time_t</doc>
+          <doc xml:space="preserve">an uninitialized #time_t</doc>
           <type name="glong" c:type="time_t*"/>
         </parameter>
       </parameters>
@@ -4120,16 +5435,16 @@ if the parsing fails or the input string is not a valid PDF format date string</
       </return-value>
     </function>
     <function name="get_backend" c:identifier="poppler_get_backend">
-      <doc xml:whitespace="preserve">Returns the backend compiled into the poppler library.</doc>
+      <doc xml:space="preserve">Returns the backend compiled into the poppler library.</doc>
       <return-value transfer-ownership="none">
-        <doc xml:whitespace="preserve">The backend used by poppler</doc>
+        <doc xml:space="preserve">The backend used by poppler</doc>
         <type name="Backend" c:type="PopplerBackend"/>
       </return-value>
     </function>
     <function name="get_version" c:identifier="poppler_get_version">
-      <doc xml:whitespace="preserve">Returns the version of poppler in use.  This result is not to be freed.</doc>
+      <doc xml:space="preserve">Returns the version of poppler in use.  This result is not to be freed.</doc>
       <return-value transfer-ownership="none">
-        <doc xml:whitespace="preserve">the version of poppler.</doc>
+        <doc xml:space="preserve">the version of poppler.</doc>
         <type name="utf8" c:type="const char*"/>
       </return-value>
     </function>
diff --git a/glib/demo/Makefile.am b/glib/demo/Makefile.am
index 28fc22d2..8120bc90 100644
--- a/glib/demo/Makefile.am
+++ b/glib/demo/Makefile.am
@@ -3,7 +3,6 @@ INCLUDES = 					\
 	-I$(top_builddir)/glib			\
 	$(GTK_TEST_CFLAGS)			\
 	$(POPPLER_GLIB_DISABLE_DEPRECATED)	\
-	-DGTK_DISABLE_DEPRECATED		\
 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
 
 AM_LDFLAGS = @auto_import_flags@
diff --git a/glib/demo/Makefile.in b/glib/demo/Makefile.in
index 4263206e..d2274187 100644
--- a/glib/demo/Makefile.in
+++ b/glib/demo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,9 +80,10 @@ build_triplet = @build@
 host_triplet = @host@
 @BUILD_GTK_TEST_TRUE@bin_PROGRAMS = poppler-glib-demo$(EXEEXT)
 subdir = glib/demo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -87,6 +115,19 @@ poppler_glib_demo_DEPENDENCIES =  \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -99,17 +140,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -118,17 +158,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(poppler_glib_demo_SOURCES)
 DIST_SOURCES = $(poppler_glib_demo_SOURCES)
 am__can_run_installinfo = \
@@ -136,6 +175,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -231,6 +287,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -265,10 +324,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -290,13 +355,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -344,7 +409,6 @@ INCLUDES = \
 	-I$(top_builddir)/glib			\
 	$(GTK_TEST_CFLAGS)			\
 	$(POPPLER_GLIB_DISABLE_DEPRECATED)	\
-	-DGTK_DISABLE_DEPRECATED		\
 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
 
 AM_LDFLAGS = @auto_import_flags@
@@ -433,10 +497,12 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -457,7 +523,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -470,6 +537,7 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 poppler-glib-demo$(EXEEXT): $(poppler_glib_demo_OBJECTS) $(poppler_glib_demo_DEPENDENCIES) $(EXTRA_poppler_glib_demo_DEPENDENCIES) 
 	@rm -f poppler-glib-demo$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(poppler_glib_demo_OBJECTS) $(poppler_glib_demo_LDADD) $(LIBS)
@@ -547,26 +615,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -578,15 +635,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -595,6 +648,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -738,19 +806,19 @@ uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/glib/demo/find.c b/glib/demo/find.c
index 664c5974..8e919520 100644
--- a/glib/demo/find.c
+++ b/glib/demo/find.c
@@ -507,7 +507,11 @@ pgd_find_create_widget (PopplerDocument *document)
                           demo);
 
         swindow = gtk_scrolled_window_new (NULL, NULL);
+#if GTK_CHECK_VERSION(3, 7, 8)
+        gtk_container_add(GTK_CONTAINER(swindow), demo->darea);
+#else
         gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swindow), demo->darea);
+#endif
         gtk_widget_show (demo->darea);
 
         gtk_paned_add2 (GTK_PANED (hpaned), swindow);
diff --git a/glib/demo/images.c b/glib/demo/images.c
index 3623fd73..7057f9c8 100644
--- a/glib/demo/images.c
+++ b/glib/demo/images.c
@@ -95,8 +95,12 @@ pgd_image_view_new ()
 			  (gpointer)swindow);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(3, 7, 8)
+	gtk_container_add(GTK_CONTAINER(swindow), darea);
+#else
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swindow),
 					       darea);
+#endif
 	gtk_widget_show (darea);
 
 	return swindow;
diff --git a/glib/demo/layers.c b/glib/demo/layers.c
index 023da20e..7931d211 100644
--- a/glib/demo/layers.c
+++ b/glib/demo/layers.c
@@ -265,7 +265,11 @@ pgd_layers_create_viewer (PgdLayersDemo *demo)
 	swindow = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(3, 7, 8)
+	gtk_container_add(GTK_CONTAINER(swindow), demo->darea);
+#else
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swindow), demo->darea);
+#endif
 	gtk_widget_show (demo->darea);
 
 	gtk_box_pack_start (GTK_BOX (vbox), swindow, TRUE, TRUE, 0);
diff --git a/glib/demo/render.c b/glib/demo/render.c
index 354b8628..52f96ffd 100644
--- a/glib/demo/render.c
+++ b/glib/demo/render.c
@@ -427,8 +427,12 @@ pgd_render_create_widget (PopplerDocument *document)
 	demo->swindow = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (demo->swindow),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(3, 7, 8)
+	gtk_container_add(GTK_CONTAINER(demo->swindow), demo->darea);
+#else
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (demo->swindow),
 					       demo->darea);
+#endif
 	gtk_widget_show (demo->darea);
 
 	gtk_box_pack_start (GTK_BOX (vbox), demo->swindow, TRUE, TRUE, 0);
diff --git a/glib/demo/selections.c b/glib/demo/selections.c
index 7ff17cdf..567a8806 100644
--- a/glib/demo/selections.c
+++ b/glib/demo/selections.c
@@ -671,8 +671,12 @@ pgd_selections_create_widget (PopplerDocument *document)
 	demo->swindow = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (demo->swindow),
 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(3, 7, 8)
+	gtk_container_add(GTK_CONTAINER(demo->swindow), demo->darea);
+#else
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (demo->swindow),
 					       demo->darea);
+#endif
 	gtk_widget_show (demo->darea);
 
 	gtk_box_pack_start (GTK_BOX (vbox), demo->swindow, TRUE, TRUE, 0);
diff --git a/glib/poppler-input-stream.cc b/glib/poppler-input-stream.cc
index 99fcb6fc..041cc2e0 100644
--- a/glib/poppler-input-stream.cc
+++ b/glib/poppler-input-stream.cc
@@ -21,7 +21,7 @@
 #include "poppler-input-stream.h"
 
 PopplerInputStream::PopplerInputStream(GInputStream *inputStreamA, GCancellable *cancellableA,
-                                       Guint startA, GBool limitedA, Guint lengthA, Object *dictA)
+                                       Goffset startA, GBool limitedA, Goffset lengthA, Object *dictA)
   : BaseStream(dictA, lengthA)
 {
   inputStream = (GInputStream *)g_object_ref(inputStreamA);
@@ -41,8 +41,12 @@ PopplerInputStream::~PopplerInputStream()
     g_object_unref(cancellable);
 }
 
-Stream *PopplerInputStream::makeSubStream(Guint startA, GBool limitedA,
-                                          Guint lengthA, Object *dictA)
+BaseStream *PopplerInputStream::copy() {
+  return new PopplerInputStream(inputStream, cancellable, start, limited, length, &dict);
+}
+
+Stream *PopplerInputStream::makeSubStream(Goffset startA, GBool limitedA,
+                                          Goffset lengthA, Object *dictA)
 {
   return new PopplerInputStream(inputStream, cancellable, startA, limitedA, lengthA, dictA);
 }
@@ -66,7 +70,7 @@ void PopplerInputStream::close()
   saved = gFalse;
 }
 
-void PopplerInputStream::setPos(Guint pos, int dir)
+void PopplerInputStream::setPos(Goffset pos, int dir)
 {
   Guint size;
   GSeekable *seekable = G_SEEKABLE(inputStream);
@@ -86,7 +90,7 @@ void PopplerInputStream::setPos(Guint pos, int dir)
   bufPtr = bufEnd = buf;
 }
 
-void PopplerInputStream::moveStart(int delta)
+void PopplerInputStream::moveStart(Goffset delta)
 {
   start += delta;
   bufPtr = bufEnd = buf;
diff --git a/glib/poppler-input-stream.h b/glib/poppler-input-stream.h
index 0d795f41..74c198f7 100644
--- a/glib/poppler-input-stream.h
+++ b/glib/poppler-input-stream.h
@@ -31,10 +31,11 @@ class PopplerInputStream: public BaseStream {
 public:
 
   PopplerInputStream(GInputStream *inputStream, GCancellable *cancellableA,
-                     Guint startA, GBool limitedA, Guint lengthA, Object *dictA);
+                     Goffset startA, GBool limitedA, Goffset lengthA, Object *dictA);
   virtual ~PopplerInputStream();
-  virtual Stream *makeSubStream(Guint start, GBool limited,
-                                Guint lengthA, Object *dictA);
+  virtual BaseStream *copy();
+  virtual Stream *makeSubStream(Goffset start, GBool limited,
+                                Goffset lengthA, Object *dictA);
   virtual StreamKind getKind() { return strWeird; }
   virtual void reset();
   virtual void close();
@@ -42,10 +43,10 @@ public:
     { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
   virtual int lookChar()
     { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
-  virtual int getPos() { return bufPos + (bufPtr - buf); }
-  virtual void setPos(Guint pos, int dir = 0);
-  virtual Guint getStart() { return start; }
-  virtual void moveStart(int delta);
+  virtual Goffset getPos() { return bufPos + (bufPtr - buf); }
+  virtual void setPos(Goffset pos, int dir = 0);
+  virtual Goffset getStart() { return start; }
+  virtual void moveStart(Goffset delta);
 
   virtual int getUnfilteredChar() { return getChar(); }
   virtual void unfilteredReset() { reset(); }
@@ -59,12 +60,12 @@ private:
 
   GInputStream *inputStream;
   GCancellable *cancellable;
-  Guint start;
+  Goffset start;
   GBool limited;
   char buf[inputStreamBufSize];
   char *bufPtr;
   char *bufEnd;
-  Guint bufPos;
+  Goffset bufPos;
   int savePos;
   GBool saved;
 };
diff --git a/glib/poppler-page.cc b/glib/poppler-page.cc
index b88c70bf..9115b786 100644
--- a/glib/poppler-page.cc
+++ b/glib/poppler-page.cc
@@ -877,6 +877,7 @@ poppler_page_find_text_with_options (PopplerPage     *page,
   double height;
   TextPage *text_dev;
   gboolean backwards;
+  gboolean start_at_last = FALSE;
 
   g_return_val_if_fail (POPPLER_IS_PAGE (page), NULL);
   g_return_val_if_fail (text != NULL, NULL);
@@ -893,7 +894,8 @@ poppler_page_find_text_with_options (PopplerPage     *page,
 
   while (text_dev->findText (ucs4, ucs4_len,
                              gFalse, gTrue, // startAtTop, stopAtBottom
-                             gTrue, gFalse, // startAtLast, stopAtLast
+                             start_at_last,
+                             gFalse, //stopAtLast
                              options & POPPLER_FIND_CASE_SENSITIVE,
                              backwards,
                              options & POPPLER_FIND_WHOLE_WORDS_ONLY,
@@ -905,6 +907,7 @@ poppler_page_find_text_with_options (PopplerPage     *page,
       match->x2 = xMax;
       match->y2 = height - yMin;
       matches = g_list_prepend (matches, match);
+      start_at_last = TRUE;
     }
 
   g_free (ucs4);
@@ -1976,66 +1979,66 @@ poppler_page_get_text_layout (PopplerPage       *page,
                               guint             *n_rectangles)
 {
   TextPage *text;
-  TextWordList *wordlist;
-  TextWord *word, *nextword;
   PopplerRectangle *rect;
-  int i, j;
+  PDFRectangle selection;
+  int i, j, k;
   guint offset = 0;
   guint n_rects = 0;
   gdouble x1, y1, x2, y2;
   gdouble x3, y3, x4, y4;
+  GooList **word_list;
+  int n_lines;
 
   g_return_val_if_fail (POPPLER_IS_PAGE (page), FALSE);
 
   *n_rectangles = 0;
 
+  poppler_page_get_size (page, &selection.x2, &selection.y2);
   text = poppler_page_get_text_page (page);
-  wordlist = text->makeWordList (gFalse);
+  word_list = text->getSelectionWords (&selection, selectionStyleGlyph, &n_lines);
+  if (!word_list)
+          return FALSE;
 
-  if (wordlist->getLength () <= 0)
+  n_rects += n_lines - 1;
+  for (i = 0; i < n_lines; i++)
     {
-      delete wordlist;
-      return FALSE;
-    }
-
-  // Getting the array size
-  for (i = 0; i < wordlist->getLength (); i++)
-    {
-      word = wordlist->get (i);
-      n_rects += word->getLength ();
-      if (!word->getNext () || word->getSpaceAfter ())
-	n_rects++;
+      GooList *line_words = word_list[i];
+      n_rects += line_words->getLength() - 1;
+      for (j = 0; j < line_words->getLength(); j++)
+        {
+          TextWord *word = (TextWord *)line_words->get(j);
+          n_rects += word->getLength();
+        }
     }
-  n_rects--;
 
-  *n_rectangles = n_rects;
   *rectangles = g_new (PopplerRectangle, n_rects);
+  *n_rectangles = n_rects;
 
-  // Calculating each char position
-  for (i = 0; i < wordlist->getLength (); i++)
+  for (i = 0; i < n_lines; i++)
     {
-      word = wordlist->get (i);
-      for (j = 0; j < word->getLength (); j++)
+      GooList *line_words = word_list[i];
+      for (j = 0; j < line_words->getLength(); j++)
         {
+          TextWord *word = (TextWord *)line_words->get(j);
+          for (k = 0; k < word->getLength(); k++)
+            {
+              rect = *rectangles + offset;
+              word->getCharBBox (k,
+                                 &(rect->x1),
+                                 &(rect->y1),
+                                 &(rect->x2),
+                                 &(rect->y2));
+              offset++;
+            }
+
           rect = *rectangles + offset;
-	  word->getCharBBox (j,
-			     &(rect->x1),
-			     &(rect->y1),
-			     &(rect->x2),
-			     &(rect->y2));
-	  offset++;
-	}
+          word->getBBox (&x1, &y1, &x2, &y2);
 
-      // adding spaces and break lines
-      rect = *rectangles + offset;
-      word->getBBox (&x1, &y1, &x2, &y2);
+          if (j < line_words->getLength() - 1)
+            {
+              TextWord *next_word = (TextWord *)line_words->get(j + 1);
 
-      nextword = word->getNext ();
-      if (nextword)
-        {
-	  if (word->getSpaceAfter ())
-	    {
-	      nextword->getBBox (&x3, &y3, &x4, &y4);
+              next_word->getBBox(&x3, &y3, &x4, &y4);
 	      // space is from one word to other and with the same height as
 	      // first word.
 	      rect->x1 = x2;
@@ -2043,20 +2046,23 @@ poppler_page_get_text_layout (PopplerPage       *page,
 	      rect->x2 = x3;
 	      rect->y2 = y2;
 	      offset++;
-	    }
-	  }
-      else if (offset < n_rects)
+            }
+        }
+
+      if (i < n_lines - 1 && offset > 0)
         {
-	  // end of line
-	  rect->x1 = x2;
-	  rect->y1 = y2;
-	  rect->x2 = x2;
-	  rect->y2 = y2;
-	  offset++;
-	}
+          // end of line
+          rect->x1 = x2;
+          rect->y1 = y2;
+          rect->x2 = x2;
+          rect->y2 = y2;
+          offset++;
+        }
+
+      delete line_words;
     }
 
-  delete wordlist;
+  gfree (word_list);
 
   return TRUE;
 }
@@ -2119,53 +2125,62 @@ GList *
 poppler_page_get_text_attributes (PopplerPage *page)
 {
   TextPage *text;
-  TextWordList *wordlist;
+  PDFRectangle selection;
+  GooList **word_list;
+  int n_lines;
   PopplerTextAttributes *attrs = NULL;
-  gint i, offset = 0;
+  TextWord *word, *prev_word = NULL;
+  gint word_i, prev_word_i;
+  gint i, j;
+  gint offset = 0;
   GList *attributes = NULL;
 
   g_return_val_if_fail (POPPLER_IS_PAGE (page), NULL);
 
+  poppler_page_get_size (page, &selection.x2, &selection.y2);
   text = poppler_page_get_text_page (page);
-  wordlist = text->makeWordList (gFalse);
+  word_list = text->getSelectionWords (&selection, selectionStyleGlyph, &n_lines);
+  if (!word_list)
+          return NULL;
 
-  if (wordlist->getLength () <= 0)
+  for (i = 0; i < n_lines; i++)
     {
-      delete wordlist;
-      return NULL;
-    }
-
-  TextWord *word, *prev_word = NULL;
-  gint word_i, prev_word_i;
+      GooList *line_words = word_list[i];
+      for (j = 0; j < line_words->getLength(); j++)
+        {
+          word = (TextWord *)line_words->get(j);
 
-  // Calculating each word attributes
-  for (i = 0; i < wordlist->getLength (); i++)
-    {
-      word = wordlist->get (i);
+          for (word_i = 0; word_i < word->getLength (); word_i++)
+            {
+              if (!prev_word || !word_text_attributes_equal (word, word_i, prev_word, prev_word_i))
+                {
+                  attrs = poppler_text_attributes_new_from_word (word, word_i);
+                  attrs->start_index = offset;
+                  attributes = g_list_prepend (attributes, attrs);
+                }
+              attrs->end_index = offset;
+              offset++;
+              prev_word = word;
+              prev_word_i = word_i;
+            }
 
-      for (word_i = 0; word_i < word->getLength (); word_i++)
-	{
-	  if (!prev_word || !word_text_attributes_equal (word, word_i, prev_word, prev_word_i))
+          if (j < line_words->getLength() - 1)
             {
-              attrs = poppler_text_attributes_new_from_word (word, word_i);
-              attrs->start_index = offset;
-              attributes = g_list_prepend (attributes, attrs);
+              attrs->end_index = offset;
+              offset++;
             }
-	  attrs->end_index = offset;
-	  offset++;
-	  prev_word = word;
-	  prev_word_i = word_i;
-	}
-      if (!word->getNext () || word->getSpaceAfter ())
+        }
+
+      if (i < n_lines - 1)
         {
           attrs->end_index = offset;
           offset++;
         }
+
+      delete line_words;
     }
-  if (attrs)
-    attrs->end_index--;
 
-  delete wordlist;
+  gfree (word_list);
 
   return g_list_reverse(attributes);
 }
diff --git a/glib/reference/Makefile.in b/glib/reference/Makefile.in
index c08c3013..a5807007 100644
--- a/glib/reference/Makefile.in
+++ b/glib/reference/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,23 +20,51 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,11 +83,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(srcdir)/version.xml.in
 subdir = glib/reference
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -74,12 +101,18 @@ CONFIG_HEADER = $(top_builddir)/config.h \
 	$(top_builddir)/poppler/poppler-config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -87,6 +120,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -180,6 +214,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -214,10 +251,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -239,13 +282,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -414,6 +457,37 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
 .SUFFIXES:
@@ -456,11 +530,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
 
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -601,18 +675,18 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distclean-local distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
+	clean-libtool clean-local cscopelist-am ctags-am dist-hook \
+	distclean distclean-generic distclean-libtool distclean-local \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-data-local \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-local
 
 
 @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -622,32 +696,25 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    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 -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	fi
-	@touch setup-build.stamp
-
-#### scan ####
+	$(AM_V_at)touch setup-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_SCAN)_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"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	    if test "$(?)" = "0"; then \
@@ -662,32 +729,25 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### 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'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
-#### html ####
-
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -708,16 +768,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
-
-#### pdf ####
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -734,7 +790,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
@@ -749,7 +805,7 @@ distclean-local:
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -785,7 +841,7 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
 @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
 @ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
 @ENABLE_GTK_DOC_FALSE@	@false
diff --git a/glib/reference/html/PopplerAnnot.html b/glib/reference/html/PopplerAnnot.html
index fc2c4d40..41e97e93 100644
--- a/glib/reference/html/PopplerAnnot.html
+++ b/glib/reference/html/PopplerAnnot.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerLayer.html" title="PopplerLayer">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -204,6 +204,118 @@ enum                <a class="link" href="PopplerAnnot.html#PopplerAnnotFreeText
   POPPLER_ANNOT_3D
 } PopplerAnnotType;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-ANNOT-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_UNKNOWN</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-LINK:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_LINK</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FREE-TEXT:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FREE_TEXT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-LINE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_LINE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-SQUARE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_SQUARE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-CIRCLE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_CIRCLE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-POLYGON:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_POLYGON</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-POLY-LINE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_POLY_LINE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-HIGHLIGHT:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_HIGHLIGHT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-UNDERLINE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_UNDERLINE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-SQUIGGLY:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_SQUIGGLY</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-STRIKE-OUT:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_STRIKE_OUT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-STAMP:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_STAMP</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-CARET:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_CARET</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-INK:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_INK</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-POPUP:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_POPUP</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FILE-ATTACHMENT:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FILE_ATTACHMENT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-SOUND:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_SOUND</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-MOVIE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_MOVIE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-WIDGET:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_WIDGET</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-SCREEN:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_SCREEN</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-PRINTER-MARK:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_PRINTER_MARK</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TRAP-NET:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TRAP_NET</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-WATERMARK:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_WATERMARK</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-3D:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_3D</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -222,6 +334,58 @@ enum                <a class="link" href="PopplerAnnot.html#PopplerAnnotFreeText
   POPPLER_ANNOT_FLAG_LOCKED_CONTENTS = 1 &lt;&lt; 9
 } PopplerAnnotFlag;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_UNKNOWN</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-INVISIBLE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_INVISIBLE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-HIDDEN:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_HIDDEN</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-PRINT:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_PRINT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-NO-ZOOM:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_NO_ZOOM</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-NO-ROTATE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_NO_ROTATE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-NO-VIEW:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_NO_VIEW</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-READ-ONLY:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_READ_ONLY</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-LOCKED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_LOCKED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-TOGGLE-NO-VIEW:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_TOGGLE_NO_VIEW</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FLAG-LOCKED-CONTENTS:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FLAG_LOCKED_CONTENTS</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -231,6 +395,22 @@ enum                <a class="link" href="PopplerAnnot.html#PopplerAnnotFreeText
   POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN
 } PopplerAnnotExternalDataType;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-3D:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -240,6 +420,22 @@ enum                <a class="link" href="PopplerAnnot.html#PopplerAnnotFreeText
   POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP
 } PopplerAnnotMarkupReplyType;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-ANNOT-MARKUP-REPLY-TYPE-R:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_MARKUP_REPLY_TYPE_R</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-MARKUP-REPLY-TYPE-GROUP:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -255,6 +451,46 @@ enum                <a class="link" href="PopplerAnnot.html#PopplerAnnotFreeText
   POPPLER_ANNOT_TEXT_STATE_UNKNOWN
 } PopplerAnnotTextState;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-MARKED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_MARKED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-UNMARKED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_UNMARKED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-ACCEPTED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_ACCEPTED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-REJECTED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_REJECTED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-CANCELLED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_CANCELLED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-COMPLETED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_COMPLETED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-NONE:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_NONE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-TEXT-STATE-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_TEXT_STATE_UNKNOWN</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -279,6 +515,26 @@ enum                <a class="link" href="PopplerAnnot.html#PopplerAnnotFreeText
   POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED
 } PopplerAnnotFreeTextQuadding;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FREE-TEXT-QUADDING-LEFT-JUSTIFIED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FREE-TEXT-QUADDING-CENTERED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ANNOT-FREE-TEXT-QUADDING-RIGHT-JUSTIFIED:CAPS"></a><span class="term"><code class="literal">POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -287,8 +543,11 @@ enum                <a class="link" href="PopplerAnnot.html#PopplerAnnotFreeText
 <p>
 Gets the type of <em class="parameter"><code>poppler_annot</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -311,8 +570,11 @@ Gets the type of <em class="parameter"><code>poppler_annot</code></em>
 Retrieves the flag field specifying various characteristics of the
 <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -333,8 +595,11 @@ Retrieves the flag field specifying various characteristics of the
 <p>
 Retrieves the name of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -356,8 +621,11 @@ be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-
 <p>
 Returns the page index to which <em class="parameter"><code>poppler_annot</code></em> is associated, or -1 if unknown
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -379,8 +647,11 @@ Returns the page index to which <em class="parameter"><code>poppler_annot</code>
 <p>
 Retrieves the color of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -403,8 +674,11 @@ Retrieves the color of <em class="parameter"><code>poppler_annot</code></em>.
 <p>
 Sets the color of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -427,8 +701,11 @@ Sets the color of <em class="parameter"><code>poppler_annot</code></em>.
 <p>
 Retrieves the contents of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -452,8 +729,11 @@ must be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Me
 Sets the contents of <em class="parameter"><code>poppler_annot</code></em> to the given value,
 replacing the current contents.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -477,8 +757,11 @@ Retrieves the last modification data of <em class="parameter"><code>poppler_anno
 string will be either a PDF format date or a text string.
 See also #<a class="link" href="poppler-poppler.html#poppler-date-parse" title="poppler_date_parse ()"><code class="function">poppler_date_parse()</code></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -500,8 +783,11 @@ See also #<a class="link" href="poppler-poppler.html#poppler-date-parse" title="
 <p>
 Retrieves the label text of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -523,8 +809,11 @@ Retrieves the label text of <em class="parameter"><code>poppler_annot</code></em
 <p>
 Sets the label text of <em class="parameter"><code>poppler_annot</code></em>, replacing the current one
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -547,8 +836,11 @@ Sets the label text of <em class="parameter"><code>poppler_annot</code></em>, re
 <p>
 Retrives the subject text of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -569,8 +861,11 @@ Retrives the subject text of <em class="parameter"><code>poppler_annot</code></e
 <p>
 Retrieves the opacity value of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -595,8 +890,11 @@ Sets the opacity of <em class="parameter"><code>poppler_annot</code></em>. This
 all visible elements of <em class="parameter"><code>poppler_annot</code></em> in its closed state,
 but not to the pop-up window that appears when it's openened
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -618,8 +916,11 @@ but not to the pop-up window that appears when it's openened
 <p>
 Return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the markup annotation has a popup window associated
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -644,8 +945,11 @@ Return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macro
 Associates a new popup window for editing contents of <em class="parameter"><code>poppler_annot</code></em>.
 Popup window shall be displayed by viewers at <em class="parameter"><code>popup_rect</code></em> on the page.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -669,8 +973,11 @@ Popup window shall be displayed by viewers at <em class="parameter"><code>popup_
 <p>
 Retrieves the state of the popup window related to <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -694,8 +1001,11 @@ other case.</td>
 <p>
 Sets the state of the popup window related to <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -719,8 +1029,11 @@ Sets the state of the popup window related to <em class="parameter"><code>popple
 <p>
 Retrieves the rectangle of the popup window related to <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -748,8 +1061,11 @@ Retrieves the rectangle of the popup window related to <em class="parameter"><co
 <p>
 Returns the date and time when the annotation was created
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -773,8 +1089,11 @@ when the annotation was created, or <a href="http://library.gnome.org/devel/glib
 <p>
 Gets the external data type of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -797,8 +1116,11 @@ Gets the external data type of <em class="parameter"><code>poppler_annot</code><
 <p>
 Gets the reply type of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -823,8 +1145,11 @@ Creates a new Text annotation that will be
 located on <em class="parameter"><code>rect</code></em> when added to a page. See
 <a class="link" href="PopplerPage.html#poppler-page-add-annot" title="poppler_page_add_annot ()"><code class="function">poppler_page_add_annot()</code></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>doc</code></em> :</span></p></td>
@@ -851,8 +1176,11 @@ located on <em class="parameter"><code>rect</code></em> when added to a page. Se
 <p>
 Gets name of the icon of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -929,8 +1257,11 @@ Gets name of the icon of <em class="parameter"><code>poppler_annot</code></em>.
 Sets the icon of <em class="parameter"><code>poppler_annot</code></em>. The following predefined
 icons are currently supported:
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="PopplerAnnot.html#POPPLER-ANNOT-TEXT-ICON-NOTE:CAPS" title="POPPLER_ANNOT_TEXT_ICON_NOTE"><span class="type">POPPLER_ANNOT_TEXT_ICON_NOTE</span></a></span></p></td>
@@ -972,8 +1303,11 @@ icons are currently supported:
 </table></div>
 <p>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -995,8 +1329,11 @@ icons are currently supported:
 <p>
 Retrieves the state of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1019,8 +1356,11 @@ other case.</td>
 <p>
 Sets whether <em class="parameter"><code>poppler_annot</code></em> should initially be displayed open
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1042,8 +1382,11 @@ Sets whether <em class="parameter"><code>poppler_annot</code></em> should initia
 <p>
 Retrieves the state of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1067,8 +1410,11 @@ Retrieves the state of <em class="parameter"><code>poppler_annot</code></em>.
 Retrieves a <a class="link" href="PopplerAnnot.html#PopplerAnnotCalloutLine" title="PopplerAnnotCalloutLine"><span class="type">PopplerAnnotCalloutLine</span></a> of four or six numbers specifying a callout
 line attached to the <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1092,8 +1438,11 @@ done.</td>
 <p>
 Retrieves the justification of the text of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1117,8 +1466,11 @@ Retrieves the justification of the text of <em class="parameter"><code>poppler_a
 Creates a <a class="link" href="PopplerAttachment.html" title="PopplerAttachment"><span class="type">PopplerAttachment</span></a> for the file of the file attachment annotation <em class="parameter"><code>annot</code></em>.
 The <a class="link" href="PopplerAttachment.html" title="PopplerAttachment"><span class="type">PopplerAttachment</span></a> must be unrefed with g_object_unref by the caller.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1143,8 +1495,11 @@ The <a class="link" href="PopplerAttachment.html" title="PopplerAttachment"><spa
 <p>
 Retrieves the name of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1167,8 +1522,11 @@ be freed with <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-
 <p>
 Retrieves the action (<a class="link" href="poppler-PopplerAction.html#PopplerAction" title="union PopplerAction"><span class="type">PopplerAction</span></a>) that shall be performed when <em class="parameter"><code>poppler_annot</code></em> is activated
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1192,8 +1550,11 @@ object is owned by <em class="parameter"><code>poppler_annot</code></em> and sho
 <p>
 Retrieves the movie object (PopplerMovie) stored in the <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1217,8 +1578,11 @@ object is owned by <a class="link" href="PopplerAnnot.html#PopplerAnnotMovie" ti
 <p>
 Retrieves the movie title of <em class="parameter"><code>poppler_annot</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_annot</code></em> :</span></p></td>
@@ -1241,8 +1605,11 @@ Retrieves the movie title of <em class="parameter"><code>poppler_annot</code></e
 <p>
 Creates a new empty <a class="link" href="PopplerAnnot.html#PopplerAnnotCalloutLine" title="PopplerAnnotCalloutLine"><span class="type">PopplerAnnotCalloutLine</span></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new allocated <a class="link" href="PopplerAnnot.html#PopplerAnnotCalloutLine" title="PopplerAnnotCalloutLine"><span class="type">PopplerAnnotCalloutLine</span></a>, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in other case.
@@ -1258,8 +1625,11 @@ It must be freed when done.</td>
 <p>
 It does copy <em class="parameter"><code>callout</code></em> to a new <a class="link" href="PopplerAnnot.html#PopplerAnnotCalloutLine" title="PopplerAnnotCalloutLine"><span class="type">PopplerAnnotCalloutLine</span></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callout</code></em> :</span></p></td>
@@ -1280,8 +1650,11 @@ It does copy <em class="parameter"><code>callout</code></em> to a new <a class="
 <p>
 Frees the memory used by <a class="link" href="PopplerAnnot.html#PopplerAnnotCalloutLine" title="PopplerAnnotCalloutLine"><span class="type">PopplerAnnotCalloutLine</span></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>callout</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerAnnot.html#PopplerAnnotCalloutLine" title="PopplerAnnotCalloutLine"><span class="type">PopplerAnnotCalloutLine</span></a>
@@ -1293,6 +1666,6 @@ Frees the memory used by <a class="link" href="PopplerAnnot.html#PopplerAnnotCal
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/PopplerAttachment.html b/glib/reference/html/PopplerAttachment.html
index a90336fb..d3333cbd 100644
--- a/glib/reference/html/PopplerAttachment.html
+++ b/glib/reference/html/PopplerAttachment.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerFormField.html" title="PoppplerFormField">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -87,8 +87,11 @@ successful it should return <a href="http://library.gnome.org/devel/glib/unstabl
 <em class="parameter"><code>error</code></em> and return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, in which case <a class="link" href="PopplerAttachment.html#poppler-attachment-save-to-callback" title="poppler_attachment_save_to_callback ()"><code class="function">poppler_attachment_save_to_callback()</code></a>
 will fail with the same error.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>buf</code></em> :</span></p></td>
@@ -129,8 +132,11 @@ Saves <em class="parameter"><code>attachment</code></em> to a file indicated by
 will be returned. Possible errors include those in the <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a> domain
 and whatever the save function generates.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>attachment</code></em> :</span></p></td>
@@ -167,8 +173,11 @@ an in-memory buffer or a socket. If <em class="parameter"><code>error</code></em
 returned. Possible errors include those in the <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a> domain and
 whatever the save function generates.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>attachment</code></em> :</span></p></td>
@@ -200,6 +209,6 @@ whatever the save function generates.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/PopplerDocument.html b/glib/reference/html/PopplerDocument.html
index 70dfbfef..170649af 100644
--- a/glib/reference/html/PopplerDocument.html
+++ b/glib/reference/html/PopplerDocument.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerPage.html" title="PopplerPage">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -226,8 +226,11 @@ The <a class="link" href="PopplerDocument.html" title="PopplerDocument"><span cl
 <p>
 Page layout types
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-PAGE-LAYOUT-UNSET:CAPS"></a><span class="term"><code class="literal">POPPLER_PAGE_LAYOUT_UNSET</code></span></p></td>
@@ -283,8 +286,11 @@ Page layout types
 <p>
 Page modes
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-PAGE-MODE-UNSET:CAPS"></a><span class="term"><code class="literal">POPPLER_PAGE_MODE_UNSET</code></span></p></td>
@@ -352,8 +358,11 @@ Page modes
 <p>
 Font types
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-FONT-TYPE-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_FONT_TYPE_UNKNOWN</code></span></p></td>
@@ -442,8 +451,11 @@ Font types
 <p>
 Viewer preferences
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-VIEWER-PREFERENCES-UNSET:CAPS"></a><span class="term"><code class="literal">POPPLER_VIEWER_PREFERENCES_UNSET</code></span></p></td>
@@ -506,8 +518,11 @@ Viewer preferences
 <p>
 Permissions
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-PERMISSIONS-OK-TO-PRINT:CAPS"></a><span class="term"><code class="literal">POPPLER_PERMISSIONS_OK_TO_PRINT</code></span></p></td>
@@ -570,8 +585,11 @@ Creates a new <a class="link" href="PopplerDocument.html" title="PopplerDocument
 set. Possible errors include those in the <a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS" title="POPPLER_ERROR"><span class="type">POPPLER_ERROR</span></a> and <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a>
 domains.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
@@ -607,8 +625,11 @@ Creates a new <a class="link" href="PopplerDocument.html" title="PopplerDocument
 set. Possible errors include those in the <a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS" title="POPPLER_ERROR"><span class="type">POPPLER_ERROR</span></a> and <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a>
 domains.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
@@ -652,8 +673,11 @@ will be returned.
 Possible errors include those in the <a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS" title="POPPLER_ERROR"><span class="type">POPPLER_ERROR</span></a> and <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a>
 domains.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>stream</code></em> :</span></p></td>
@@ -699,8 +723,11 @@ Creates a new <a class="link" href="PopplerDocument.html" title="PopplerDocument
 Possible errors include those in the <a class="link" href="poppler-poppler.html#POPPLER-ERROR:CAPS" title="POPPLER_ERROR"><span class="type">POPPLER_ERROR</span></a> and <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a>
 domains.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>file</code></em> :</span></p></td>
@@ -743,8 +770,11 @@ will be saved.
 If <em class="parameter"><code>error</code></em> is set, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> will be returned. Possible errors
 include those in the <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a> domain.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -781,8 +811,11 @@ form fields filled by the user will not be saved.
 If <em class="parameter"><code>error</code></em> is set, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> will be returned. Possible errors
 include those in the <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a> domain.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -823,8 +856,11 @@ the file contents at the time it was last updated.
 Note that returned strings are not null-terminated, they have a fixed
 size of 32 bytes.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -858,8 +894,11 @@ size of 32 bytes.
 <p>
 Returns the PDF version of <em class="parameter"><code>document</code></em> as a string (e.g. PDF-1.6)
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -882,8 +921,11 @@ of <em class="parameter"><code>document</code></em>, or <a href="http://library.
 <pre class="programlisting"><span class="returnvalue">void</span>                poppler_document_get_pdf_version    (<em class="parameter"><code><a class="link" href="PopplerDocument.html" title="PopplerDocument"><span class="type">PopplerDocument</span></a> *document</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *major_version</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> *minor_version</code></em>);</pre>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -915,8 +957,11 @@ of <em class="parameter"><code>document</code></em>, or <a href="http://library.
 <p>
 Returns the document's title
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -940,8 +985,11 @@ of <em class="parameter"><code>document</code></em>, or <a href="http://library.
 <p>
 Returns the author of the document
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -965,8 +1013,11 @@ of <em class="parameter"><code>document</code></em>, or <a href="http://library.
 <p>
 Returns the subject of the document
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -990,8 +1041,11 @@ of <em class="parameter"><code>document</code></em>, or <a href="http://library.
 <p>
 Returns the keywords associated to the document
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1017,8 +1071,11 @@ Returns the creator of the document. If the document was converted
 from another format, the creator is the name of the product
 that created the original document from which it was converted.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1044,8 +1101,11 @@ Returns the producer of the document. If the document was converted
 from another format, the producer is the name of the product
 that converted it to PDF
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1069,8 +1129,11 @@ of <em class="parameter"><code>document</code></em>, or <a href="http://library.
 <p>
 Returns the date the document was created as seconds since the Epoch
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1093,8 +1156,11 @@ Returns the date the document was created as seconds since the Epoch
 <p>
 Returns the date the document was most recently modified as seconds since the Epoch
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1116,8 +1182,11 @@ Returns the date the document was most recently modified as seconds since the Ep
 <p>
 Returns the page layout that should be used when the document is opened
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1140,8 +1209,11 @@ Returns the page layout that should be used when the document is opened
 Returns a <a class="link" href="PopplerDocument.html#PopplerPageMode" title="enum PopplerPageMode"><span class="type">PopplerPageMode</span></a> representing how the document should
 be initially displayed when opened.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1163,8 +1235,11 @@ be initially displayed when opened.
 <p>
 Returns the flags specifying which operations are permitted when the document is opened.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1186,8 +1261,11 @@ Returns the flags specifying which operations are permitted when the document is
 <p>
 Returns the XML metadata string of the document
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1212,8 +1290,11 @@ metadata, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard
 Returns whether <em class="parameter"><code>document</code></em> is linearized or not. Linearization of PDF
 enables efficient incremental access of the PDF file in a network environment.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1236,8 +1317,11 @@ enables efficient incremental access of the PDF file in a network environment.
 <p>
 Returns the number of pages in a loaded document.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1260,8 +1344,11 @@ Returns the number of pages in a loaded document.
 Returns the <a class="link" href="PopplerPage.html" title="PopplerPage"><span class="type">PopplerPage</span></a> indexed at <em class="parameter"><code>index</code></em>.  This object is owned by the
 caller.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1293,8 +1380,11 @@ and can be document specific.  Typically, it is a value such as "iii" or "3".
 <p>
 By default, "1" refers to the first page.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1321,8 +1411,11 @@ By default, "1" refers to the first page.
 <p>
 Finds named destination <em class="parameter"><code>link_name</code></em> in <em class="parameter"><code>document</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1351,8 +1444,11 @@ be freed with <a class="link" href="poppler-PopplerAction.html#poppler-dest-free
 Returns the number of attachments in a loaded document.
 See also <a class="link" href="PopplerDocument.html#poppler-document-get-attachments" title="poppler_document_get_attachments ()"><code class="function">poppler_document_get_attachments()</code></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1374,8 +1470,11 @@ See also <a class="link" href="PopplerDocument.html#poppler-document-get-attachm
 <p>
 Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> of <em class="parameter"><code>document</code></em> has any attachments.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1399,8 +1498,11 @@ Returns a <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Link
 are unowned, and must be unreffed, and the list must be freed with
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"><code class="function">g_list_free()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1424,8 +1526,11 @@ are unowned, and must be unreffed, and the list must be freed with
 Returns the <a class="link" href="PopplerFormField.html" title="PoppplerFormField"><span class="type">PopplerFormField</span></a> for the given <em class="parameter"><code>id</code></em>. It must be freed with
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref"><code class="function">g_object_unref()</code></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1489,8 +1594,11 @@ walk_index (PopplerIndexIter *iter)
 </pre></div>
 <p>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1513,8 +1621,11 @@ walk_index (PopplerIndexIter *iter)
 Creates a new <a class="link" href="PopplerDocument.html#PopplerIndexIter" title="PopplerIndexIter"><span class="type">PopplerIndexIter</span></a> as a copy of <em class="parameter"><code>iter</code></em>.  This must be freed with
 <a class="link" href="PopplerDocument.html#poppler-index-iter-free" title="poppler_index_iter_free ()"><code class="function">poppler_index_iter_free()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1536,8 +1647,11 @@ Creates a new <a class="link" href="PopplerDocument.html#PopplerIndexIter" title
 <p>
 Frees <em class="parameter"><code>iter</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerDocument.html#PopplerIndexIter" title="PopplerIndexIter"><span class="type">PopplerIndexIter</span></a>
@@ -1553,8 +1667,11 @@ Frees <em class="parameter"><code>iter</code></em>.
 Returns a newly created child of <em class="parameter"><code>parent</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the iter has no child.
 See <a class="link" href="PopplerDocument.html#poppler-index-iter-new" title="poppler_index_iter_new ()"><code class="function">poppler_index_iter_new()</code></a> for more information on this function.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
@@ -1578,8 +1695,11 @@ Returns whether this node should be expanded by default to the user.  The
 document can provide a hint as to how the document's index should be expanded
 initially.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1602,8 +1722,11 @@ initially.
 Returns the <a class="link" href="poppler-PopplerAction.html#PopplerAction" title="union PopplerAction"><span class="type">PopplerAction</span></a> associated with <em class="parameter"><code>iter</code></em>.  It must be freed with
 <a class="link" href="poppler-PopplerAction.html#poppler-action-free" title="poppler_action_free ()"><code class="function">poppler_action_free()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1626,8 +1749,11 @@ Returns the <a class="link" href="poppler-PopplerAction.html#PopplerAction" titl
 Sets <em class="parameter"><code>iter</code></em> to point to the next action at the current level, if valid.  See
 <a class="link" href="PopplerDocument.html#poppler-index-iter-new" title="poppler_index_iter_new ()"><code class="function">poppler_index_iter_new()</code></a> for more information.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1649,8 +1775,11 @@ Sets <em class="parameter"><code>iter</code></em> to point to the next action at
 <p>
 Creates a new <a class="link" href="PopplerDocument.html#PopplerFontInfo" title="PopplerFontInfo"><span class="type">PopplerFontInfo</span></a> object
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -1694,8 +1823,11 @@ while (poppler_font_info_scan (font_info, 20, &amp;fonts_iter)) {
 </pre></div>
 <p>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>font_info</code></em> :</span></p></td>
@@ -1731,8 +1863,11 @@ while (poppler_font_info_scan (font_info, 20, &amp;fonts_iter)) {
 <p>
 Creates a copy of <em class="parameter"><code>iter</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1753,8 +1888,11 @@ Creates a copy of <em class="parameter"><code>iter</code></em>
 <p>
 Frees the given <a class="link" href="PopplerDocument.html#PopplerFontsIter" title="PopplerFontsIter"><span class="type">PopplerFontsIter</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerDocument.html#PopplerFontsIter" title="PopplerFontsIter"><span class="type">PopplerFontsIter</span></a>
@@ -1769,8 +1907,11 @@ Frees the given <a class="link" href="PopplerDocument.html#PopplerFontsIter" tit
 <p>
 Returns the name of the font associated with <em class="parameter"><code>iter</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1791,8 +1932,11 @@ Returns the name of the font associated with <em class="parameter"><code>iter</c
 <p>
 Returns the full name of the font associated with <em class="parameter"><code>iter</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1813,8 +1957,11 @@ Returns the full name of the font associated with <em class="parameter"><code>it
 <p>
 Returns the type of the font associated with <em class="parameter"><code>iter</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1837,8 +1984,11 @@ Returns the type of the font associated with <em class="parameter"><code>iter</c
 The name of the substitute font of the font associated with <em class="parameter"><code>iter</code></em> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
 the font is embedded
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1861,8 +2011,11 @@ the font is embedded
 The filename of the font associated with <em class="parameter"><code>iter</code></em> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
 the font is embedded
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1883,8 +2036,11 @@ the font is embedded
 <p>
 Returns the encoding of the font associated with <em class="parameter"><code>iter</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1906,8 +2062,11 @@ Returns the encoding of the font associated with <em class="parameter"><code>ite
 <p>
 Returns whether the font associated with <em class="parameter"><code>iter</code></em> is embedded in the document
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1929,8 +2088,11 @@ Returns whether the font associated with <em class="parameter"><code>iter</code>
 <p>
 Returns whether the font associated with <em class="parameter"><code>iter</code></em> is a subset of another font
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1952,8 +2114,11 @@ Returns whether the font associated with <em class="parameter"><code>iter</code>
 <p>
 Sets <em class="parameter"><code>iter</code></em> to point to the next font
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -1972,8 +2137,11 @@ Sets <em class="parameter"><code>iter</code></em> to point to the next font
 <div class="refsect2">
 <a name="poppler-layers-iter-new"></a><h3>poppler_layers_iter_new ()</h3>
 <pre class="programlisting"><a class="link" href="PopplerDocument.html#PopplerLayersIter" title="PopplerLayersIter"><span class="returnvalue">PopplerLayersIter</span></a> * poppler_layers_iter_new             (<em class="parameter"><code><a class="link" href="PopplerDocument.html" title="PopplerDocument"><span class="type">PopplerDocument</span></a> *document</code></em>);</pre>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerDocument.html" title="PopplerDocument"><span class="type">PopplerDocument</span></a>
@@ -1990,8 +2158,11 @@ Sets <em class="parameter"><code>iter</code></em> to point to the next font
 Creates a new <a class="link" href="PopplerDocument.html#PopplerLayersIter" title="PopplerLayersIter"><span class="type">PopplerLayersIter</span></a> as a copy of <em class="parameter"><code>iter</code></em>.  This must be freed with
 <a class="link" href="PopplerDocument.html#poppler-layers-iter-free" title="poppler_layers_iter_free ()"><code class="function">poppler_layers_iter_free()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -2013,8 +2184,11 @@ Since 0.12</td>
 <p>
 Frees <em class="parameter"><code>iter</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerDocument.html#PopplerLayersIter" title="PopplerLayersIter"><span class="type">PopplerLayersIter</span></a>
@@ -2031,8 +2205,11 @@ Frees <em class="parameter"><code>iter</code></em>.
 Returns a newly created child of <em class="parameter"><code>parent</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the iter has no child.
 See <a class="link" href="PopplerDocument.html#poppler-layers-iter-new" title="poppler_layers_iter_new ()"><code class="function">poppler_layers_iter_new()</code></a> for more information on this function.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td>
@@ -2055,8 +2232,11 @@ See <a class="link" href="PopplerDocument.html#poppler-layers-iter-new" title="p
 <p>
 Returns the <a class="link" href="PopplerLayer.html" title="PopplerLayer"><span class="type">PopplerLayer</span></a> associated with <em class="parameter"><code>iter</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -2081,8 +2261,11 @@ there isn't any layer associated with <em class="parameter"><code>iter</code></e
 Returns the title associated with <em class="parameter"><code>iter</code></em>.  It must be freed with
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -2106,8 +2289,11 @@ The returned string should be freed with <a href="http://library.gnome.org/devel
 Sets <em class="parameter"><code>iter</code></em> to point to the next action at the current level, if valid.  See
 <a class="link" href="PopplerDocument.html#poppler-layers-iter-new" title="poppler_layers_iter_new ()"><code class="function">poppler_layers_iter_new()</code></a> for more information.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>iter</code></em> :</span></p></td>
@@ -2133,8 +2319,11 @@ Sets <em class="parameter"><code>iter</code></em> to point to the next action at
 <p>
 Create a new postscript file to render to
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>document</code></em> :</span></p></td>
@@ -2167,8 +2356,11 @@ Create a new postscript file to render to
 <p>
 Frees <em class="parameter"><code>ps_file</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>ps_file</code></em> :</span></p></td>
 <td>a PopplerPSFile</td>
@@ -2186,8 +2378,11 @@ Set the output paper size. These values will end up in the
 DocumentMedia, the BoundingBox DSC comments and other places in the
 generated PostScript.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ps_file</code></em> :</span></p></td>
@@ -2212,8 +2407,11 @@ generated PostScript.
 <p>
 Enable or disable Duplex printing.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>ps_file</code></em> :</span></p></td>
@@ -2244,7 +2442,7 @@ The author of the document
 <p>
 The date the document was created as seconds since the Epoch, or -1
 </p>
-<p>Allowed values: &gt;= G_MAXULONG</p>
+<p>Allowed values: &gt;= -1</p>
 <p>Default value: -1</p>
 </div>
 <hr>
@@ -2317,7 +2515,7 @@ Document metadata in XML format, or <a href="http://library.gnome.org/devel/glib
 <p>
 The date the document was most recently modified as seconds since the Epoch, or -1
 </p>
-<p>Allowed values: &gt;= G_MAXULONG</p>
+<p>Allowed values: &gt;= -1</p>
 <p>Default value: -1</p>
 </div>
 <hr>
@@ -2384,6 +2582,6 @@ The document's title or <a href="http://library.gnome.org/devel/glib/unstable/gl
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/PopplerFormField.html b/glib/reference/html/PopplerFormField.html
index 8d0b0c8d..a380a30d 100644
--- a/glib/reference/html/PopplerFormField.html
+++ b/glib/reference/html/PopplerFormField.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerAnnot.html" title="PopplerAnnot">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -129,6 +129,34 @@ enum                <a class="link" href="PopplerFormField.html#PopplerFormTextT
   POPPLER_FORM_FIELD_SIGNATURE
 } PopplerFormFieldType;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-FORM-FIELD-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_FIELD_UNKNOWN</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-FIELD-BUTTON:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_FIELD_BUTTON</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-FIELD-TEXT:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_FIELD_TEXT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-FIELD-CHOICE:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_FIELD_CHOICE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-FIELD-SIGNATURE:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_FIELD_SIGNATURE</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -139,6 +167,26 @@ enum                <a class="link" href="PopplerFormField.html#PopplerFormTextT
   POPPLER_FORM_BUTTON_RADIO
 } PopplerFormButtonType;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-FORM-BUTTON-PUSH:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_BUTTON_PUSH</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-BUTTON-CHECK:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_BUTTON_CHECK</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-BUTTON-RADIO:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_BUTTON_RADIO</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -148,6 +196,22 @@ enum                <a class="link" href="PopplerFormField.html#PopplerFormTextT
   POPPLER_FORM_CHOICE_LIST
 } PopplerFormChoiceType;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-FORM-CHOICE-COMBO:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_CHOICE_COMBO</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-CHOICE-LIST:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_CHOICE_LIST</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -158,6 +222,26 @@ enum                <a class="link" href="PopplerFormField.html#PopplerFormTextT
   POPPLER_FORM_TEXT_FILE_SELECT
 } PopplerFormTextType;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-FORM-TEXT-NORMAL:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_TEXT_NORMAL</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-TEXT-MULTILINE:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_TEXT_MULTILINE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-FORM-TEXT-FILE-SELECT:CAPS"></a><span class="term"><code class="literal">POPPLER_FORM_TEXT_FILE_SELECT</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -166,8 +250,11 @@ enum                <a class="link" href="PopplerFormField.html#PopplerFormTextT
 <p>
 Gets the type of <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -190,8 +277,11 @@ Gets the type of <em class="parameter"><code>field</code></em>
 <p>
 Gets the id of <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -213,8 +303,11 @@ Gets the id of <em class="parameter"><code>field</code></em>
 <p>
 Checks whether <em class="parameter"><code>field</code></em> is read only
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -236,8 +329,11 @@ Checks whether <em class="parameter"><code>field</code></em> is read only
 <p>
 Gets the font size of <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -259,8 +355,11 @@ Gets the font size of <em class="parameter"><code>field</code></em>
 <p>
 Gets the partial name of <em class="parameter"><code>field</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -283,8 +382,11 @@ Gets the partial name of <em class="parameter"><code>field</code></em>.
 Gets the mapping name of <em class="parameter"><code>field</code></em> that is used when
 exporting interactive form field data from the document
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -307,8 +409,11 @@ exporting interactive form field data from the document
 Gets the fully qualified name of <em class="parameter"><code>field</code></em>. It's constructed by concatenating
 the partial field names of the field and all of its ancestors.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -331,8 +436,11 @@ the partial field names of the field and all of its ancestors.
 Retrieves the action (<a class="link" href="poppler-PopplerAction.html#PopplerAction" title="union PopplerAction"><span class="type">PopplerAction</span></a>) that shall be
 performed when <em class="parameter"><code>field</code></em> is activated, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -357,8 +465,11 @@ object is owned by <em class="parameter"><code>field</code></em> and should not
 <p>
 Gets the button type of <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -382,8 +493,11 @@ Gets the button type of <em class="parameter"><code>field</code></em>
 Queries a <a class="link" href="PopplerFormField.html" title="PoppplerFormField"><span class="type">PopplerFormField</span></a> and returns its current state. Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if
 <em class="parameter"><code>field</code></em> is pressed in and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it is raised.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -407,8 +521,11 @@ Queries a <a class="link" href="PopplerFormField.html" title="PoppplerFormField"
 Sets the status of <em class="parameter"><code>field</code></em>. Set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if you want the <a class="link" href="PopplerFormField.html" title="PoppplerFormField"><span class="type">PopplerFormField</span></a>
 to be 'pressed in', and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> to raise it.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -432,8 +549,11 @@ to be 'pressed in', and <a href="http://library.gnome.org/devel/glib/unstable/gl
 <p>
 Gets the choice type of <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -457,8 +577,11 @@ Gets the choice type of <em class="parameter"><code>field</code></em>
 <p>
 Checks whether <em class="parameter"><code>field</code></em> allows multiple choices to be selected
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -487,8 +610,11 @@ Checks whether <em class="parameter"><code>field</code></em> allows multiple cho
 <p>
 Checks whether spell checking should be done for the contents of <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -512,8 +638,11 @@ Checks whether spell checking should be done for the contents of <em class="para
 <p>
 Returns the contents of the item on <em class="parameter"><code>field</code></em> at the given index
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -539,8 +668,11 @@ Returns the contents of the item on <em class="parameter"><code>field</code></em
 <p>
 Returns the number of items on <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -562,8 +694,11 @@ Returns the number of items on <em class="parameter"><code>field</code></em>
 <p>
 Retrieves the contents of <em class="parameter"><code>field</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -585,8 +720,11 @@ Retrieves the contents of <em class="parameter"><code>field</code></em>.
 <p>
 Sets the text in <em class="parameter"><code>field</code></em> to the given value, replacing the current contents
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -608,8 +746,11 @@ Sets the text in <em class="parameter"><code>field</code></em> to the given valu
 <p>
 Checks whether <em class="parameter"><code>field</code></em> is editable
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -633,8 +774,11 @@ Checks whether <em class="parameter"><code>field</code></em> is editable
 <p>
 Checks whether the item at the given index on <em class="parameter"><code>field</code></em> is currently selected
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -662,8 +806,11 @@ Checks whether the item at the given index on <em class="parameter"><code>field<
 <p>
 Selects the item at the given index on <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -686,8 +833,11 @@ Selects the item at the given index on <em class="parameter"><code>field</code><
 <p>
 Changes the state of the item at the given index
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -709,8 +859,11 @@ Changes the state of the item at the given index
 <p>
 Unselects all the items on <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerFormField.html" title="PoppplerFormField"><span class="type">PopplerFormField</span></a>
@@ -726,8 +879,11 @@ Unselects all the items on <em class="parameter"><code>field</code></em>
 <p>
 Gets the text type of <em class="parameter"><code>field</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -750,8 +906,11 @@ Gets the text type of <em class="parameter"><code>field</code></em>.
 <p>
 Retrieves the contents of <em class="parameter"><code>field</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -773,8 +932,11 @@ Retrieves the contents of <em class="parameter"><code>field</code></em>.
 <p>
 Sets the text in <em class="parameter"><code>field</code></em> to the given value, replacing the current contents.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -795,8 +957,11 @@ Sets the text in <em class="parameter"><code>field</code></em> to the given valu
 <p>
 Retrieves the maximum allowed length of the text in <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -823,8 +988,11 @@ Retrieves the maximum allowed length of the text in <em class="parameter"><code>
 <p>
 Checks whether spell checking should be done for the contents of <em class="parameter"><code>field</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -847,8 +1015,11 @@ Checks whether spell checking should be done for the contents of <em class="para
 <p>
 Checks whether content of <em class="parameter"><code>field</code></em> is a password and it must be hidden
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -871,8 +1042,11 @@ Checks whether content of <em class="parameter"><code>field</code></em> is a pas
 <p>
 Checks whether the contents of <em class="parameter"><code>field</code></em> are rich text
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>field</code></em> :</span></p></td>
@@ -891,6 +1065,6 @@ Checks whether the contents of <em class="parameter"><code>field</code></em> are
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/PopplerLayer.html b/glib/reference/html/PopplerLayer.html
index f7b1a8d3..18172633 100644
--- a/glib/reference/html/PopplerLayer.html
+++ b/glib/reference/html/PopplerLayer.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerMedia.html" title="PopplerMedia">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -76,8 +76,11 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm
 Returns the name of the layer suitable for
 presentation as a title in a viewer's GUI
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
@@ -99,8 +102,11 @@ presentation as a title in a viewer's GUI
 <p>
 Returns whether <em class="parameter"><code>layer</code></em> is visible
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
@@ -123,8 +129,11 @@ Returns whether <em class="parameter"><code>layer</code></em> is visible
 <p>
 Shows <em class="parameter"><code>layer</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerLayer.html" title="PopplerLayer"><span class="type">PopplerLayer</span></a>
@@ -142,8 +151,11 @@ Hides <em class="parameter"><code>layer</code></em>. If <em class="parameter"><c
 such layers will be also hidden and will be blocked until <em class="parameter"><code>layer</code></em>
 is shown again
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerLayer.html" title="PopplerLayer"><span class="type">PopplerLayer</span></a>
@@ -159,8 +171,11 @@ is shown again
 <p>
 Returns whether <em class="parameter"><code>layer</code></em> is parent of other nested layers.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
@@ -184,8 +199,11 @@ Returns whether <em class="parameter"><code>layer</code></em> is parent of other
 <p>
 Returns the numeric ID the radio button group associated with <em class="parameter"><code>layer</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>layer</code></em> :</span></p></td>
@@ -205,6 +223,6 @@ or 0 if the layer is not associated to any radio button group</td>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/PopplerMedia.html b/glib/reference/html/PopplerMedia.html
index 5d39d261..f3974b25 100644
--- a/glib/reference/html/PopplerMedia.html
+++ b/glib/reference/html/PopplerMedia.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerMovie.html" title="PopplerMovie">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -90,8 +90,11 @@ successful it should return <a href="http://library.gnome.org/devel/glib/unstabl
 <em class="parameter"><code>error</code></em> and return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, in which case <a class="link" href="PopplerMedia.html#poppler-media-save-to-callback" title="poppler_media_save_to_callback ()"><code class="function">poppler_media_save_to_callback()</code></a>
 will fail with the same error.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>buf</code></em> :</span></p></td>
@@ -130,8 +133,11 @@ bytes to be written. <span class="annotation">[<acronym title="Parameter points
 Returns the media clip filename, in case of non-embedded media. filename might be
 a local relative or absolute path or a URI
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_media</code></em> :</span></p></td>
@@ -153,8 +159,11 @@ a local relative or absolute path or a URI
 <p>
 Returns the media clip mime-type
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_media</code></em> :</span></p></td>
@@ -179,8 +188,11 @@ can be saved with <a class="link" href="PopplerMedia.html#poppler-media-save" ti
 If the result is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, the media clip filename can be retrieved with
 <a class="link" href="PopplerMedia.html#poppler-media-get-filename" title="poppler_media_get_filename ()"><code class="function">poppler_media_get_filename()</code></a> function.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_media</code></em> :</span></p></td>
@@ -208,8 +220,11 @@ If <em class="parameter"><code>error</code></em> is set, <a href="http://library
 Possible errors include those in the <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a> domain
 and whatever the save function generates.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_media</code></em> :</span></p></td>
@@ -248,8 +263,11 @@ an in-memory buffer or a socket. If <em class="parameter"><code>error</code></em
 returned. Possible errors include those in the <a href="http://library.gnome.org/devel/glib/unstable/glib-File-Utilities.html#G-FILE-ERROR:CAPS"><span class="type">G_FILE_ERROR</span></a> domain and
 whatever the save function generates.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_media</code></em> :</span></p></td>
@@ -283,6 +301,6 @@ whatever the save function generates.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/PopplerMovie.html b/glib/reference/html/PopplerMovie.html
index 77d90acd..ec720d91 100644
--- a/glib/reference/html/PopplerMovie.html
+++ b/glib/reference/html/PopplerMovie.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="poppler-Version-and-Features-Information.html" title="Version and Features Information">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -71,8 +71,11 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm
 <p>
 Returns the local filename identifying a self-describing movie file
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_movie</code></em> :</span></p></td>
@@ -97,8 +100,11 @@ Returns whether a poster image representing the Movie
 shall be displayed. The poster image must be retrieved
 from the movie file.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_movie</code></em> :</span></p></td>
@@ -121,8 +127,11 @@ from the movie file.
 <p>
 Returns whether to display a movie controller bar while playing the movie
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>poppler_movie</code></em> :</span></p></td>
@@ -142,6 +151,6 @@ Returns whether to display a movie controller bar while playing the movie
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/PopplerPage.html b/glib/reference/html/PopplerPage.html
index ee05a2db..fb367de9 100644
--- a/glib/reference/html/PopplerPage.html
+++ b/glib/reference/html/PopplerPage.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="poppler-PopplerAction.html" title="PopplerAction">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -185,8 +185,11 @@ enum                <a class="link" href="PopplerPage.html#PopplerSelectionStyle
 A <a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> is used to describe
 locations on a page and bounding boxes
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="PopplerRectangle.x1"></a>x1</code></em>;</span></p></td>
@@ -224,8 +227,11 @@ locations on a page and bounding boxes
 A <a class="link" href="PopplerPage.html#PopplerPageTransition" title="PopplerPageTransition"><span class="type">PopplerPageTransition</span></a> structures describes a visual transition
 to use when moving between pages during a presentation
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="PopplerPage.html#PopplerPageTransitionType" title="enum PopplerPageTransitionType"><span class="type">PopplerPageTransitionType</span></a> <em class="structfield"><code><a name="PopplerPageTransition.type"></a>type</code></em>;</span></p></td>
@@ -279,8 +285,11 @@ Only for <a class="link" href="PopplerPage.html#POPPLER-PAGE-TRANSITION-FLY:CAPS
 A <a class="link" href="PopplerPage.html#PopplerLinkMapping" title="PopplerLinkMapping"><span class="type">PopplerLinkMapping</span></a> structure represents the location
 of <em class="parameter"><code>action</code></em> on the page
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> <em class="structfield"><code><a name="PopplerLinkMapping.area"></a>area</code></em>;</span></p></td>
@@ -306,8 +315,11 @@ of <em class="parameter"><code>action</code></em> on the page
 A <a class="link" href="PopplerPage.html#PopplerImageMapping" title="PopplerImageMapping"><span class="type">PopplerImageMapping</span></a> structure represents the location
 of an image on the page
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> <em class="structfield"><code><a name="PopplerImageMapping.area"></a>area</code></em>;</span></p></td>
@@ -332,8 +344,11 @@ of an image on the page
 A <a class="link" href="PopplerPage.html#PopplerFormFieldMapping" title="PopplerFormFieldMapping"><span class="type">PopplerFormFieldMapping</span></a> structure represents the location
 of <em class="parameter"><code>field</code></em> on the page
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> <em class="structfield"><code><a name="PopplerFormFieldMapping.area"></a>area</code></em>;</span></p></td>
@@ -359,8 +374,11 @@ of <em class="parameter"><code>field</code></em> on the page
 A <a class="link" href="PopplerPage.html#PopplerAnnotMapping" title="PopplerAnnotMapping"><span class="type">PopplerAnnotMapping</span></a> structure represents the location
 of <em class="parameter"><code>annot</code></em> on the page
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a> <em class="structfield"><code><a name="PopplerAnnotMapping.area"></a>area</code></em>;</span></p></td>
@@ -395,8 +413,11 @@ of <em class="parameter"><code>annot</code></em> on the page
 <p>
 Page transition types
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-PAGE-TRANSITION-REPLACE:CAPS"></a><span class="term"><code class="literal">POPPLER_PAGE_TRANSITION_REPLACE</code></span></p></td>
@@ -477,8 +498,11 @@ sweeps across the page in a wide band moving from one side of the screen to the
 Page transition alignment types for <a class="link" href="PopplerPage.html#POPPLER-PAGE-TRANSITION-SPLIT:CAPS"><span class="type">POPPLER_PAGE_TRANSITION_SPLIT</span></a>
 and <a class="link" href="PopplerPage.html#POPPLER-PAGE-TRANSITION-BLINDS:CAPS"><span class="type">POPPLER_PAGE_TRANSITION_BLINDS</span></a> transition types
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-PAGE-TRANSITION-HORIZONTAL:CAPS"></a><span class="term"><code class="literal">POPPLER_PAGE_TRANSITION_HORIZONTAL</code></span></p></td>
@@ -505,8 +529,11 @@ and <a class="link" href="PopplerPage.html#POPPLER-PAGE-TRANSITION-BLINDS:CAPS">
 Page transition direction types for <a class="link" href="PopplerPage.html#POPPLER-PAGE-TRANSITION-SPLIT:CAPS"><span class="type">POPPLER_PAGE_TRANSITION_SPLIT</span></a>,
 <a class="link" href="PopplerPage.html#POPPLER-PAGE-TRANSITION-BOX:CAPS"><span class="type">POPPLER_PAGE_TRANSITION_BOX</span></a> and <a class="link" href="PopplerPage.html#POPPLER-PAGE-TRANSITION-FLY:CAPS"><span class="type">POPPLER_PAGE_TRANSITION_FLY</span></a> transition types
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-PAGE-TRANSITION-INWARD:CAPS"></a><span class="term"><code class="literal">POPPLER_PAGE_TRANSITION_INWARD</code></span></p></td>
@@ -533,8 +560,11 @@ Page transition direction types for <a class="link" href="PopplerPage.html#POPPL
 <p>
 Selection styles
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-SELECTION-GLYPH:CAPS"></a><span class="term"><code class="literal">POPPLER_SELECTION_GLYPH</code></span></p></td>
@@ -570,8 +600,11 @@ Selection styles
 <p>
 A <a class="link" href="PopplerPage.html#PopplerTextAttributes" title="PopplerTextAttributes"><span class="type">PopplerTextAttributes</span></a> is used to describe text attributes of a range of text
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="PopplerTextAttributes.font-name"></a>font_name</code></em>;</span></p></td>
@@ -608,8 +641,11 @@ A <a class="link" href="PopplerPage.html#PopplerTextAttributes" title="PopplerTe
 <p>
 Returns the index of <em class="parameter"><code>page</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -632,8 +668,11 @@ Returns the index of <em class="parameter"><code>page</code></em>
 Returns the label of <em class="parameter"><code>page</code></em>. Note that page labels
 and page indices might not coincide.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -658,8 +697,11 @@ or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.ht
 <p>
 Gets the size of <em class="parameter"><code>page</code></em> at the current scale and rotation.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -687,8 +729,11 @@ Gets the size of <em class="parameter"><code>page</code></em> at the current sca
 <p>
 Retrurns the crop box of <em class="parameter"><code>page</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -710,8 +755,11 @@ Retrurns the crop box of <em class="parameter"><code>page</code></em>
 <p>
 Returns the duration of <em class="parameter"><code>page</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -732,8 +780,11 @@ Returns the duration of <em class="parameter"><code>page</code></em>
 <p>
 Returns the transition effect of <em class="parameter"><code>page</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -759,8 +810,11 @@ fills in <em class="parameter"><code>width</code></em> and <em class="parameter"
 thumbnail.  The values of width and height are not changed if no
 appropriate thumbnail exists.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -792,8 +846,11 @@ Get the embedded thumbnail for the specified page.  If the document
 doesn't have an embedded thumbnail for the page, this function
 returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -818,8 +875,11 @@ is for rendering a page that will be displayed. If you want
 to render a page that will be printed use
 <a class="link" href="PopplerPage.html#poppler-page-render-for-printing" title="poppler_page_render_for_printing ()"><code class="function">poppler_page_render_for_printing()</code></a> instead
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -840,8 +900,11 @@ to render a page that will be printed use
 <p>
 Render the page to the given cairo context for printing.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -865,8 +928,11 @@ Render the page to the given cairo context for printing.
 Render the page to the given cairo context for printing
 with the specified options
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -892,8 +958,11 @@ with the specified options
 <p>
 Render the page on a postscript file
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -928,8 +997,11 @@ If non-NULL, <em class="parameter"><code>old_selection</code></em> specifies the
 rendered to <em class="parameter"><code>cairo</code></em>, in which case this function will (some day)
 only render the changed part of the selection.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -975,8 +1047,11 @@ 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>.
 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>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1022,8 +1097,11 @@ Returns a region containing the area that would be rendered by
 <a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a>. The returned list must be freed with
 <a class="link" href="PopplerPage.html#poppler-page-selection-region-free" title="poppler_page_selection_region_free ()"><code class="function">poppler_page_selection_region_free()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1062,8 +1140,11 @@ Returns a region containing the area that would be rendered by
 <p>
 Frees <em class="parameter"><code>region</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>region</code></em> :</span></p></td>
 <td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of
@@ -1081,8 +1162,11 @@ Frees <em class="parameter"><code>region</code></em>
 <p>
 Retrieves the contents of the specified <em class="parameter"><code>selection</code></em> as text.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1117,8 +1201,11 @@ Finds <em class="parameter"><code>text</code></em> in <em class="parameter"><cod
 returns a <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of rectangles for each occurance of the text on the page.
 The coordinates are in PDF points.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1148,8 +1235,11 @@ Finds <em class="parameter"><code>text</code></em> in <em class="parameter"><cod
 returns a <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of rectangles for each occurance of the text on the page.
 The coordinates are in PDF points.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1180,8 +1270,11 @@ The coordinates are in PDF points.
 <p>
 Retrieves the text of <em class="parameter"><code>page</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1211,8 +1304,11 @@ This array must be freed with <a href="http://library.gnome.org/devel/glib/unsta
 The position in the array represents an offset in the text returned by
 <a class="link" href="PopplerPage.html#poppler-page-get-text" title="poppler_page_get_text ()"><code class="function">poppler_page_get_text()</code></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1250,8 +1346,11 @@ Each list element is a <a class="link" href="PopplerPage.html#PopplerTextAttribu
 end_index indicates the range of text (as returned by <a class="link" href="PopplerPage.html#poppler-page-get-text" title="poppler_page_get_text ()"><code class="function">poppler_page_get_text()</code></a>)
 to which text attributes apply.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1275,8 +1374,11 @@ to which text attributes apply.
 Frees a list of <a class="link" href="PopplerPage.html#PopplerTextAttributes" title="PopplerTextAttributes"><span class="type">PopplerTextAttributes</span></a>s allocated by
 <a class="link" href="PopplerPage.html#poppler-page-get-text-attributes" title="poppler_page_get_text_attributes ()"><code class="function">poppler_page_get_text_attributes()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
 <td>A list of
@@ -1295,8 +1397,11 @@ Returns a list of <a class="link" href="PopplerPage.html#PopplerLinkMapping" tit
 location on <em class="parameter"><code>page</code></em> to a <a class="link" href="poppler-PopplerAction.html#PopplerAction" title="union PopplerAction"><span class="type">PopplerAction</span></a>.  This list must be freed
 with <a class="link" href="PopplerPage.html#poppler-page-free-link-mapping" title="poppler_page_free_link_mapping ()"><code class="function">poppler_page_free_link_mapping()</code></a> when done.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1321,8 +1426,11 @@ Frees a list of <a class="link" href="PopplerPage.html#PopplerLinkMapping" title
 that each mapping contains, so if you want to keep them around, you need to
 copy them with <a class="link" href="poppler-PopplerAction.html#poppler-action-copy" title="poppler_action_copy ()"><code class="function">poppler_action_copy()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
 <td>A list of
@@ -1340,8 +1448,11 @@ Returns a list of <a class="link" href="PopplerPage.html#PopplerImageMapping" ti
 location on <em class="parameter"><code>page</code></em> to an image of the page. This list must be freed
 with <a class="link" href="PopplerPage.html#poppler-page-free-image-mapping" title="poppler_page_free_image_mapping ()"><code class="function">poppler_page_free_image_mapping()</code></a> when done.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1364,8 +1475,11 @@ with <a class="link" href="PopplerPage.html#poppler-page-free-image-mapping" tit
 <p>
 Returns a cairo surface for the image of the <em class="parameter"><code>page</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1391,8 +1505,11 @@ Returns a cairo surface for the image of the <em class="parameter"><code>page</c
 Frees a list of <a class="link" href="PopplerPage.html#PopplerImageMapping" title="PopplerImageMapping"><span class="type">PopplerImageMapping</span></a>s allocated by
 <a class="link" href="PopplerPage.html#poppler-page-get-image-mapping" title="poppler_page_get_image_mapping ()"><code class="function">poppler_page_get_image_mapping()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
 <td>A list of
@@ -1410,8 +1527,11 @@ Returns a list of <a class="link" href="PopplerPage.html#PopplerFormFieldMapping
 location on <em class="parameter"><code>page</code></em> to a form field.  This list must be freed
 with <a class="link" href="PopplerPage.html#poppler-page-free-form-field-mapping" title="poppler_page_free_form_field_mapping ()"><code class="function">poppler_page_free_form_field_mapping()</code></a> when done.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1435,8 +1555,11 @@ with <a class="link" href="PopplerPage.html#poppler-page-free-form-field-mapping
 Frees a list of <a class="link" href="PopplerPage.html#PopplerFormFieldMapping" title="PopplerFormFieldMapping"><span class="type">PopplerFormFieldMapping</span></a>s allocated by
 <a class="link" href="PopplerPage.html#poppler-page-get-form-field-mapping" title="poppler_page_get_form_field_mapping ()"><code class="function">poppler_page_get_form_field_mapping()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
 <td>A list of
@@ -1454,8 +1577,11 @@ Returns a list of <a class="link" href="PopplerPage.html#PopplerAnnotMapping" ti
 <em class="parameter"><code>page</code></em> to a <a class="link" href="PopplerAnnot.html" title="PopplerAnnot"><span class="type">PopplerAnnot</span></a>.  This list must be freed with
 <a class="link" href="PopplerPage.html#poppler-page-free-annot-mapping" title="poppler_page_free_annot_mapping ()"><code class="function">poppler_page_free_annot_mapping()</code></a> when done.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1480,8 +1606,11 @@ Frees a list of <a class="link" href="PopplerPage.html#PopplerAnnotMapping" titl
 that each mapping contains, so if you want to keep them around, you need to
 reference them with <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-ref"><code class="function">g_object_ref()</code></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>list</code></em> :</span></p></td>
 <td>A list of
@@ -1498,8 +1627,11 @@ reference them with <a href="http://library.gnome.org/devel/gobject/unstable/gob
 <p>
 Adds annotation <em class="parameter"><code>annot</code></em> to <em class="parameter"><code>page</code></em>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1522,8 +1654,11 @@ Adds annotation <em class="parameter"><code>annot</code></em> to <em class="para
 <p>
 Removes annotation <em class="parameter"><code>annot</code></em> from <em class="parameter"><code>page</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>page</code></em> :</span></p></td>
@@ -1545,8 +1680,11 @@ Removes annotation <em class="parameter"><code>annot</code></em> from <em class=
 <p>
 Creates a new <a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a>, use <a class="link" href="PopplerPage.html#poppler-rectangle-free" title="poppler_rectangle_free ()"><code class="function">poppler_rectangle_free()</code></a> to free it</td>
@@ -1560,8 +1698,11 @@ Creates a new <a class="link" href="PopplerPage.html#PopplerRectangle" title="Po
 <p>
 Creates a copy of <em class="parameter"><code>rectangle</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>rectangle</code></em> :</span></p></td>
@@ -1582,8 +1723,11 @@ Creates a copy of <em class="parameter"><code>rectangle</code></em>
 <p>
 Frees the given <a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>rectangle</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerPage.html#PopplerRectangle" title="PopplerRectangle"><span class="type">PopplerRectangle</span></a>
@@ -1598,8 +1742,11 @@ Frees the given <a class="link" href="PopplerPage.html#PopplerRectangle" title="
 <p>
 Creates a new <a class="link" href="PopplerPage.html#PopplerPageTransition" title="PopplerPageTransition"><span class="type">PopplerPageTransition</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="PopplerPage.html#PopplerPageTransition" title="PopplerPageTransition"><span class="type">PopplerPageTransition</span></a>, use <a class="link" href="PopplerPage.html#poppler-page-transition-free" title="poppler_page_transition_free ()"><code class="function">poppler_page_transition_free()</code></a> to free it</td>
@@ -1613,8 +1760,11 @@ Creates a new <a class="link" href="PopplerPage.html#PopplerPageTransition" titl
 <p>
 Creates a copy of <em class="parameter"><code>transition</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>transition</code></em> :</span></p></td>
@@ -1635,8 +1785,11 @@ Creates a copy of <em class="parameter"><code>transition</code></em>
 <p>
 Frees the given <a class="link" href="PopplerPage.html#PopplerPageTransition" title="PopplerPageTransition"><span class="type">PopplerPageTransition</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>transition</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerPage.html#PopplerPageTransition" title="PopplerPageTransition"><span class="type">PopplerPageTransition</span></a>
@@ -1651,8 +1804,11 @@ Frees the given <a class="link" href="PopplerPage.html#PopplerPageTransition" ti
 <p>
 Creates a new <a class="link" href="PopplerPage.html#PopplerLinkMapping" title="PopplerLinkMapping"><span class="type">PopplerLinkMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="PopplerPage.html#PopplerLinkMapping" title="PopplerLinkMapping"><span class="type">PopplerLinkMapping</span></a>, use <a class="link" href="PopplerPage.html#poppler-link-mapping-free" title="poppler_link_mapping_free ()"><code class="function">poppler_link_mapping_free()</code></a> to free it</td>
@@ -1666,8 +1822,11 @@ Creates a new <a class="link" href="PopplerPage.html#PopplerLinkMapping" title="
 <p>
 Creates a copy of <em class="parameter"><code>mapping</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
@@ -1688,8 +1847,11 @@ Creates a copy of <em class="parameter"><code>mapping</code></em>
 <p>
 Frees the given <a class="link" href="PopplerPage.html#PopplerLinkMapping" title="PopplerLinkMapping"><span class="type">PopplerLinkMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerPage.html#PopplerLinkMapping" title="PopplerLinkMapping"><span class="type">PopplerLinkMapping</span></a>
@@ -1704,8 +1866,11 @@ Frees the given <a class="link" href="PopplerPage.html#PopplerLinkMapping" title
 <p>
 Creates a new <a class="link" href="PopplerPage.html#PopplerImageMapping" title="PopplerImageMapping"><span class="type">PopplerImageMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="PopplerPage.html#PopplerImageMapping" title="PopplerImageMapping"><span class="type">PopplerImageMapping</span></a>, use <a class="link" href="PopplerPage.html#poppler-image-mapping-free" title="poppler_image_mapping_free ()"><code class="function">poppler_image_mapping_free()</code></a> to free it</td>
@@ -1719,8 +1884,11 @@ Creates a new <a class="link" href="PopplerPage.html#PopplerImageMapping" title=
 <p>
 Creates a copy of <em class="parameter"><code>mapping</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
@@ -1741,8 +1909,11 @@ Creates a copy of <em class="parameter"><code>mapping</code></em>
 <p>
 Frees the given <a class="link" href="PopplerPage.html#PopplerImageMapping" title="PopplerImageMapping"><span class="type">PopplerImageMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerPage.html#PopplerImageMapping" title="PopplerImageMapping"><span class="type">PopplerImageMapping</span></a>
@@ -1758,8 +1929,11 @@ Frees the given <a class="link" href="PopplerPage.html#PopplerImageMapping" titl
 <p>
 Creates a new <a class="link" href="PopplerPage.html#PopplerFormFieldMapping" title="PopplerFormFieldMapping"><span class="type">PopplerFormFieldMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="PopplerPage.html#PopplerFormFieldMapping" title="PopplerFormFieldMapping"><span class="type">PopplerFormFieldMapping</span></a>, use <a class="link" href="PopplerPage.html#poppler-form-field-mapping-free" title="poppler_form_field_mapping_free ()"><code class="function">poppler_form_field_mapping_free()</code></a> to free it</td>
@@ -1774,8 +1948,11 @@ Creates a new <a class="link" href="PopplerPage.html#PopplerFormFieldMapping" ti
 <p>
 Creates a copy of <em class="parameter"><code>mapping</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
@@ -1796,8 +1973,11 @@ Creates a copy of <em class="parameter"><code>mapping</code></em>
 <p>
 Frees the given <a class="link" href="PopplerPage.html#PopplerFormFieldMapping" title="PopplerFormFieldMapping"><span class="type">PopplerFormFieldMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerPage.html#PopplerFormFieldMapping" title="PopplerFormFieldMapping"><span class="type">PopplerFormFieldMapping</span></a>
@@ -1812,8 +1992,11 @@ Frees the given <a class="link" href="PopplerPage.html#PopplerFormFieldMapping"
 <p>
 Creates a new <a class="link" href="PopplerPage.html#PopplerAnnotMapping" title="PopplerAnnotMapping"><span class="type">PopplerAnnotMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="PopplerPage.html#PopplerAnnotMapping" title="PopplerAnnotMapping"><span class="type">PopplerAnnotMapping</span></a>, use <a class="link" href="PopplerPage.html#poppler-annot-mapping-free" title="poppler_annot_mapping_free ()"><code class="function">poppler_annot_mapping_free()</code></a> to free it</td>
@@ -1827,8 +2010,11 @@ Creates a new <a class="link" href="PopplerPage.html#PopplerAnnotMapping" title=
 <p>
 Creates a copy of <em class="parameter"><code>mapping</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
@@ -1849,8 +2035,11 @@ Creates a copy of <em class="parameter"><code>mapping</code></em>
 <p>
 Frees the given <a class="link" href="PopplerPage.html#PopplerAnnotMapping" title="PopplerAnnotMapping"><span class="type">PopplerAnnotMapping</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>mapping</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerPage.html#PopplerAnnotMapping" title="PopplerAnnotMapping"><span class="type">PopplerAnnotMapping</span></a>
@@ -1865,8 +2054,11 @@ Frees the given <a class="link" href="PopplerPage.html#PopplerAnnotMapping" titl
 <p>
 Creates a new <a class="link" href="PopplerPage.html#PopplerTextAttributes" title="PopplerTextAttributes"><span class="type">PopplerTextAttributes</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="PopplerPage.html#PopplerTextAttributes" title="PopplerTextAttributes"><span class="type">PopplerTextAttributes</span></a>, use <a class="link" href="PopplerPage.html#poppler-text-attributes-free" title="poppler_text_attributes_free ()"><code class="function">poppler_text_attributes_free()</code></a> to free it</td>
@@ -1881,8 +2073,11 @@ Creates a new <a class="link" href="PopplerPage.html#PopplerTextAttributes" titl
 <p>
 Creates a copy of <em class="parameter"><code>text_attrs</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>text_attrs</code></em> :</span></p></td>
@@ -1904,8 +2099,11 @@ Creates a copy of <em class="parameter"><code>text_attrs</code></em>
 <p>
 Frees the given <a class="link" href="PopplerPage.html#PopplerTextAttributes" title="PopplerTextAttributes"><span class="type">PopplerTextAttributes</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>text_attrs</code></em> :</span></p></td>
 <td>a <a class="link" href="PopplerPage.html#PopplerTextAttributes" title="PopplerTextAttributes"><span class="type">PopplerTextAttributes</span></a>
@@ -1929,6 +2127,6 @@ The label of the page or <a href="http://library.gnome.org/devel/glib/unstable/g
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/annotation-glossary.html b/glib/reference/html/annotation-glossary.html
index 728e24f1..194af489 100644
--- a/glib/reference/html/annotation-glossary.html
+++ b/glib/reference/html/annotation-glossary.html
@@ -3,11 +3,11 @@
 <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.78.1">
 <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-22.html" title="Index of new symbols in 0.22">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -38,46 +38,37 @@
 </td></tr>
 </table>
 <div class="glossary">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="annotation-glossary"></a>Annotation Glossary</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="annotation-glossary"></a>Annotation Glossary</h1></div></div></div>
 <a name="glsO"></a><h3 class="title">O</h3>
-<dt>
-<a name="annotation-glossterm-out"></a>out</dt>
-<dd><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
+<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
 <a name="glsA"></a><h3 class="title">A</h3>
-<dt>
-<a name="annotation-glossterm-allow-none"></a>allow-none</dt>
-<dd><p>NULL is ok, both for passing and for returning.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
+<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
 <a name="glsC"></a><h3 class="title">C</h3>
-<dt>
-<a name="annotation-glossterm-closure"></a>closure</dt>
-<dd><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
+<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
 <a name="glsT"></a><h3 class="title">T</h3>
-<dt>
-<a name="annotation-glossterm-transfer%20none"></a>transfer none</dt>
-<dd><p>Don't free data after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
+<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
 <a name="glsA"></a><h3 class="title">A</h3>
-<dt>
-<a name="annotation-glossterm-array"></a>array</dt>
-<dd><p>Parameter points to an array of items.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
+<dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
 <a name="glsE"></a><h3 class="title">E</h3>
-<dt>
-<a name="annotation-glossterm-element-type"></a>element-type</dt>
-<dd><p>Generics and defining elements of containers and arrays.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
+<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
 <a name="glsT"></a><h3 class="title">T</h3>
-<dt>
-<a name="annotation-glossterm-transfer%20container"></a>transfer container</dt>
-<dd><p>Free data container after the code is done.</p></dd>
-<dt>
-<a name="annotation-glossterm-transfer%20full"></a>transfer full</dt>
-<dd><p>Free data after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
+<dd class="glossdef"><p>Free data container after the code is done.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
+<dd class="glossdef"><p>Free data after the code is done.</p></dd>
 <a name="glsS"></a><h3 class="title">S</h3>
-<dt>
-<a name="annotation-glossterm-scope%20call"></a>scope call</dt>
-<dd><p>The callback is valid only during the call to the method.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
+<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-0-12.html b/glib/reference/html/api-index-0-12.html
index 75d9c06a..a24f7451 100644
--- a/glib/reference/html/api-index-0-12.html
+++ b/glib/reference/html/api-index-0-12.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="api-index-0-14.html" title="Index of new symbols in 0.14">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -33,8 +33,8 @@
 </td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-0-12"></a>Index of new symbols in 0.12</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-0-12"></a>Index of new symbols in 0.12</h1></div></div></div>
 <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
 <dt>
 <a class="link" href="PopplerAnnot.html#poppler-annot-markup-get-popup-rectangle" title="poppler_annot_markup_get_popup_rectangle ()">poppler_annot_markup_get_popup_rectangle</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a>
@@ -123,6 +123,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-0-14.html b/glib/reference/html/api-index-0-14.html
index a5d59ca1..2eb917bc 100644
--- a/glib/reference/html/api-index-0-14.html
+++ b/glib/reference/html/api-index-0-14.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="api-index-0-16.html" title="Index of new symbols in 0.16">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -27,8 +27,8 @@
 </td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-0-14"></a>Index of new symbols in 0.14</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-0-14"></a>Index of new symbols in 0.14</h1></div></div></div>
 <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
 <dt>
 <a class="link" href="poppler-PopplerAction.html#PopplerActionLayerAction" title="enum PopplerActionLayerAction">PopplerActionLayerAction</a>, enum in <a class="link" href="poppler-PopplerAction.html" title="PopplerAction">PopplerAction</a>
@@ -102,6 +102,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-0-16.html b/glib/reference/html/api-index-0-16.html
index 5135b5ff..78dd96f1 100644
--- a/glib/reference/html/api-index-0-16.html
+++ b/glib/reference/html/api-index-0-16.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="api-index-0-18.html" title="Index of new symbols in 0.18">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,8 +31,8 @@
 </td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-0-16"></a>Index of new symbols in 0.16</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-0-16"></a>Index of new symbols in 0.16</h1></div></div></div>
 <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
 <dt>
 <a class="link" href="PopplerAnnot.html#poppler-annot-markup-set-label" title="poppler_annot_markup_set_label ()">poppler_annot_markup_set_label</a>, function in <a class="link" href="PopplerAnnot.html" title="PopplerAnnot">PopplerAnnot</a>
@@ -180,6 +180,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-0-18.html b/glib/reference/html/api-index-0-18.html
index e310d041..ce3fc55b 100644
--- a/glib/reference/html/api-index-0-18.html
+++ b/glib/reference/html/api-index-0-18.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index of new symbols in 0.18</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <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">
 <link rel="next" href="api-index-0-20.html" title="Index of new symbols in 0.20">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -31,8 +31,8 @@
 </td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-0-18"></a>Index of new symbols in 0.18</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-0-18"></a>Index of new symbols in 0.18</h1></div></div></div>
 <a name="idx"></a><a name="idxD"></a><h3 class="title">D</h3>
 <dt>
 <a class="link" href="PopplerDocument.html#poppler-document-get-n-attachments" title="poppler_document_get_n_attachments ()">poppler_document_get_n_attachments</a>, function in <a class="link" href="PopplerDocument.html" title="PopplerDocument">PopplerDocument</a>
@@ -72,6 +72,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-0-20.html b/glib/reference/html/api-index-0-20.html
index 9d351b9c..76dedf3e 100644
--- a/glib/reference/html/api-index-0-20.html
+++ b/glib/reference/html/api-index-0-20.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index of new symbols in 0.20</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <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-18.html" title="Index of new symbols in 0.18">
 <link rel="next" href="api-index-0-22.html" title="Index of new symbols in 0.22">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,8 +23,8 @@
 <tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#idxF">F</a></td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-0-20"></a>Index of new symbols in 0.20</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-0-20"></a>Index of new symbols in 0.20</h1></div></div></div>
 <a name="idx"></a><a name="idxF"></a><h3 class="title">F</h3>
 <dt>
 <a class="link" href="PopplerDocument.html#poppler-fonts-iter-get-encoding" title="poppler_fonts_iter_get_encoding ()">poppler_fonts_iter_get_encoding</a>, function in <a class="link" href="PopplerDocument.html" title="PopplerDocument">PopplerDocument</a>
@@ -37,6 +37,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-0-22.html b/glib/reference/html/api-index-0-22.html
index 033b141c..4848bee7 100644
--- a/glib/reference/html/api-index-0-22.html
+++ b/glib/reference/html/api-index-0-22.html
@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Index of new symbols in 0.22</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <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-20.html" title="Index of new symbols in 0.20">
 <link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -29,8 +29,8 @@
 </td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-0-22"></a>Index of new symbols in 0.22</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-0-22"></a>Index of new symbols in 0.22</h1></div></div></div>
 <a name="idx"></a><a name="idxD"></a><h3 class="title">D</h3>
 <dt>
 <a class="link" href="PopplerDocument.html#poppler-document-new-from-gfile" title="poppler_document_new_from_gfile ()">poppler_document_new_from_gfile</a>, function in <a class="link" href="PopplerDocument.html" title="PopplerDocument">PopplerDocument</a>
@@ -57,6 +57,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-deprecated.html b/glib/reference/html/api-index-deprecated.html
index 064568dd..2d14560d 100644
--- a/glib/reference/html/api-index-deprecated.html
+++ b/glib/reference/html/api-index-deprecated.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="api-index-0-12.html" title="Index of new symbols in 0.12">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,8 +23,8 @@
 <tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#idxP">P</a></td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-deprecated"></a>Index of deprecated symbols</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-deprecated"></a>Index of deprecated symbols</h1></div></div></div>
 <a name="idx"></a><a name="idxP"></a><h3 class="title">P</h3>
 <dt>
 <a class="link" href="PopplerPage.html#poppler-page-get-selection-region" title="poppler_page_get_selection_region ()">poppler_page_get_selection_region</a>, function in <a class="link" href="PopplerPage.html" title="PopplerPage">PopplerPage</a>
@@ -37,6 +37,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/api-index-full.html b/glib/reference/html/api-index-full.html
index f7fb4c2f..b35d4735 100644
--- a/glib/reference/html/api-index-full.html
+++ b/glib/reference/html/api-index-full.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="api-index-deprecated.html" title="Index of deprecated symbols">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -57,8 +57,8 @@
 </td></tr>
 </table>
 <div class="index">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="api-index-full"></a>Index of all symbols</h2></div></div></div>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-full"></a>Index of all symbols</h1></div></div></div>
 <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
 <dt>
 <a class="link" href="poppler-PopplerAction.html#PopplerAction" title="union PopplerAction">PopplerAction</a>, union in <a class="link" href="poppler-PopplerAction.html" title="PopplerAction">PopplerAction</a>
@@ -1347,6 +1347,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/ch01.html b/glib/reference/html/ch01.html
index 7742c517..60823310 100644
--- a/glib/reference/html/ch01.html
+++ b/glib/reference/html/ch01.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="poppler-poppler.html" title="poppler">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,9 +20,9 @@
 <td><a accesskey="n" href="poppler-poppler.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="chapter">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="idp5000896"></a>Poppler</h2></div></div></div>
-<div class="toc"><dl>
+<div class="titlepage"><div><div><h1 class="title">
+<a name="id-1.2"></a>Poppler</h1></div></div></div>
+<div class="toc"><dl class="toc">
 <dt>
 <span class="refentrytitle"><a href="poppler-poppler.html">poppler</a></span><span class="refpurpose"></span>
 </dt>
@@ -60,6 +60,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/home.png b/glib/reference/html/home.png
index fb60b552..8e5eee46 100644
--- a/glib/reference/html/home.png
+++ b/glib/reference/html/home.png
diff --git a/glib/reference/html/index.html b/glib/reference/html/index.html
index fbd62d0d..49eb1950 100644
--- a/glib/reference/html/index.html
+++ b/glib/reference/html/index.html
@@ -3,10 +3,10 @@
 <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.78.1">
 <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)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,13 +15,13 @@
 <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.22.1
+      for Poppler 0.24.1
 
     </p></div>
 </div>
 <hr>
 </div>
-<div class="toc"><dl>
+<div class="toc"><dl class="toc">
 <dt><span class="chapter"><a href="ch01.html">Poppler</a></span></dt>
 <dd><dl>
 <dt>
@@ -71,6 +71,6 @@
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/index.sgml b/glib/reference/html/index.sgml
index a22d5dca..8c6a4735 100644
--- a/glib/reference/html/index.sgml
+++ b/glib/reference/html/index.sgml
@@ -10,7 +10,14 @@
 <ANCHOR id="POPPLER-ERROR-BAD-CATALOG:CAPS" href="poppler/poppler-poppler.html#POPPLER-ERROR-BAD-CATALOG:CAPS">
 <ANCHOR id="POPPLER-ERROR-DAMAGED:CAPS" href="poppler/poppler-poppler.html#POPPLER-ERROR-DAMAGED:CAPS">
 <ANCHOR id="PopplerOrientation" href="poppler/poppler-poppler.html#PopplerOrientation">
+<ANCHOR id="POPPLER-ORIENTATION-PORTRAIT:CAPS" href="poppler/poppler-poppler.html#POPPLER-ORIENTATION-PORTRAIT:CAPS">
+<ANCHOR id="POPPLER-ORIENTATION-LANDSCAPE:CAPS" href="poppler/poppler-poppler.html#POPPLER-ORIENTATION-LANDSCAPE:CAPS">
+<ANCHOR id="POPPLER-ORIENTATION-UPSIDEDOWN:CAPS" href="poppler/poppler-poppler.html#POPPLER-ORIENTATION-UPSIDEDOWN:CAPS">
+<ANCHOR id="POPPLER-ORIENTATION-SEASCAPE:CAPS" href="poppler/poppler-poppler.html#POPPLER-ORIENTATION-SEASCAPE:CAPS">
 <ANCHOR id="PopplerBackend" href="poppler/poppler-poppler.html#PopplerBackend">
+<ANCHOR id="POPPLER-BACKEND-UNKNOWN:CAPS" href="poppler/poppler-poppler.html#POPPLER-BACKEND-UNKNOWN:CAPS">
+<ANCHOR id="POPPLER-BACKEND-SPLASH:CAPS" href="poppler/poppler-poppler.html#POPPLER-BACKEND-SPLASH:CAPS">
+<ANCHOR id="POPPLER-BACKEND-CAIRO:CAPS" href="poppler/poppler-poppler.html#POPPLER-BACKEND-CAIRO:CAPS">
 <ANCHOR id="PopplerColor" href="poppler/poppler-poppler.html#PopplerColor">
 <ANCHOR id="PopplerPrintFlags" href="poppler/poppler-poppler.html#PopplerPrintFlags">
 <ANCHOR id="POPPLER-PRINT-DOCUMENT:CAPS" href="poppler/poppler-poppler.html#POPPLER-PRINT-DOCUMENT:CAPS">
@@ -331,9 +338,22 @@
 <ANCHOR id="PopplerFormField.details" href="poppler/PopplerFormField.html#PopplerFormField.details">
 <ANCHOR id="PopplerFormField-struct" href="poppler/PopplerFormField.html#PopplerFormField-struct">
 <ANCHOR id="PopplerFormFieldType" href="poppler/PopplerFormField.html#PopplerFormFieldType">
+<ANCHOR id="POPPLER-FORM-FIELD-UNKNOWN:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-FIELD-UNKNOWN:CAPS">
+<ANCHOR id="POPPLER-FORM-FIELD-BUTTON:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-FIELD-BUTTON:CAPS">
+<ANCHOR id="POPPLER-FORM-FIELD-TEXT:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-FIELD-TEXT:CAPS">
+<ANCHOR id="POPPLER-FORM-FIELD-CHOICE:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-FIELD-CHOICE:CAPS">
+<ANCHOR id="POPPLER-FORM-FIELD-SIGNATURE:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-FIELD-SIGNATURE:CAPS">
 <ANCHOR id="PopplerFormButtonType" href="poppler/PopplerFormField.html#PopplerFormButtonType">
+<ANCHOR id="POPPLER-FORM-BUTTON-PUSH:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-BUTTON-PUSH:CAPS">
+<ANCHOR id="POPPLER-FORM-BUTTON-CHECK:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-BUTTON-CHECK:CAPS">
+<ANCHOR id="POPPLER-FORM-BUTTON-RADIO:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-BUTTON-RADIO:CAPS">
 <ANCHOR id="PopplerFormChoiceType" href="poppler/PopplerFormField.html#PopplerFormChoiceType">
+<ANCHOR id="POPPLER-FORM-CHOICE-COMBO:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-CHOICE-COMBO:CAPS">
+<ANCHOR id="POPPLER-FORM-CHOICE-LIST:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-CHOICE-LIST:CAPS">
 <ANCHOR id="PopplerFormTextType" href="poppler/PopplerFormField.html#PopplerFormTextType">
+<ANCHOR id="POPPLER-FORM-TEXT-NORMAL:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-TEXT-NORMAL:CAPS">
+<ANCHOR id="POPPLER-FORM-TEXT-MULTILINE:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-TEXT-MULTILINE:CAPS">
+<ANCHOR id="POPPLER-FORM-TEXT-FILE-SELECT:CAPS" href="poppler/PopplerFormField.html#POPPLER-FORM-TEXT-FILE-SELECT:CAPS">
 <ANCHOR id="poppler-form-field-get-field-type" href="poppler/PopplerFormField.html#poppler-form-field-get-field-type">
 <ANCHOR id="poppler-form-field-get-id" href="poppler/PopplerFormField.html#poppler-form-field-get-id">
 <ANCHOR id="poppler-form-field-is-read-only" href="poppler/PopplerFormField.html#poppler-form-field-is-read-only">
@@ -379,12 +399,64 @@
 <ANCHOR id="PopplerAnnotMovie" href="poppler/PopplerAnnot.html#PopplerAnnotMovie">
 <ANCHOR id="PopplerAnnotScreen" href="poppler/PopplerAnnot.html#PopplerAnnotScreen">
 <ANCHOR id="PopplerAnnotType" href="poppler/PopplerAnnot.html#PopplerAnnotType">
+<ANCHOR id="POPPLER-ANNOT-UNKNOWN:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-UNKNOWN:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT:CAPS">
+<ANCHOR id="POPPLER-ANNOT-LINK:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-LINK:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FREE-TEXT:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT:CAPS">
+<ANCHOR id="POPPLER-ANNOT-LINE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-LINE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-SQUARE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-SQUARE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-CIRCLE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-CIRCLE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-POLYGON:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-POLYGON:CAPS">
+<ANCHOR id="POPPLER-ANNOT-POLY-LINE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-POLY-LINE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-HIGHLIGHT:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-HIGHLIGHT:CAPS">
+<ANCHOR id="POPPLER-ANNOT-UNDERLINE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-UNDERLINE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-SQUIGGLY:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-SQUIGGLY:CAPS">
+<ANCHOR id="POPPLER-ANNOT-STRIKE-OUT:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-STRIKE-OUT:CAPS">
+<ANCHOR id="POPPLER-ANNOT-STAMP:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-STAMP:CAPS">
+<ANCHOR id="POPPLER-ANNOT-CARET:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-CARET:CAPS">
+<ANCHOR id="POPPLER-ANNOT-INK:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-INK:CAPS">
+<ANCHOR id="POPPLER-ANNOT-POPUP:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-POPUP:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FILE-ATTACHMENT:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FILE-ATTACHMENT:CAPS">
+<ANCHOR id="POPPLER-ANNOT-SOUND:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-SOUND:CAPS">
+<ANCHOR id="POPPLER-ANNOT-MOVIE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-MOVIE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-WIDGET:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-WIDGET:CAPS">
+<ANCHOR id="POPPLER-ANNOT-SCREEN:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-SCREEN:CAPS">
+<ANCHOR id="POPPLER-ANNOT-PRINTER-MARK:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-PRINTER-MARK:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TRAP-NET:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TRAP-NET:CAPS">
+<ANCHOR id="POPPLER-ANNOT-WATERMARK:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-WATERMARK:CAPS">
+<ANCHOR id="POPPLER-ANNOT-3D:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-3D:CAPS">
 <ANCHOR id="PopplerAnnotFlag" href="poppler/PopplerAnnot.html#PopplerAnnotFlag">
+<ANCHOR id="POPPLER-ANNOT-FLAG-UNKNOWN:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-UNKNOWN:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-INVISIBLE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-INVISIBLE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-HIDDEN:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-HIDDEN:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-PRINT:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-PRINT:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-NO-ZOOM:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-NO-ZOOM:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-NO-ROTATE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-NO-ROTATE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-NO-VIEW:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-NO-VIEW:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-READ-ONLY:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-READ-ONLY:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-LOCKED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-LOCKED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-TOGGLE-NO-VIEW:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-TOGGLE-NO-VIEW:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FLAG-LOCKED-CONTENTS:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FLAG-LOCKED-CONTENTS:CAPS">
 <ANCHOR id="PopplerAnnotExternalDataType" href="poppler/PopplerAnnot.html#PopplerAnnotExternalDataType">
+<ANCHOR id="POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-3D:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-3D:CAPS">
+<ANCHOR id="POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-UNKNOWN:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-UNKNOWN:CAPS">
 <ANCHOR id="PopplerAnnotMarkupReplyType" href="poppler/PopplerAnnot.html#PopplerAnnotMarkupReplyType">
+<ANCHOR id="POPPLER-ANNOT-MARKUP-REPLY-TYPE-R:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-MARKUP-REPLY-TYPE-R:CAPS">
+<ANCHOR id="POPPLER-ANNOT-MARKUP-REPLY-TYPE-GROUP:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-MARKUP-REPLY-TYPE-GROUP:CAPS">
 <ANCHOR id="PopplerAnnotTextState" href="poppler/PopplerAnnot.html#PopplerAnnotTextState">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-MARKED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-MARKED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-UNMARKED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-UNMARKED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-ACCEPTED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-ACCEPTED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-REJECTED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-REJECTED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-CANCELLED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-CANCELLED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-COMPLETED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-COMPLETED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-NONE:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-NONE:CAPS">
+<ANCHOR id="POPPLER-ANNOT-TEXT-STATE-UNKNOWN:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-UNKNOWN:CAPS">
 <ANCHOR id="PopplerAnnotCalloutLine" href="poppler/PopplerAnnot.html#PopplerAnnotCalloutLine">
 <ANCHOR id="PopplerAnnotFreeTextQuadding" href="poppler/PopplerAnnot.html#PopplerAnnotFreeTextQuadding">
+<ANCHOR id="POPPLER-ANNOT-FREE-TEXT-QUADDING-LEFT-JUSTIFIED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT-QUADDING-LEFT-JUSTIFIED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FREE-TEXT-QUADDING-CENTERED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT-QUADDING-CENTERED:CAPS">
+<ANCHOR id="POPPLER-ANNOT-FREE-TEXT-QUADDING-RIGHT-JUSTIFIED:CAPS" href="poppler/PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT-QUADDING-RIGHT-JUSTIFIED:CAPS">
 <ANCHOR id="poppler-annot-get-annot-type" href="poppler/PopplerAnnot.html#poppler-annot-get-annot-type">
 <ANCHOR id="poppler-annot-get-flags" href="poppler/PopplerAnnot.html#poppler-annot-get-flags">
 <ANCHOR id="poppler-annot-get-name" href="poppler/PopplerAnnot.html#poppler-annot-get-name">
diff --git a/glib/reference/html/left.png b/glib/reference/html/left.png
index 48cab276..d92a8ff0 100644
--- a/glib/reference/html/left.png
+++ b/glib/reference/html/left.png
diff --git a/glib/reference/html/poppler-PopplerAction.html b/glib/reference/html/poppler-PopplerAction.html
index b2c7df22..79ea98ed 100644
--- a/glib/reference/html/poppler-PopplerAction.html
+++ b/glib/reference/html/poppler-PopplerAction.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerAttachment.html" title="PopplerAttachment">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -110,8 +110,11 @@ A data structure for holding actions
 <p>
 Data structure for holding a destination
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="poppler-PopplerAction.html#PopplerDestType" title="enum PopplerDestType"><span class="type">PopplerDestType</span></a> <em class="structfield"><code><a name="PopplerDest.type"></a>type</code></em>;</span></p></td>
@@ -292,8 +295,11 @@ Data structure for holding a destination
 <p>
 Action types
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-ACTION-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_ACTION_UNKNOWN</code></span></p></td>
@@ -372,8 +378,11 @@ Action types
 <p>
 Destination types
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-DEST-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_DEST_UNKNOWN</code></span></p></td>
@@ -458,8 +467,11 @@ bounding box within the window
 <p>
 Movie operations
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-ACTION-MOVIE-PLAY:CAPS"></a><span class="term"><code class="literal">POPPLER_ACTION_MOVIE_PLAY</code></span></p></td>
@@ -496,8 +508,11 @@ Movie operations
 <p>
 Action to perform over a list of layers
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><a class="link" href="poppler-PopplerAction.html#PopplerActionLayerAction" title="enum PopplerActionLayerAction"><span class="type">PopplerActionLayerAction</span></a> <em class="structfield"><code><a name="PopplerActionLayer.action"></a>action</code></em>;</span></p></td>
@@ -523,8 +538,11 @@ Action to perform over a list of layers
 <p>
 Layer actions
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-ACTION-LAYER-ON:CAPS"></a><span class="term"><code class="literal">POPPLER_ACTION_LAYER_ON</code></span></p></td>
@@ -552,8 +570,11 @@ Layer actions
 <p>
 Copies <em class="parameter"><code>action</code></em>, creating an identical <a class="link" href="poppler-PopplerAction.html#PopplerAction" title="union PopplerAction"><span class="type">PopplerAction</span></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>action</code></em> :</span></p></td>
@@ -575,8 +596,11 @@ Copies <em class="parameter"><code>action</code></em>, creating an identical <a
 <p>
 Frees <em class="parameter"><code>action</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>action</code></em> :</span></p></td>
 <td>a <a class="link" href="poppler-PopplerAction.html#PopplerAction" title="union PopplerAction"><span class="type">PopplerAction</span></a>
@@ -591,8 +615,11 @@ Frees <em class="parameter"><code>action</code></em>
 <p>
 Copies <em class="parameter"><code>dest</code></em>, creating an identical <a class="link" href="poppler-PopplerAction.html#PopplerDest" title="PopplerDest"><span class="type">PopplerDest</span></a>.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
@@ -614,8 +641,11 @@ Copies <em class="parameter"><code>dest</code></em>, creating an identical <a cl
 <p>
 Frees <em class="parameter"><code>dest</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>dest</code></em> :</span></p></td>
 <td>a <a class="link" href="poppler-PopplerAction.html#PopplerDest" title="PopplerDest"><span class="type">PopplerDest</span></a>
@@ -627,6 +657,6 @@ Frees <em class="parameter"><code>dest</code></em>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/poppler-Version-and-Features-Information.html b/glib/reference/html/poppler-Version-and-Features-Information.html
index 05a97804..90398186 100644
--- a/glib/reference/html/poppler-Version-and-Features-Information.html
+++ b/glib/reference/html/poppler-Version-and-Features-Information.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="api-index-full.html" title="Index of all symbols">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -82,7 +82,7 @@ The major version number of the poppler header files (e.g. in poppler version
 <hr>
 <div class="refsect2">
 <a name="POPPLER-MINOR-VERSION:CAPS"></a><h3>POPPLER_MINOR_VERSION</h3>
-<pre class="programlisting">#define POPPLER_MINOR_VERSION (22)
+<pre class="programlisting">#define POPPLER_MINOR_VERSION (24)
 </pre>
 <p>
 The major version number of the poppler header files (e.g. in poppler version
@@ -108,8 +108,11 @@ The micro version number of the poppler header files (e.g. in poppler version
 <p>
 Checks the version fo the poppler library
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>major</code></em> :</span></p></td>
@@ -137,6 +140,6 @@ as or newer than the passed-in version</td>
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/poppler-poppler.html b/glib/reference/html/poppler-poppler.html
index 96d4aeb7..1b5cbfc4 100644
--- a/glib/reference/html/poppler-poppler.html
+++ b/glib/reference/html/poppler-poppler.html
@@ -3,12 +3,12 @@
 <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.78.1">
 <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">
 <link rel="next" href="PopplerDocument.html" title="PopplerDocument">
-<meta name="generator" content="GTK-Doc V1.18 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.19 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -80,8 +80,11 @@ const <span class="returnvalue">char</span> *        <a class="link" href="poppl
 <p>
 Error codes returned by <a class="link" href="PopplerDocument.html" title="PopplerDocument"><span class="type">PopplerDocument</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-ERROR-INVALID:CAPS"></a><span class="term"><code class="literal">POPPLER_ERROR_INVALID</code></span></p></td>
@@ -121,6 +124,30 @@ Error codes returned by <a class="link" href="PopplerDocument.html" title="Poppl
   POPPLER_ORIENTATION_SEASCAPE
 } PopplerOrientation;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-ORIENTATION-PORTRAIT:CAPS"></a><span class="term"><code class="literal">POPPLER_ORIENTATION_PORTRAIT</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ORIENTATION-LANDSCAPE:CAPS"></a><span class="term"><code class="literal">POPPLER_ORIENTATION_LANDSCAPE</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ORIENTATION-UPSIDEDOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_ORIENTATION_UPSIDEDOWN</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-ORIENTATION-SEASCAPE:CAPS"></a><span class="term"><code class="literal">POPPLER_ORIENTATION_SEASCAPE</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -131,6 +158,26 @@ Error codes returned by <a class="link" href="PopplerDocument.html" title="Poppl
   POPPLER_BACKEND_CAIRO
 } PopplerBackend;
 </pre>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><a name="POPPLER-BACKEND-UNKNOWN:CAPS"></a><span class="term"><code class="literal">POPPLER_BACKEND_UNKNOWN</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-BACKEND-SPLASH:CAPS"></a><span class="term"><code class="literal">POPPLER_BACKEND_SPLASH</code></span></p></td>
+<td></td>
+</tr>
+<tr>
+<td><p><a name="POPPLER-BACKEND-CAIRO:CAPS"></a><span class="term"><code class="literal">POPPLER_BACKEND_CAIRO</code></span></p></td>
+<td></td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -145,8 +192,11 @@ Error codes returned by <a class="link" href="PopplerDocument.html" title="Poppl
 A <a class="link" href="poppler-poppler.html#PopplerColor" title="PopplerColor"><span class="type">PopplerColor</span></a> describes a RGB color. Color components
 are values between 0 and 65535
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><span class="type">guint16</span> <em class="structfield"><code><a name="PopplerColor.red"></a>red</code></em>;</span></p></td>
@@ -176,8 +226,11 @@ are values between 0 and 65535
 <p>
 Printing flags
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-PRINT-DOCUMENT:CAPS"></a><span class="term"><code class="literal">POPPLER_PRINT_DOCUMENT</code></span></p></td>
@@ -216,8 +269,11 @@ Printing flags
 <p>
 Flags using while searching text in a page
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><a name="POPPLER-FIND-DEFAULT:CAPS"></a><span class="term"><code class="literal">POPPLER_FIND_DEFAULT</code></span></p></td>
@@ -249,8 +305,11 @@ Flags using while searching text in a page
 <p>
 Returns the backend compiled into the poppler library.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>The backend used by poppler</td>
@@ -264,8 +323,11 @@ Returns the backend compiled into the poppler library.
 <p>
 Returns the version of poppler in use.  This result is not to be freed.
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>the version of poppler.</td>
@@ -281,8 +343,11 @@ Returns the version of poppler in use.  This result is not to be freed.
 Parses a PDF format date string and converts it to a <span class="type">time_t</span>. Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><span class="type">FALSE</span></a>
 if the parsing fails or the input string is not a valid PDF format date string
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>date</code></em> :</span></p></td>
@@ -309,8 +374,11 @@ if the parsing fails or the input string is not a valid PDF format date string
 <p>
 Creates a new <a class="link" href="poppler-poppler.html#PopplerColor" title="PopplerColor"><span class="type">PopplerColor</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="poppler-poppler.html#PopplerColor" title="PopplerColor"><span class="type">PopplerColor</span></a>, use <a class="link" href="poppler-poppler.html#poppler-color-free" title="poppler_color_free ()"><code class="function">poppler_color_free()</code></a> to free it</td>
@@ -324,8 +392,11 @@ Creates a new <a class="link" href="poppler-poppler.html#PopplerColor" title="Po
 <p>
 Creates a copy of <em class="parameter"><code>color</code></em>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>color</code></em> :</span></p></td>
@@ -346,8 +417,11 @@ Creates a copy of <em class="parameter"><code>color</code></em>
 <p>
 Frees the given <a class="link" href="poppler-poppler.html#PopplerColor" title="PopplerColor"><span class="type">PopplerColor</span></a>
 </p>
-<div class="variablelist"><table border="0">
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
 <col align="left" valign="top">
+<col>
+</colgroup>
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>color</code></em> :</span></p></td>
 <td>a <a class="link" href="poppler-poppler.html#PopplerColor" title="PopplerColor"><span class="type">PopplerColor</span></a>
@@ -359,6 +433,6 @@ Frees the given <a class="link" href="poppler-poppler.html#PopplerColor" title="
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.18</div>
+          Generated by GTK-Doc V1.19</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/glib/reference/html/poppler.devhelp2 b/glib/reference/html/poppler.devhelp2
index 99ba6ba4..0bb34c18 100644
--- a/glib/reference/html/poppler.devhelp2
+++ b/glib/reference/html/poppler.devhelp2
@@ -348,6 +348,13 @@
     <keyword type="constant" name="POPPLER_ERROR_OPEN_FILE" link="poppler-poppler.html#POPPLER-ERROR-OPEN-FILE:CAPS"/>
     <keyword type="constant" name="POPPLER_ERROR_BAD_CATALOG" link="poppler-poppler.html#POPPLER-ERROR-BAD-CATALOG:CAPS"/>
     <keyword type="constant" name="POPPLER_ERROR_DAMAGED" link="poppler-poppler.html#POPPLER-ERROR-DAMAGED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ORIENTATION_PORTRAIT" link="poppler-poppler.html#POPPLER-ORIENTATION-PORTRAIT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ORIENTATION_LANDSCAPE" link="poppler-poppler.html#POPPLER-ORIENTATION-LANDSCAPE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ORIENTATION_UPSIDEDOWN" link="poppler-poppler.html#POPPLER-ORIENTATION-UPSIDEDOWN:CAPS"/>
+    <keyword type="constant" name="POPPLER_ORIENTATION_SEASCAPE" link="poppler-poppler.html#POPPLER-ORIENTATION-SEASCAPE:CAPS"/>
+    <keyword type="constant" name="POPPLER_BACKEND_UNKNOWN" link="poppler-poppler.html#POPPLER-BACKEND-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="POPPLER_BACKEND_SPLASH" link="poppler-poppler.html#POPPLER-BACKEND-SPLASH:CAPS"/>
+    <keyword type="constant" name="POPPLER_BACKEND_CAIRO" link="poppler-poppler.html#POPPLER-BACKEND-CAIRO:CAPS"/>
     <keyword type="constant" name="POPPLER_PRINT_DOCUMENT" link="poppler-poppler.html#POPPLER-PRINT-DOCUMENT:CAPS"/>
     <keyword type="constant" name="POPPLER_PRINT_MARKUP_ANNOTS" link="poppler-poppler.html#POPPLER-PRINT-MARKUP-ANNOTS:CAPS"/>
     <keyword type="constant" name="POPPLER_PRINT_STAMP_ANNOTS_ONLY" link="poppler-poppler.html#POPPLER-PRINT-STAMP-ANNOTS-ONLY:CAPS"/>
@@ -446,5 +453,70 @@
     <keyword type="constant" name="POPPLER_ACTION_LAYER_ON" link="poppler-PopplerAction.html#POPPLER-ACTION-LAYER-ON:CAPS"/>
     <keyword type="constant" name="POPPLER_ACTION_LAYER_OFF" link="poppler-PopplerAction.html#POPPLER-ACTION-LAYER-OFF:CAPS"/>
     <keyword type="constant" name="POPPLER_ACTION_LAYER_TOGGLE" link="poppler-PopplerAction.html#POPPLER-ACTION-LAYER-TOGGLE:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_FIELD_UNKNOWN" link="PopplerFormField.html#POPPLER-FORM-FIELD-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_FIELD_BUTTON" link="PopplerFormField.html#POPPLER-FORM-FIELD-BUTTON:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_FIELD_TEXT" link="PopplerFormField.html#POPPLER-FORM-FIELD-TEXT:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_FIELD_CHOICE" link="PopplerFormField.html#POPPLER-FORM-FIELD-CHOICE:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_FIELD_SIGNATURE" link="PopplerFormField.html#POPPLER-FORM-FIELD-SIGNATURE:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_BUTTON_PUSH" link="PopplerFormField.html#POPPLER-FORM-BUTTON-PUSH:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_BUTTON_CHECK" link="PopplerFormField.html#POPPLER-FORM-BUTTON-CHECK:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_BUTTON_RADIO" link="PopplerFormField.html#POPPLER-FORM-BUTTON-RADIO:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_CHOICE_COMBO" link="PopplerFormField.html#POPPLER-FORM-CHOICE-COMBO:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_CHOICE_LIST" link="PopplerFormField.html#POPPLER-FORM-CHOICE-LIST:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_TEXT_NORMAL" link="PopplerFormField.html#POPPLER-FORM-TEXT-NORMAL:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_TEXT_MULTILINE" link="PopplerFormField.html#POPPLER-FORM-TEXT-MULTILINE:CAPS"/>
+    <keyword type="constant" name="POPPLER_FORM_TEXT_FILE_SELECT" link="PopplerFormField.html#POPPLER-FORM-TEXT-FILE-SELECT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_UNKNOWN" link="PopplerAnnot.html#POPPLER-ANNOT-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_LINK" link="PopplerAnnot.html#POPPLER-ANNOT-LINK:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FREE_TEXT" link="PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_LINE" link="PopplerAnnot.html#POPPLER-ANNOT-LINE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_SQUARE" link="PopplerAnnot.html#POPPLER-ANNOT-SQUARE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_CIRCLE" link="PopplerAnnot.html#POPPLER-ANNOT-CIRCLE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_POLYGON" link="PopplerAnnot.html#POPPLER-ANNOT-POLYGON:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_POLY_LINE" link="PopplerAnnot.html#POPPLER-ANNOT-POLY-LINE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_HIGHLIGHT" link="PopplerAnnot.html#POPPLER-ANNOT-HIGHLIGHT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_UNDERLINE" link="PopplerAnnot.html#POPPLER-ANNOT-UNDERLINE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_SQUIGGLY" link="PopplerAnnot.html#POPPLER-ANNOT-SQUIGGLY:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_STRIKE_OUT" link="PopplerAnnot.html#POPPLER-ANNOT-STRIKE-OUT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_STAMP" link="PopplerAnnot.html#POPPLER-ANNOT-STAMP:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_CARET" link="PopplerAnnot.html#POPPLER-ANNOT-CARET:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_INK" link="PopplerAnnot.html#POPPLER-ANNOT-INK:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_POPUP" link="PopplerAnnot.html#POPPLER-ANNOT-POPUP:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FILE_ATTACHMENT" link="PopplerAnnot.html#POPPLER-ANNOT-FILE-ATTACHMENT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_SOUND" link="PopplerAnnot.html#POPPLER-ANNOT-SOUND:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_MOVIE" link="PopplerAnnot.html#POPPLER-ANNOT-MOVIE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_WIDGET" link="PopplerAnnot.html#POPPLER-ANNOT-WIDGET:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_SCREEN" link="PopplerAnnot.html#POPPLER-ANNOT-SCREEN:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_PRINTER_MARK" link="PopplerAnnot.html#POPPLER-ANNOT-PRINTER-MARK:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TRAP_NET" link="PopplerAnnot.html#POPPLER-ANNOT-TRAP-NET:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_WATERMARK" link="PopplerAnnot.html#POPPLER-ANNOT-WATERMARK:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_3D" link="PopplerAnnot.html#POPPLER-ANNOT-3D:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_UNKNOWN" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_INVISIBLE" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-INVISIBLE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_HIDDEN" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-HIDDEN:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_PRINT" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-PRINT:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_NO_ZOOM" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-NO-ZOOM:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_NO_ROTATE" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-NO-ROTATE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_NO_VIEW" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-NO-VIEW:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_READ_ONLY" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-READ-ONLY:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_LOCKED" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-LOCKED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_TOGGLE_NO_VIEW" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-TOGGLE-NO-VIEW:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FLAG_LOCKED_CONTENTS" link="PopplerAnnot.html#POPPLER-ANNOT-FLAG-LOCKED-CONTENTS:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D" link="PopplerAnnot.html#POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-3D:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN" link="PopplerAnnot.html#POPPLER-ANNOT-EXTERNAL-DATA-MARKUP-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_MARKUP_REPLY_TYPE_R" link="PopplerAnnot.html#POPPLER-ANNOT-MARKUP-REPLY-TYPE-R:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP" link="PopplerAnnot.html#POPPLER-ANNOT-MARKUP-REPLY-TYPE-GROUP:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_MARKED" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-MARKED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_UNMARKED" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-UNMARKED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_ACCEPTED" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-ACCEPTED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_REJECTED" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-REJECTED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_CANCELLED" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-CANCELLED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_COMPLETED" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-COMPLETED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_NONE" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-NONE:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_TEXT_STATE_UNKNOWN" link="PopplerAnnot.html#POPPLER-ANNOT-TEXT-STATE-UNKNOWN:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED" link="PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT-QUADDING-LEFT-JUSTIFIED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED" link="PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT-QUADDING-CENTERED:CAPS"/>
+    <keyword type="constant" name="POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED" link="PopplerAnnot.html#POPPLER-ANNOT-FREE-TEXT-QUADDING-RIGHT-JUSTIFIED:CAPS"/>
   </functions>
 </book>
diff --git a/glib/reference/html/up.png b/glib/reference/html/up.png
index 8eb591f3..1eadd548 100644
--- a/glib/reference/html/up.png
+++ b/glib/reference/html/up.png
diff --git a/glib/reference/version.xml b/glib/reference/version.xml
index a723ece7..48b91fd8 100644
--- a/glib/reference/version.xml
+++ b/glib/reference/version.xml
@@ -1 +1 @@
-0.22.1
+0.24.1
diff --git a/goo/GooMutex.h b/goo/GooMutex.h
index 3f53a626..e9d5a543 100644
--- a/goo/GooMutex.h
+++ b/goo/GooMutex.h
@@ -16,6 +16,9 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 //
 // 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
@@ -53,11 +56,26 @@ typedef CRITICAL_SECTION GooMutex;
 
 typedef pthread_mutex_t GooMutex;
 
-#define gInitMutex(m) pthread_mutex_init(m, NULL)
+inline void gInitMutex(GooMutex *m) {
+  pthread_mutexattr_t mutexattr;
+  pthread_mutexattr_init(&mutexattr);
+  pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE);
+  pthread_mutex_init(m, &mutexattr);
+  pthread_mutexattr_destroy(&mutexattr);
+}
 #define gDestroyMutex(m) pthread_mutex_destroy(m)
 #define gLockMutex(m) pthread_mutex_lock(m)
 #define gUnlockMutex(m) pthread_mutex_unlock(m)
 
 #endif
 
+class MutexLocker {
+public:
+  MutexLocker(GooMutex *mutexA) : mutex(mutexA) { gLockMutex(mutex); }
+  ~MutexLocker() { gUnlockMutex(mutex); }
+
+private:
+  GooMutex *mutex;
+};
+
 #endif
diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
index 09f9b7b6..9b7c5051 100644
--- a/goo/JpegWriter.cc
+++ b/goo/JpegWriter.cc
@@ -8,6 +8,7 @@
 // Copyright (C) 2010, 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org>
 // Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
 //
 //========================================================================
 
@@ -117,7 +118,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
 
   // Set quality
   if (priv->quality >= 0 && priv->quality <= 100) {
-    jpeg_set_quality(&priv->cinfo, priv->quality, true);
+    jpeg_set_quality(&priv->cinfo, priv->quality, TRUE);
   }
 
   // Use progressive mode
diff --git a/goo/Makefile.in b/goo/Makefile.in
index f8c93bfd..f9875ac4 100644
--- a/goo/Makefile.in
+++ b/goo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,10 +80,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = goo
-DIST_COMMON = $(am__poppler_goo_include_HEADERS_DIST) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(am__poppler_goo_include_HEADERS_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -79,6 +106,19 @@ libgoo_la_OBJECTS = $(am_libgoo_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -91,17 +131,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -110,17 +149,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libgoo_la_SOURCES)
 DIST_SOURCES = $(libgoo_la_SOURCES)
 am__can_run_installinfo = \
@@ -161,6 +199,23 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(poppler_goo_includedir)"
 HEADERS = $(poppler_goo_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -256,6 +311,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -290,10 +348,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -315,13 +379,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -449,12 +513,15 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libgoo.la: $(libgoo_la_OBJECTS) $(libgoo_la_DEPENDENCIES) $(EXTRA_libgoo_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(CXXLINK)  $(libgoo_la_OBJECTS) $(libgoo_la_LIBADD) $(LIBS)
 
@@ -527,26 +594,15 @@ uninstall-poppler_goo_includeHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(poppler_goo_includedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -558,15 +614,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -575,6 +627,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -719,19 +786,19 @@ uninstall-am: uninstall-poppler_goo_includeHEADERS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-poppler_goo_includeHEADERS \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-poppler_goo_includeHEADERS install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-poppler_goo_includeHEADERS
 
 
diff --git a/goo/gfile.cc b/goo/gfile.cc
index b075b2ba..c590a193 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -18,9 +18,12 @@
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2008 Adam Batkin <adam@batkin.net>
-// Copyright (C) 2008, 2010, 2012 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2008, 2010, 2012, 2013 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2009, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
 //
 // 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
@@ -49,6 +52,8 @@
 #    include <unixlib.h>
 #  endif
 #endif // _WIN32
+#include <stdio.h>
+#include <limits>
 #include "GooString.h"
 #include "gfile.h"
 
@@ -546,6 +551,125 @@ char *getLine(char *buf, int size, FILE *f) {
   return buf;
 }
 
+int Gfseek(FILE *f, Goffset offset, int whence) {
+#if HAVE_FSEEKO
+  return fseeko(f, offset, whence);
+#elif HAVE_FSEEK64
+  return fseek64(f, offset, whence);
+#elif defined(__MINGW32__)
+  return fseeko64(f, offset, whence);
+#elif _WIN32
+  return _fseeki64(f, offset, whence);
+#else
+  return fseek(f, offset, whence);
+#endif
+}
+
+Goffset Gftell(FILE *f) {
+#if HAVE_FSEEKO
+  return ftello(f);
+#elif HAVE_FSEEK64
+  return ftell64(f);
+#elif defined(__MINGW32__)
+  return ftello64(f);
+#elif _WIN32
+  return _ftelli64(f);
+#else
+  return ftell(f);
+#endif
+}
+
+Goffset GoffsetMax() {
+#if HAVE_FSEEKO
+  return (std::numeric_limits<off_t>::max)();
+#elif HAVE_FSEEK64 || defined(__MINGW32__)
+  return (std::numeric_limits<off64_t>::max)();
+#elif _WIN32
+  return (std::numeric_limits<__int64>::max)();
+#else
+  return (std::numeric_limits<long>::max)();
+#endif
+}
+
+//------------------------------------------------------------------------
+// GooFile
+//------------------------------------------------------------------------
+
+#ifdef _WIN32
+
+int GooFile::read(char *buf, int n, Goffset offset) const {
+  DWORD m;
+  
+  LARGE_INTEGER largeInteger = {0};
+  largeInteger.QuadPart = offset;
+  
+  OVERLAPPED overlapped = {0};
+  overlapped.Offset = largeInteger.LowPart;
+  overlapped.OffsetHigh = largeInteger.HighPart;
+
+  return FALSE == ReadFile(handle, buf, n, &m, &overlapped) ? -1 : m;
+}
+
+Goffset GooFile::size() const {
+  LARGE_INTEGER size = {(DWORD)-1,-1};
+  
+  GetFileSizeEx(handle, &size);
+
+  return size.QuadPart;
+}
+
+GooFile* GooFile::open(const GooString *fileName) {
+  HANDLE handle = CreateFile(fileName->getCString(),
+                              GENERIC_READ,
+                              FILE_SHARE_READ,
+                              NULL,
+                              OPEN_EXISTING,
+                              FILE_ATTRIBUTE_NORMAL, NULL);
+  
+  return handle == INVALID_HANDLE_VALUE ? NULL : new GooFile(handle);
+}
+
+GooFile* GooFile::open(const wchar_t *fileName) {
+  HANDLE handle = CreateFileW(fileName,
+                              GENERIC_READ,
+                              FILE_SHARE_READ,
+                              NULL,
+                              OPEN_EXISTING,
+                              FILE_ATTRIBUTE_NORMAL, NULL);
+  
+  return handle == INVALID_HANDLE_VALUE ? NULL : new GooFile(handle);
+}
+
+#else
+
+int GooFile::read(char *buf, int n, Goffset offset) const {
+#ifdef HAVE_PREAD64
+  return pread64(fd, buf, n, offset);
+#else
+  return pread(fd, buf, n, offset);
+#endif
+}
+
+Goffset GooFile::size() const {
+#ifdef HAVE_LSEEK64
+  return lseek64(fd, 0, SEEK_END);
+#else
+  return lseek(fd, 0, SEEK_END);
+#endif
+}
+
+GooFile* GooFile::open(const GooString *fileName) {
+#ifdef VMS
+  int fd = ::open(fileName->getCString(), Q_RDONLY, "ctx=stm");
+#else
+  int fd = ::open(fileName->getCString(), O_RDONLY);
+#endif
+  
+  return fd < 0 ? NULL : new GooFile(fd);
+}
+
+#endif // _WIN32
+
 //------------------------------------------------------------------------
 // GDir and GDirEntry
 //------------------------------------------------------------------------
diff --git a/goo/gfile.h b/goo/gfile.h
index 4e110238..5f546f11 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -18,6 +18,8 @@
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2009, 2011, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -114,6 +116,42 @@ extern FILE *openFile(const char *path, const char *mode);
 // conventions.
 extern char *getLine(char *buf, int size, FILE *f);
 
+// Like fseek/ftell but uses platform specific variants that support large files
+extern int Gfseek(FILE *f, Goffset offset, int whence);
+extern Goffset Gftell(FILE *f);
+
+// Largest offset supported by Gfseek/Gftell
+extern Goffset GoffsetMax();
+
+//------------------------------------------------------------------------
+// GooFile
+//------------------------------------------------------------------------
+
+class GooFile
+{
+public:
+  int read(char *buf, int n, Goffset offset) const;
+  Goffset size() const;
+  
+  static GooFile *open(const GooString *fileName);
+  
+#ifdef _WIN32
+  static GooFile *open(const wchar_t *fileName);
+  
+  ~GooFile() { CloseHandle(handle); }
+  
+private:
+  GooFile(HANDLE handleA): handle(handleA) {}
+  HANDLE handle;
+#else
+  ~GooFile() { close(fd); }
+    
+private:
+  GooFile(int fdA) : fd(fdA) {}
+  int fd;
+#endif // _WIN32
+};
+
 //------------------------------------------------------------------------
 // GDir and GDirEntry
 //------------------------------------------------------------------------
diff --git a/goo/gtypes.h b/goo/gtypes.h
index b7a2dd2d..a8d45194 100644
--- a/goo/gtypes.h
+++ b/goo/gtypes.h
@@ -15,6 +15,7 @@
 //
 // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
 // Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -24,6 +25,8 @@
 #ifndef GTYPES_H
 #define GTYPES_H
 
+#include "poppler-config.h"
+
 /*
  * These have stupid names to avoid conflicts with some (but not all)
  * C++ compilers which define them.
@@ -44,5 +47,6 @@ typedef unsigned char Guchar;
 typedef unsigned short Gushort;
 typedef unsigned int Guint;
 typedef unsigned long Gulong;
+typedef long long Goffset;
 
 #endif
diff --git a/gtk-doc.make b/gtk-doc.make
index 9841de47..104c3993 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -74,31 +74,40 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
+
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    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 -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	fi
-	@touch setup-build.stamp
+	$(AM_V_at)touch setup-build.stamp
 
 
 #### scan ####
 
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0=@echo "  DOC   Scanning header files";
+
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
+
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_SCAN)_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"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	    if test "$(?)" = "0"; then \
@@ -113,32 +122,41 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
 #### xml ####
 
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0=@echo "  DOC   Building 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'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
 #### html ####
 
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0=@echo "  DOC   Building HTML";
+
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -159,16 +177,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 #### pdf ####
 
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -185,7 +205,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
@@ -200,7 +220,7 @@ distclean-local:
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -237,7 +257,7 @@ uninstall-local:
 # Require gtk-doc when making dist
 #
 if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
 	@echo "*** gtk-doc must be installed and enabled in order to make dist"
diff --git a/install-sh b/install-sh
index a9244eb0..377bb868 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
+	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@ do
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
diff --git a/ltmain.sh b/ltmain.sh
index 0096fe6c..3825a2aa 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -70,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
+VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1"
 TIMESTAMP=""
 package_revision=1.3337
 
diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4
deleted file mode 100644
index 7ac8ffdd..00000000
--- a/m4/acx_pthread.m4
+++ /dev/null
@@ -1,280 +0,0 @@
-##### http://autoconf-archive.cryp.to/acx_pthread.html
-#
-# SYNOPSIS
-#
-#   ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads.
-#   It sets the PTHREAD_LIBS output variable to the threads library and
-#   linker flags, and the PTHREAD_CFLAGS output variable to any special
-#   C compiler flags that are needed. (The user can also force certain
-#   compiler flags/libs to be tested by setting these environment
-#   variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise).
-#   (This is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these
-#   flags, but also link it with them as well. e.g. you should link
-#   with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
-#   $LIBS
-#
-#   If you are only building threads programs, you may wish to use
-#   these variables in your default LIBS, CFLAGS, and CC:
-#
-#          LIBS="$PTHREAD_LIBS $LIBS"
-#          CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#          CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-#   constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads
-#   library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-#   run it if it is not found. If ACTION-IF-FOUND is not specified, the
-#   default action will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or
-#   if you have any other suggestions or comments. This macro was based
-#   on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/)
-#   (with help from M. Frigo), as well as ac_pthread and hb_pthread
-#   macros posted by Alejandro Forero Cuervo to the autoconf macro
-#   repository. We are also grateful for the helpful feedback of
-#   numerous users.
-#
-# LAST MODIFICATION
-#
-#   2006-05-29
-#
-# COPYLEFT
-#
-#   Copyright (c) 2006 Steven G. Johnson <stevenj@alum.mit.edu>
-#
-#   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 the Free Software Foundation; either version 2 of the
-#   License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-#   02111-1307, USA.
-#
-#   As a special exception, the respective Autoconf Macro's copyright
-#   owner gives unlimited permission to copy, distribute and modify the
-#   configure scripts that are the output of Autoconf when processing
-#   the Macro. You need not follow the terms of the GNU General Public
-#   License when using or distributing such scripts, even though
-#   portions of the text of the Macro appear in them. The GNU General
-#   Public License (GPL) does govern all other use of the material that
-#   constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the
-#   Autoconf Macro released by the Autoconf Macro Archive. When you
-#   make and distribute a modified version of the Autoconf Macro, you
-#   may extend this special exception to the GPL to apply to your
-#   modified version as well.
-
-AC_DEFUN([ACX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG_C
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test x"$acx_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
-        *solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
-        ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CFLAGS="$flag"
-                ;;
-
-		pthread-config)
-		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
-		if test x"$acx_pthread_config" = xno; then continue; fi
-		PTHREAD_CFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CFLAGS="$CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        AC_TRY_LINK([#include <pthread.h>],
-                    [pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-                    [acx_pthread_ok=yes])
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test "x$acx_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-	AC_MSG_CHECKING([for joinable pthread attribute])
-	attr_name=unknown
-	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
-                        [attr_name=$attr; break])
-	done
-        AC_MSG_RESULT($attr_name)
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-                               [Define to necessary symbol if this constant
-                                uses a non-standard name on your system.])
-        fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-        fi
-
-        LIBS="$save_LIBS"
-        CFLAGS="$save_CFLAGS"
-
-        # More AIX lossage: must compile with xlc_r or cc_r
-	if test x"$GCC" != xyes; then
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
-        else
-          PTHREAD_CC=$CC
-	fi
-else
-        PTHREAD_CC="$CC"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CFLAGS)
-AC_SUBST(PTHREAD_CC)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-        :
-else
-        acx_pthread_ok=no
-        $2
-fi
-AC_LANG_RESTORE
-])dnl ACX_PTHREAD
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
new file mode 100644
index 00000000..de0ab8f5
--- /dev/null
+++ b/m4/ax_pthread.m4
@@ -0,0 +1,317 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   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 the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 20
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test x"$ax_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread pthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+                [ax_pthread_ok=yes],
+                [])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($ax_pthread_ok)
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT($attr_name)
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            ax_cv_PTHREAD_PRIO_INHERIT, [
+                AC_LINK_IFELSE([
+                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != xyes; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                  [#handle absolute path differently from PATH based program lookup
+                   AS_CASE(["x$CC"],
+                     [x/*],
+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index 0ada1519..ac2eccb4 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -37,7 +37,7 @@ AC_DEFUN([GTK_DOC_CHECK],
     dnl don't check for glib if we build glib
     if test "x$PACKAGE_NAME" != "xglib"; then
       dnl don't fail if someone does not have glib
-      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
+      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
     fi
   fi
 
@@ -58,6 +58,10 @@ AC_DEFUN([GTK_DOC_CHECK],
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+  AC_SUBST([AM_DEFAULT_VERBOSITY])
 
   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 828104cf..02b4bbec 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1324,7 +1324,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -1688,7 +1695,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -2512,17 +2520,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -2639,7 +2636,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -3255,10 +3252,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3297,7 +3290,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4049,7 +4042,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4348,7 +4341,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -6241,9 +6234,6 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6405,7 +6395,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
diff --git a/missing b/missing
index 86a8fc31..cdea5149 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2012-06-26.16; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # 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
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
-esac
-
-exit 0
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/poppler-qt5-uninstalled.pc.in b/poppler-qt5-uninstalled.pc.in
new file mode 100644
index 00000000..a91e1d5a
--- /dev/null
+++ b/poppler-qt5-uninstalled.pc.in
@@ -0,0 +1,7 @@
+Name: poppler-qt5
+Description: Qt5 bindings for poppler - uninstalled
+Version: @VERSION@
+Requires: poppler = @VERSION@ 
+
+Libs: ${pc_top_builddir}/${pcfiledir}/qt5/src/libpoppler-qt5.la
+Cflags: -I${pc_top_builddir}/${pcfiledir}/qt5/src
diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake
new file mode 100644
index 00000000..b4d87b76
--- /dev/null
+++ b/poppler-qt5.pc.cmake
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib@LIB_SUFFIX@
+includedir=${prefix}/include
+
+Name: poppler-qt5
+Description: Qt5 bindings for poppler
+Version: @POPPLER_VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
+
+Libs: -L${libdir} -lpoppler-qt5
+Cflags: -I${includedir}/poppler/qt5
diff --git a/poppler-qt5.pc.in b/poppler-qt5.pc.in
new file mode 100644
index 00000000..cda4c6f8
--- /dev/null
+++ b/poppler-qt5.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: poppler-qt5
+Description: Qt5 bindings for poppler
+Version: @VERSION@
+Requires: @PC_REQUIRES@
+@PC_REQUIRES_PRIVATE@
+
+Libs: -L${libdir} -lpoppler-qt5
+Cflags: -I${includedir}/poppler/qt5
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index dae0f622..00291f8c 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -15,18 +15,19 @@
 //
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2012 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2007-2012 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2008, 2011 Pino Toscano <pino@kde.org>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
-// Copyright (C) 2011 José Aliste <jaliste@src.gnome.org>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
-// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011, 2013 José Aliste <jaliste@src.gnome.org>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com>
+// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
 //
 // 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
@@ -67,6 +68,14 @@
 #include "Link.h"
 #include <string.h>
 
+#if MULTITHREADED
+#  define annotLocker()   MutexLocker locker(&mutex)
+#  define annotCondLocker(X)  MutexLocker locker(&mutex, (X))
+#else
+#  define annotLocker()
+#  define annotCondLocker(X)
+#endif
+
 #define fieldFlagReadOnly           0x00000001
 #define fieldFlagRequired           0x00000002
 #define fieldFlagNoExport           0x00000004
@@ -1073,7 +1082,6 @@ void AnnotAppearanceBBox::extendTo(double x, double y) {
 }
 
 void AnnotAppearanceBBox::getBBoxRect(double bbox[4]) const {
-  Object obj2;
   bbox[0] = minX - borderWidth;
   bbox[1] = minY - borderWidth;
   bbox[2] = maxX + borderWidth;
@@ -1293,6 +1301,10 @@ void Annot::initialize(PDFDoc *docA, Dict *dict) {
   obj1.free();
 
   dict->lookupNF("OC", &oc);
+
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
 }
 
 void Annot::getRect(double *x1, double *y1, double *x2, double *y2) const {
@@ -1332,6 +1344,7 @@ void Annot::setRect(double x1, double y1, double x2, double y2) {
   obj1.arrayAdd (obj2.initReal (rect->y2));
 
   update("Rect", &obj1);
+  invalidateAppearance();
 }
 
 GBool Annot::inRect(double x, double y) const {
@@ -1339,6 +1352,7 @@ GBool Annot::inRect(double x, double y) const {
 }
 
 void Annot::update(const char *key, Object *value) {
+  annotLocker();
   /* Set M to current time, unless we are updating M itself */
   if (strcmp(key, "M") != 0) {
     delete modified;
@@ -1355,6 +1369,7 @@ void Annot::update(const char *key, Object *value) {
 }
 
 void Annot::setContents(GooString *new_content) {
+  annotLocker();
   delete contents;
 
   if (new_content) {
@@ -1374,6 +1389,7 @@ void Annot::setContents(GooString *new_content) {
 }
 
 void Annot::setName(GooString *new_name) {
+  annotLocker();
   delete name;
 
   if (new_name) {
@@ -1388,6 +1404,7 @@ void Annot::setName(GooString *new_name) {
 }
 
 void Annot::setModified(GooString *new_modified) {
+  annotLocker();
   delete modified;
 
   if (new_modified)
@@ -1401,6 +1418,7 @@ void Annot::setModified(GooString *new_modified) {
 }
 
 void Annot::setFlags(Guint new_flags) {
+  annotLocker();
   Object obj1;
   flags = new_flags;
   obj1.initInt(flags);
@@ -1408,6 +1426,7 @@ void Annot::setFlags(Guint new_flags) {
 }
 
 void Annot::setBorder(AnnotBorderArray *new_border) {
+  annotLocker();
   delete border;
 
   if (new_border) {
@@ -1418,9 +1437,11 @@ void Annot::setBorder(AnnotBorderArray *new_border) {
   } else {
     border = NULL;
   }
+  invalidateAppearance();
 }
 
 void Annot::setColor(AnnotColor *new_color) {
+  annotLocker();
   delete color;
 
   if (new_color) {
@@ -1431,9 +1452,11 @@ void Annot::setColor(AnnotColor *new_color) {
   } else {
     color = NULL;
   }
+  invalidateAppearance();
 }
 
 void Annot::setPage(int pageIndex, GBool updateP) {
+  annotLocker();
   Page *pageobj = doc->getPage(pageIndex);
   Object obj1;
 
@@ -1452,6 +1475,7 @@ void Annot::setPage(int pageIndex, GBool updateP) {
 }
 
 void Annot::setAppearanceState(const char *state) {
+  annotLocker();
   if (!state)
     return;
 
@@ -1475,18 +1499,31 @@ void Annot::setAppearanceState(const char *state) {
 }
 
 void Annot::invalidateAppearance() {
+  annotLocker();
   if (appearStreams) { // Remove existing appearance streams
     appearStreams->removeAllStreams();
   }
   delete appearStreams;
   appearStreams = NULL;
 
-  setAppearanceState("Off"); // Default appearance state
+  delete appearState;
+  appearState = NULL;
 
-  Object obj1;
+  delete appearBBox;
+  appearBBox = NULL;
+
+  appearance.free();
+  appearance.initNull();
+
+  Object obj1, obj2;
   obj1.initNull();
-  update ("AP", &obj1); // Remove AP
-  update ("AS", &obj1); // Remove AS
+  if (!annotObj.dictLookup("AP", &obj2)->isNull())
+    update ("AP", &obj1); // Remove AP
+  obj2.free();
+
+  if (!annotObj.dictLookup("AS", &obj2)->isNull())
+    update ("AS", &obj1); // Remove AS
+  obj2.free();
 }
 
 double Annot::getXMin() {
@@ -1497,6 +1534,14 @@ double Annot::getYMin() {
   return rect->y1;
 }
 
+double Annot::getXMax() {
+  return rect->x2;
+}
+
+double Annot::getYMax() {
+  return rect->y2;
+}
+
 void Annot::readArrayNum(Object *pdfArray, int key, double *value) {
   Object valueObject;
 
@@ -1516,12 +1561,24 @@ void Annot::removeReferencedObjects() {
 }
 
 void Annot::incRefCnt() {
+  annotLocker();
   refCnt++;
 }
 
 void Annot::decRefCnt() {
-  if (--refCnt == 0)
+#if MULTITHREADED
+  gLockMutex(&mutex);
+#endif
+  if (--refCnt == 0) {
+#if MULTITHREADED
+    gUnlockMutex(&mutex);
+#endif
     delete this;
+    return;
+  }
+#if MULTITHREADED
+  gUnlockMutex(&mutex);
+#endif
 }
 
 Annot::~Annot() {
@@ -1552,6 +1609,10 @@ Annot::~Annot() {
     delete color;
 
   oc.free();
+
+#if MULTITHREADED
+    gDestroyMutex(&mutex);
+#endif
 }
 
 void Annot::setColor(AnnotColor *color, GBool fill) {
@@ -1741,16 +1802,29 @@ GBool Annot::isVisible(GBool printing) {
   return gTrue;
 }
 
+int Annot::getRotation() const
+{
+  Page *pageobj = doc->getPage(page);
+  assert(pageobj != NULL);
+
+  if (flags & flagNoRotate) {
+    return (360 - pageobj->getRotate()) % 360;
+  } else {
+    return 0;
+  }
+}
+
 void Annot::draw(Gfx *gfx, GBool printing) {
   Object obj;
 
+  annotLocker();
   if (!isVisible (printing))
     return;
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-      rect->x1, rect->y1, rect->x2, rect->y2);
+      rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -1950,6 +2024,7 @@ void AnnotMarkup::setOpacity(double opacityA) {
   opacity = opacityA;
   obj1.initReal(opacity);
   update ("CA", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotMarkup::setDate(GooString *new_date) {
@@ -2108,6 +2183,7 @@ void AnnotText::setIcon(GooString *new_icon) {
   Object obj1;
   obj1.initName (icon->getCString());
   update("Name", &obj1);
+  invalidateAppearance();
 }
 
 #define ANNOT_TEXT_AP_NOTE                                                    \
@@ -2361,6 +2437,7 @@ void AnnotText::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     ca = opacity;
 
@@ -2412,14 +2489,15 @@ void AnnotText::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -2510,10 +2588,11 @@ void AnnotLink::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, border, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -2651,6 +2730,11 @@ void AnnotFreeText::initialize(PDFDoc *docA, Dict *dict) {
   obj1.free();
 }
 
+void AnnotFreeText::setContents(GooString *new_content) {
+  Annot::setContents(new_content);
+  invalidateAppearance();
+}
+
 void AnnotFreeText::setAppearanceString(GooString *new_string) {
   delete appearanceString;
 
@@ -2663,6 +2747,7 @@ void AnnotFreeText::setAppearanceString(GooString *new_string) {
   Object obj1;
   obj1.initString(appearanceString->copy());
   update ("DA", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotFreeText::setQuadding(AnnotFreeTextQuadding new_quadding) {
@@ -2670,6 +2755,7 @@ void AnnotFreeText::setQuadding(AnnotFreeTextQuadding new_quadding) {
   quadding = new_quadding;
   obj1.initInt((int)quadding);
   update ("Q", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotFreeText::setStyleString(GooString *new_string) {
@@ -2720,6 +2806,7 @@ void AnnotFreeText::setCalloutLine(AnnotCalloutLine *line) {
   }
 
   update("CL", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotFreeText::setIntent(AnnotFreeTextIntent new_intent) {
@@ -2939,14 +3026,15 @@ void AnnotFreeText::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     generateFreeTextAppearance();
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                 rect->x1, rect->y1, rect->x2, rect->y2);
+                 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -2963,21 +3051,13 @@ Object *AnnotFreeText::getAppearanceResDict(Object *dest) {
 // AnnotLine
 //------------------------------------------------------------------------
 
-AnnotLine::AnnotLine(PDFDoc *docA, PDFRectangle *rect, PDFRectangle *lRect) :
+AnnotLine::AnnotLine(PDFDoc *docA, PDFRectangle *rect) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
   type = typeLine;
   annotObj.dictSet ("Subtype", obj1.initName ("Line"));
 
-  Object obj2, obj3;
-  obj2.initArray (doc->getXRef());
-  obj2.arrayAdd (obj3.initReal (lRect->x1));
-  obj2.arrayAdd (obj3.initReal (lRect->y1));
-  obj2.arrayAdd (obj3.initReal (lRect->x2));
-  obj2.arrayAdd (obj3.initReal (lRect->y2));
-  annotObj.dictSet ("L", &obj2);
-
   initialize (docA, annotObj.getDict());
 }
 
@@ -3135,6 +3215,12 @@ void AnnotLine::initialize(PDFDoc *docA, Dict *dict) {
   obj1.free();
 }
 
+void AnnotLine::setContents(GooString *new_content) {
+  Annot::setContents(new_content);
+  if (caption)
+    invalidateAppearance();
+}
+
 void AnnotLine::setVertices(double x1, double y1, double x2, double y2) {
   Object obj1, obj2;
 
@@ -3150,6 +3236,7 @@ void AnnotLine::setVertices(double x1, double y1, double x2, double y2) {
   obj1.arrayAdd( obj2.initReal(y2) );
 
   update("L", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end) {
@@ -3163,6 +3250,7 @@ void AnnotLine::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyl
   obj1.arrayAdd( obj2.initName(convertAnnotLineEndingStyle( endStyle )) );
 
   update("LE", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setInteriorColor(AnnotColor *new_color) {
@@ -3176,6 +3264,7 @@ void AnnotLine::setInteriorColor(AnnotColor *new_color) {
   } else {
     interiorColor = NULL;
   }
+  invalidateAppearance();
 }
 
 void AnnotLine::setLeaderLineLength(double len) {
@@ -3184,6 +3273,7 @@ void AnnotLine::setLeaderLineLength(double len) {
   leaderLineLength = len;
   obj1.initReal(len);
   update ("LL", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setLeaderLineExtension(double len) {
@@ -3196,6 +3286,7 @@ void AnnotLine::setLeaderLineExtension(double len) {
   // LL is required if LLE is present
   obj1.initReal(leaderLineLength);
   update ("LL", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setCaption(bool new_cap) {
@@ -3204,6 +3295,7 @@ void AnnotLine::setCaption(bool new_cap) {
   caption = new_cap;
   obj1.initBool(new_cap);
   update ("Cap", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotLine::setIntent(AnnotLineIntent new_intent) {
@@ -3411,19 +3503,21 @@ void AnnotLine::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     generateLineAppearance();
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -3440,8 +3534,7 @@ Object *AnnotLine::getAppearanceResDict(Object *dest) {
 //------------------------------------------------------------------------
 // AnnotTextMarkup
 //------------------------------------------------------------------------
-AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType,
-				 AnnotQuadrilaterals *quadPoints) :
+AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
@@ -3462,22 +3555,12 @@ AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype
       assert (0 && "Invalid subtype for AnnotTextMarkup\n");
   }
 
-  Object obj2;
+  // Store dummy quadrilateral with null coordinates
+  Object obj2, obj3;
   obj2.initArray (doc->getXRef());
-
-  for (int i = 0; i < quadPoints->getQuadrilateralsLength(); ++i) {
-    Object obj3;
-
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX1(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY1(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX2(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY2(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX3(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY3(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getX4(i)));
-    obj2.arrayAdd (obj3.initReal (quadPoints->getY4(i)));
+  for (int i = 0; i < 4*2; ++i) {
+    obj2.arrayAdd (obj3.initReal (0));
   }
-
   annotObj.dictSet ("QuadPoints", &obj2);
 
   initialize(docA, annotObj.getDict());
@@ -3545,6 +3628,7 @@ void AnnotTextMarkup::setType(AnnotSubtype new_type) {
 
   type = new_type;
   update("Subtype", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotTextMarkup::setQuadrilaterals(AnnotQuadrilaterals *quadPoints) {
@@ -3565,6 +3649,7 @@ void AnnotTextMarkup::setQuadrilaterals(AnnotQuadrilaterals *quadPoints) {
   quadrilaterals = new AnnotQuadrilaterals(obj1.getArray(), rect);
 
   annotObj.dictSet ("QuadPoints", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
@@ -3576,6 +3661,7 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull() || type == typeHighlight) {
     GBool blendMultiply = gTrue;
     ca = opacity;
@@ -3601,14 +3687,15 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
       appearBuf->append ("[] 0 d 1 w\n");
 
       for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
-        double x1, x2, y3;
+	double x3, y3, x4, y4;
 
-	x1 = quadrilaterals->getX1(i);
-	x2 = quadrilaterals->getX2(i);
+	x3 = quadrilaterals->getX3(i);
 	y3 = quadrilaterals->getY3(i);
+	x4 = quadrilaterals->getX4(i);
+	y4 = quadrilaterals->getY4(i);
 
-	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3);
-	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3);
+	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
+	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x4, y4);
 	appearBuf->append ("S\n");
       }
       break;
@@ -3620,17 +3707,21 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
       appearBuf->append ("[] 0 d 1 w\n");
 
       for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) {
-        double x1, y1, x2, y3;
-	double h2;
+	double x1, y1, x2, y2;
+	double x3, y3, x4, y4;
 
 	x1 = quadrilaterals->getX1(i);
 	y1 = quadrilaterals->getY1(i);
 	x2 = quadrilaterals->getX2(i);
+	y2 = quadrilaterals->getY2(i);
+
+	x3 = quadrilaterals->getX3(i);
 	y3 = quadrilaterals->getY3(i);
-	h2 = (y1 - y3) / 2.0;
+	x4 = quadrilaterals->getX4(i);
+	y4 = quadrilaterals->getY4(i);
 
-	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x1, y3+h2);
-	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", x2, y3+h2);
+	appearBuf->appendf ("{0:.2f} {1:.2f} m\n", (x1+x3)/2., (y1+y3)/2.);
+	appearBuf->appendf ("{0:.2f} {1:.2f} l\n", (x2+x4)/2., (y2+y4)/2.);
 	appearBuf->append ("S\n");
       }
       break;
@@ -3724,14 +3815,15 @@ void AnnotTextMarkup::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -4898,7 +4990,7 @@ void AnnotWidget::generateFieldAppearance() {
   }
 
   // build the appearance stream
-  appearStream = new MemStream(strdup(appearBuf->getCString()), 0,
+  appearStream = new MemStream(copyString(appearBuf->getCString()), 0,
       appearBuf->getLength(), &appearDict);
   appearance.free();
   appearance.initStream(appearStream);
@@ -4956,6 +5048,7 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   addDingbatsResource = gFalse;
 
   // Only construct the appearance stream when
@@ -4967,7 +5060,7 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   if (addDingbatsResource) {
     // We are forcing ZaDb but the font does not exist
     // so create a fake one
@@ -4976,25 +5069,25 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) {
     subtypeObj.initName("Type1");
 
     Object fontDictObj;
-    Dict *fontDict = new Dict(xref);
+    Dict *fontDict = new Dict(gfx->getXRef());
     fontDict->decRef();
     fontDict->add(copyString("BaseFont"), &baseFontObj);
     fontDict->add(copyString("Subtype"), &subtypeObj);
     fontDictObj.initDict(fontDict);
 
     Object fontsDictObj;
-    Dict *fontsDict = new Dict(xref);
+    Dict *fontsDict = new Dict(gfx->getXRef());
     fontsDict->decRef();
     fontsDict->add(copyString("ZaDb"), &fontDictObj);
     fontsDictObj.initDict(fontsDict);
 
-    Dict *dict = new Dict(xref);
+    Dict *dict = new Dict(gfx->getXRef());
     dict->add(copyString("Font"), &fontsDictObj);
     gfx->pushResources(dict);
     delete dict;
   }
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   if (addDingbatsResource) {
     gfx->popResources();
   }
@@ -5068,6 +5161,7 @@ void AnnotMovie::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull() && movie->getShowPoster()) {
     int width, height;
     Object poster;
@@ -5084,25 +5178,25 @@ void AnnotMovie::draw(Gfx *gfx, GBool printing) {
       appearBuf->append ("Q\n");
 
       Object imgDict;
-      imgDict.initDict(xref);
+      imgDict.initDict(gfx->getXRef());
       imgDict.dictSet ("MImg", &poster);
 
       Object resDict;
-      resDict.initDict(xref);
+      resDict.initDict(gfx->getXRef());
       resDict.dictSet ("XObject", &imgDict);
 
       Object formDict, obj1, obj2;
-      formDict.initDict(xref);
+      formDict.initDict(gfx->getXRef());
       formDict.dictSet("Length", obj1.initInt(appearBuf->getLength()));
       formDict.dictSet("Subtype", obj1.initName("Form"));
       formDict.dictSet("Name", obj1.initName("FRM"));
-      obj1.initArray(xref);
+      obj1.initArray(gfx->getXRef());
       obj1.arrayAdd(obj2.initInt(0));
       obj1.arrayAdd(obj2.initInt(0));
       obj1.arrayAdd(obj2.initInt(width));
       obj1.arrayAdd(obj2.initInt(height));
       formDict.dictSet("BBox", &obj1);
-      obj1.initArray(xref);
+      obj1.initArray(gfx->getXRef());
       obj1.arrayAdd(obj2.initInt(1));
       obj1.arrayAdd(obj2.initInt(0));
       obj1.arrayAdd(obj2.initInt(0));
@@ -5120,10 +5214,10 @@ void AnnotMovie::draw(Gfx *gfx, GBool printing) {
       delete appearBuf;
 
       Object objDict;
-      objDict.initDict(xref);
+      objDict.initDict(gfx->getXRef());
       objDict.dictSet ("FRM", &aStream);
 
-      resDict.initDict(xref);
+      resDict.initDict(gfx->getXRef());
       resDict.dictSet ("XObject", &objDict);
 
       appearBuf = new GooString ();
@@ -5147,9 +5241,9 @@ void AnnotMovie::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -5267,6 +5361,7 @@ void AnnotStamp::setIcon(GooString *new_icon) {
   Object obj1;
   obj1.initName (icon->getCString());
   update("Name", &obj1);
+  invalidateAppearance();
 }
 
 //------------------------------------------------------------------------
@@ -5354,6 +5449,7 @@ void AnnotGeometry::setType(AnnotSubtype new_type) {
 
   type = new_type;
   update("Subtype", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotGeometry::setInteriorColor(AnnotColor *new_color) {
@@ -5367,6 +5463,7 @@ void AnnotGeometry::setInteriorColor(AnnotColor *new_color) {
   } else {
     interiorColor = NULL;
   }
+  invalidateAppearance();
 }
 
 void AnnotGeometry::draw(Gfx *gfx, GBool printing) {
@@ -5376,6 +5473,7 @@ void AnnotGeometry::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     ca = opacity;
 
@@ -5489,16 +5587,16 @@ void AnnotGeometry::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
 //------------------------------------------------------------------------
 // AnnotPolygon
 //------------------------------------------------------------------------
-AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType, AnnotPath *path) :
+AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
@@ -5513,16 +5611,11 @@ AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subTyp
       assert (0 && "Invalid subtype for AnnotGeometry\n");
   }
 
-  Object obj2;
+  // Store dummy path with one null vertex only
+  Object obj2, obj3;
   obj2.initArray (doc->getXRef());
-
-  for (int i = 0; i < path->getCoordsLength(); ++i) {
-    Object obj3;
-
-    obj2.arrayAdd (obj3.initReal (path->getX(i)));
-    obj2.arrayAdd (obj3.initReal (path->getY(i)));
-  }
-
+  obj2.arrayAdd (obj3.initReal (0));
+  obj2.arrayAdd (obj3.initReal (0));
   annotObj.dictSet ("Vertices", &obj2);
 
   initialize(docA, annotObj.getDict());
@@ -5633,6 +5726,7 @@ void AnnotPolygon::setType(AnnotSubtype new_type) {
 
   type = new_type;
   update("Subtype", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setVertices(AnnotPath *path) {
@@ -5649,6 +5743,7 @@ void AnnotPolygon::setVertices(AnnotPath *path) {
   vertices = new AnnotPath(obj1.getArray());
 
   update("Vertices", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end) {
@@ -5662,6 +5757,7 @@ void AnnotPolygon::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingS
   obj1.arrayAdd( obj2.initName(convertAnnotLineEndingStyle( endStyle )) );
 
   update("LE", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setInteriorColor(AnnotColor *new_color) {
@@ -5675,6 +5771,7 @@ void AnnotPolygon::setInteriorColor(AnnotColor *new_color) {
   } else {
     interiorColor = NULL;
   }
+  invalidateAppearance();
 }
 
 void AnnotPolygon::setIntent(AnnotPolygonIntent new_intent) {
@@ -5697,6 +5794,7 @@ void AnnotPolygon::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     appearBBox = new AnnotAppearanceBBox(rect);
     ca = opacity;
@@ -5773,14 +5871,15 @@ void AnnotPolygon::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -5836,12 +5935,13 @@ void AnnotCaret::setSymbol(AnnotCaretSymbol new_symbol) {
   obj1.initName( new_symbol == symbolP ? "P" : "None" );
   symbol = new_symbol;
   update("Sy", &obj1);
+  invalidateAppearance();
 }
 
 //------------------------------------------------------------------------
 // AnnotInk
 //------------------------------------------------------------------------
-AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rect, AnnotPath **paths, int n_paths) :
+AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rect) :
     AnnotMarkup(docA, rect) {
   Object obj1;
 
@@ -5849,10 +5949,12 @@ AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rect, AnnotPath **paths, int n_pa
 
   annotObj.dictSet ("Subtype", obj1.initName ("Ink"));
 
-  Object obj2;
+  // Store dummy path with one null vertex only
+  Object obj2, obj3, obj4;
   obj2.initArray (doc->getXRef());
-  writeInkList(paths, n_paths, obj2.getArray());
-
+  obj2.arrayAdd (obj3.initArray (doc->getXRef()));
+  obj3.arrayAdd (obj4.initReal (0));
+  obj3.arrayAdd (obj4.initReal (0));
   annotObj.dictSet ("InkList", &obj2);
 
   initialize(docA, annotObj.getDict());
@@ -5925,6 +6027,7 @@ void AnnotInk::setInkList(AnnotPath **paths, int n_paths) {
 
   parseInkList(obj1.getArray());
   annotObj.dictSet ("InkList", &obj1);
+  invalidateAppearance();
 }
 
 void AnnotInk::draw(Gfx *gfx, GBool printing) {
@@ -5934,6 +6037,7 @@ void AnnotInk::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     appearBBox = new AnnotAppearanceBBox(rect);
     ca = opacity;
@@ -5985,14 +6089,15 @@ void AnnotInk::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   if (appearBBox) {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                    appearBBox->getPageXMin(), appearBBox->getPageYMin(),
-                   appearBBox->getPageXMax(), appearBBox->getPageYMax());
+                   appearBBox->getPageXMax(), appearBBox->getPageYMax(),
+                   getRotation());
   } else {
     gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
-                   rect->x1, rect->y1, rect->x2, rect->y2);
+                   rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   }
   obj.free();
 }
@@ -6166,6 +6271,7 @@ void AnnotFileAttachment::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     ca = opacity;
 
@@ -6206,9 +6312,9 @@ void AnnotFileAttachment::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, border, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
@@ -6332,6 +6438,7 @@ void AnnotSound::draw(Gfx *gfx, GBool printing) {
   if (!isVisible (printing))
     return;
 
+  annotLocker();
   if (appearance.isNull()) {
     ca = opacity;
 
@@ -6367,9 +6474,9 @@ void AnnotSound::draw(Gfx *gfx, GBool printing) {
   }
 
   // draw the appearance stream
-  appearance.fetch(xref, &obj);
+  appearance.fetch(gfx->getXRef(), &obj);
   gfx->drawAnnot(&obj, border, color,
-		 rect->x1, rect->y1, rect->x2, rect->y2);
+		 rect->x1, rect->y1, rect->x2, rect->y2, getRotation());
   obj.free();
 }
 
diff --git a/poppler/Annot.h b/poppler/Annot.h
index 68ddeb79..2865d23f 100644
--- a/poppler/Annot.h
+++ b/poppler/Annot.h
@@ -15,15 +15,16 @@
 //
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007-2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
 // Copyright (C) 2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
-// Copyright (C) 2009-2011 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -552,6 +553,8 @@ public:
 
   double getXMin();
   double getYMin();
+  double getXMax();
+  double getYMax();
 
   double getFontSize() { return fontSize; }
 
@@ -560,7 +563,7 @@ public:
 
   // Sets the annot contents to new_content
   // new_content should never be NULL
-  void setContents(GooString *new_content);
+  virtual void setContents(GooString *new_content);
   void setName(GooString *new_name);
   void setModified(GooString *new_date);
   void setFlags(Guint new_flags);
@@ -573,9 +576,6 @@ public:
 
   void setAppearanceState(const char *state);
 
-  // Delete appearance streams and reset appearance state
-  void invalidateAppearance();
-
   // getters
   PDFDoc *getDoc() const { return doc; }
   XRef *getXRef() const { return xref; }
@@ -623,11 +623,15 @@ protected:
   void createResourcesDict(const char *formName, Object *formStream, const char *stateName,
 			   double opacity, const char *blendMode, Object *resDict);
   GBool isVisible(GBool printing);
+  int getRotation() const;
 
   // Updates the field key of the annotation dictionary
   // and sets M to the current time
   void update(const char *key, Object *value);
 
+  // Delete appearance streams and reset appearance state
+  void invalidateAppearance();
+
   int refCnt;
 
   Object annotObj;
@@ -660,6 +664,9 @@ protected:
   GBool ok;
 
   bool hasRef;
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 };
 
 //------------------------------------------------------------------------
@@ -898,6 +905,7 @@ public:
 
   virtual void draw(Gfx *gfx, GBool printing);
   virtual Object *getAppearanceResDict(Object *dest);
+  virtual void setContents(GooString *new_content);
 
   void setAppearanceString(GooString *new_string);
   void setQuadding(AnnotFreeTextQuadding new_quadding);
@@ -955,12 +963,13 @@ public:
     captionPosTop     // Top
   };
 
-  AnnotLine(PDFDoc *docA, PDFRectangle *rect, PDFRectangle *lRect);
+  AnnotLine(PDFDoc *docA, PDFRectangle *rect);
   AnnotLine(PDFDoc *docA, Dict *dict, Object *obj);
   ~AnnotLine();
 
   virtual void draw(Gfx *gfx, GBool printing);
   virtual Object *getAppearanceResDict(Object *dest);
+  virtual void setContents(GooString *new_content);
 
   void setVertices(double x1, double y1, double x2, double y2);
   void setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end);
@@ -1020,8 +1029,7 @@ protected:
 class AnnotTextMarkup: public AnnotMarkup {
 public:
 
-  AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType,
-		  AnnotQuadrilaterals *quadPoints);
+  AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType);
   AnnotTextMarkup(PDFDoc *docA, Dict *dict, Object *obj);
   virtual ~AnnotTextMarkup();
 
@@ -1107,7 +1115,7 @@ public:
     polygonDimension   // PolygonDimension
   };
 
-  AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType, AnnotPath *path);
+  AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType);
   AnnotPolygon(PDFDoc *docA, Dict *dict, Object *obj);
   ~AnnotPolygon();
 
@@ -1182,7 +1190,7 @@ private:
 class AnnotInk: public AnnotMarkup {
 public:
 
-  AnnotInk(PDFDoc *docA, PDFRectangle *rect, AnnotPath **paths, int n_paths);
+  AnnotInk(PDFDoc *docA, PDFRectangle *rect);
   AnnotInk(PDFDoc *docA, Dict *dict, Object *obj);
   ~AnnotInk();
 
diff --git a/poppler/Array.cc b/poppler/Array.cc
index cb224329..230c3287 100644
--- a/poppler/Array.cc
+++ b/poppler/Array.cc
@@ -15,6 +15,8 @@
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Albert Astals Cid <aacid@kde.org>
 //
 // 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
@@ -33,6 +35,11 @@
 #include "Object.h"
 #include "Array.h"
 
+#if MULTITHREADED
+#  define arrayLocker()   MutexLocker locker(&mutex)
+#else
+#  define arrayLocker()
+#endif
 //------------------------------------------------------------------------
 // Array
 //------------------------------------------------------------------------
@@ -42,6 +49,9 @@ Array::Array(XRef *xrefA) {
   elems = NULL;
   size = length = 0;
   ref = 1;
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
 }
 
 Array::~Array() {
@@ -50,9 +60,35 @@ Array::~Array() {
   for (i = 0; i < length; ++i)
     elems[i].free();
   gfree(elems);
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
+}
+
+Object *Array::copy(XRef *xrefA, Object *obj) {
+  arrayLocker();
+  obj->initArray(xrefA);
+  for (int i = 0; i < length; ++i) {
+    Object obj1;
+    obj->arrayAdd(elems[i].copy(&obj1));
+  }
+  return obj;
+}
+
+int Array::incRef() {
+  arrayLocker();
+  ++ref;
+  return ref;
+}
+
+int Array::decRef() {
+  arrayLocker();
+  --ref;
+  return ref;
 }
 
 void Array::add(Object *elem) {
+  arrayLocker();
   if (length == size) {
     if (length == 0) {
       size = 8;
@@ -66,6 +102,7 @@ void Array::add(Object *elem) {
 }
 
 void Array::remove(int i) {
+  arrayLocker();
   if (i < 0 || i >= length) {
 #ifdef DEBUG_MEM
     abort();
@@ -77,7 +114,7 @@ void Array::remove(int i) {
   memmove( elems + i, elems + i + 1, sizeof(elems[0]) * (length - i) );
 }
 
-Object *Array::get(int i, Object *obj) {
+Object *Array::get(int i, Object *obj, int recursion) {
   if (i < 0 || i >= length) {
 #ifdef DEBUG_MEM
     abort();
@@ -85,7 +122,7 @@ Object *Array::get(int i, Object *obj) {
     return obj->initNull();
 #endif
   }
-  return elems[i].fetch(xref, obj);
+  return elems[i].fetch(xref, obj, recursion);
 }
 
 Object *Array::getNF(int i, Object *obj) {
diff --git a/poppler/Array.h b/poppler/Array.h
index 666a409c..e78e399b 100644
--- a/poppler/Array.h
+++ b/poppler/Array.h
@@ -15,6 +15,7 @@
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -28,7 +29,9 @@
 #pragma interface
 #endif
 
+#include "poppler-config.h"
 #include "Object.h"
+#include "goo/GooMutex.h"
 
 class XRef;
 
@@ -46,12 +49,15 @@ public:
   ~Array();
 
   // Reference counting.
-  int incRef() { return ++ref; }
-  int decRef() { return --ref; }
+  int incRef();
+  int decRef();
 
   // Get number of elements.
   int getLength() { return length; }
 
+  // Copy array with new xref
+  Object *copy(XRef *xrefA, Object *obj);
+
   // Add an element.
   void add(Object *elem);
 
@@ -59,7 +65,7 @@ public:
   void remove(int i);
 
   // Accessors.
-  Object *get(int i, Object *obj);
+  Object *get(int i, Object *obj, int resursion = 0);
   Object *getNF(int i, Object *obj);
   GBool getString(int i, GooString *string);
 
@@ -70,6 +76,9 @@ private:
   int size;			// size of <elems> array
   int length;			// number of elements in array
   int ref;			// reference count
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 };
 
 #endif
diff --git a/poppler/CachedFile.cc b/poppler/CachedFile.cc
index 4c20daef..b0ae8388 100644
--- a/poppler/CachedFile.cc
+++ b/poppler/CachedFile.cc
@@ -7,6 +7,7 @@
 // Copyright 2009 Stefan Thomas <thomas@eload24.com>
 // Copyright 2010, 2011 Hib Eris <hib@hiberis.nl>
 // Copyright 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr>
 //
 //========================================================================
 
@@ -213,7 +214,7 @@ size_t CachedFileWriter::write(const char *ptr, size_t size)
   while (len) {
     if (chunks) {
       if (offset == CachedFileChunkSize) {
-         it++;
+         ++it;
          if (it == (*chunks).end()) return written;
          offset = 0;
       }
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index c4493e87..1546594f 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -17,7 +17,7 @@
 // Copyright (C) 2005-2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
-// Copyright (C) 2005, 2009, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
@@ -26,6 +26,7 @@
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2010 Jan Kümmel <jan+freedesktop@snorc.org>
 // Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -58,6 +59,11 @@
 #pragma implementation
 #endif
 
+#if MULTITHREADED
+#  define fontEngineLocker()   MutexLocker locker(&mutex)
+#else
+#  define fontEngineLocker()
+#endif
 
 //------------------------------------------------------------------------
 // CairoFont
@@ -558,6 +564,7 @@ typedef struct _type3_font_info {
   PDFDoc *doc;
   CairoFontEngine *fontEngine;
   GBool printing;
+  XRef *xref;
 } type3_font_info_t;
 
 static void
@@ -645,7 +652,7 @@ _render_type3_glyph (cairo_scaled_font_t  *scaled_font,
   box.y2 = mat[3];
   gfx = new Gfx(info->doc, output_dev, resDict, &box, NULL);
   output_dev->startDoc(info->doc, info->fontEngine);
-  output_dev->startPage (1, gfx->getState());
+  output_dev->startPage (1, gfx->getState(), gfx->getXRef());
   output_dev->setInType3Char(gTrue);
   gfx->display(charProcs->getVal(glyph, &charProc));
 
@@ -674,7 +681,7 @@ _render_type3_glyph (cairo_scaled_font_t  *scaled_font,
 
 CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc,
 				       CairoFontEngine *fontEngine,
-				       GBool printing) {
+				       GBool printing, XRef *xref) {
   Object refObj, strObj;
   type3_font_info_t *info;
   cairo_font_face_t *font_face;
@@ -697,6 +704,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc,
   info->doc = doc;
   info->fontEngine = fontEngine;
   info->printing = printing;
+  info->xref = xref;
 
   cairo_font_face_set_user_data (font_face, &type3_font_key, (void *) info, _free_type3_font_info);
 
@@ -714,7 +722,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc,
     }
   }
 
-  return new CairoType3Font(ref, doc, font_face, codeToGID, codeToGIDLen, printing);
+  return new CairoType3Font(ref, doc, font_face, codeToGID, codeToGIDLen, printing, xref);
 }
 
 CairoType3Font::CairoType3Font(Ref ref,
@@ -722,7 +730,7 @@ CairoType3Font::CairoType3Font(Ref ref,
 			       cairo_font_face_t *cairo_font_face,
 			       int *codeToGID,
 			       Guint codeToGIDLen,
-			       GBool printing) : CairoFont(ref,
+			       GBool printing, XRef *xref) : CairoFont(ref,
 							   cairo_font_face,
 							   codeToGID,
 							   codeToGIDLen,
@@ -755,6 +763,9 @@ CairoFontEngine::CairoFontEngine(FT_Library libA) {
   FT_Library_Version(lib, &major, &minor, &patch);
   useCIDs = major > 2 ||
             (major == 2 && (minor > 1 || (minor == 1 && patch > 7)));
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
 }
 
 CairoFontEngine::~CairoFontEngine() {
@@ -764,15 +775,19 @@ CairoFontEngine::~CairoFontEngine() {
     if (fontCache[i])
       delete fontCache[i];
   }
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
 }
 
 CairoFont *
-CairoFontEngine::getFont(GfxFont *gfxFont, PDFDoc *doc, GBool printing) {
+CairoFontEngine::getFont(GfxFont *gfxFont, PDFDoc *doc, GBool printing, XRef *xref) {
   int i, j;
   Ref ref;
   CairoFont *font;
   GfxFontType fontType;
   
+  fontEngineLocker();
   ref = *gfxFont->getID();
 
   for (i = 0; i < cairoFontCacheSize; ++i) {
@@ -788,9 +803,9 @@ CairoFontEngine::getFont(GfxFont *gfxFont, PDFDoc *doc, GBool printing) {
   
   fontType = gfxFont->getType();
   if (fontType == fontType3)
-    font = CairoType3Font::create (gfxFont, doc, this, printing);
+    font = CairoType3Font::create (gfxFont, doc, this, printing, xref);
   else
-    font = CairoFreeTypeFont::create (gfxFont, doc->getXRef(), lib, useCIDs);
+    font = CairoFreeTypeFont::create (gfxFont, xref, lib, useCIDs);
 
   //XXX: if font is null should we still insert it into the cache?
   if (fontCache[cairoFontCacheSize - 1]) {
diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
index 63353489..8c0dba11 100644
--- a/poppler/CairoFontEngine.h
+++ b/poppler/CairoFontEngine.h
@@ -19,6 +19,7 @@
 // Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2008 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -32,6 +33,7 @@
 #pragma interface
 #endif
 
+#include "poppler-config.h"
 #include "goo/gtypes.h"
 #include <cairo-ft.h>
 
@@ -85,7 +87,7 @@ class CairoType3Font : public CairoFont {
 public:
   static CairoType3Font *create(GfxFont *gfxFont, PDFDoc *doc,
 				CairoFontEngine *fontEngine,
-				GBool printing);
+				GBool printing, XRef *xref);
   virtual ~CairoType3Font();
 
   virtual GBool matches(Ref &other, GBool printing);
@@ -94,7 +96,7 @@ private:
   CairoType3Font(Ref ref, PDFDoc *doc,
 		 cairo_font_face_t *cairo_font_face,
 		 int *codeToGID, Guint codeToGIDLen,
-		 GBool printing);
+		 GBool printing, XRef *xref);
   PDFDoc *doc;
 };
 
@@ -113,12 +115,15 @@ public:
   CairoFontEngine(FT_Library libA);
   ~CairoFontEngine();
 
-  CairoFont *getFont(GfxFont *gfxFont, PDFDoc *doc, GBool printing);
+  CairoFont *getFont(GfxFont *gfxFont, PDFDoc *doc, GBool printing, XRef *xref);
 
 private:
   CairoFont *fontCache[cairoFontCacheSize];
   FT_Library lib;
   GBool useCIDs;
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 };
 
 #endif
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 441ca45f..26760c86 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -18,14 +18,14 @@
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005, 2009, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2008 Carl Worth <cworth@cworth.org>
-// Copyright (C) 2008-2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008-2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
 // Copyright (C) 2008, 2012 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
-// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Patrick Pfeifer <p2000@mailinator.com>
 // Copyright (C) 2012 Jason Crain <jason@aquaticape.us>
 //
@@ -144,6 +144,7 @@ CairoOutputDev::CairoOutputDev() {
   prescaleImages = gTrue;
   printing = gTrue;
   use_show_text_glyphs = gFalse;
+  inUncoloredPattern = gFalse;
   inType3Char = gFalse;
   t3_glyph_has_bbox = gFalse;
 
@@ -163,6 +164,7 @@ CairoOutputDev::CairoOutputDev() {
   stroke_adjust = globalParams->getStrokeAdjust();
   align_stroke_coords = gFalse;
   adjusted_stroke_width = gFalse;
+  xref = NULL;
 }
 
 CairoOutputDev::~CairoOutputDev() {
@@ -235,9 +237,10 @@ void CairoOutputDev::startDoc(PDFDoc *docA,
     fontEngine = new CairoFontEngine(ft_lib);
     fontEngine_owner = gTrue;
   }
+  xref = doc->getXRef();
 }
 
-void CairoOutputDev::startPage(int pageNum, GfxState *state) {
+void CairoOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
   /* set up some per page defaults */
   cairo_pattern_destroy(fill_pattern);
   cairo_pattern_destroy(stroke_pattern);
@@ -249,6 +252,9 @@ void CairoOutputDev::startPage(int pageNum, GfxState *state) {
 
   if (text)
     text->startPage(state);
+  if (xrefA != NULL) {
+    xref = xrefA;
+  }
 }
 
 void CairoOutputDev::endPage() {
@@ -456,6 +462,9 @@ void CairoOutputDev::updateLineWidth(GfxState *state) {
 void CairoOutputDev::updateFillColor(GfxState *state) {
   GfxRGB color = fill_color;
 
+  if (inUncoloredPattern)
+    return;
+
   state->getFillRGB(&fill_color);
   if (cairo_pattern_get_type (fill_pattern) != CAIRO_PATTERN_TYPE_SOLID ||
       color.r != fill_color.r ||
@@ -476,6 +485,9 @@ void CairoOutputDev::updateFillColor(GfxState *state) {
 void CairoOutputDev::updateStrokeColor(GfxState *state) {
   GfxRGB color = stroke_color;
 
+  if (inUncoloredPattern)
+    return;
+
   state->getStrokeRGB(&stroke_color);
   if (cairo_pattern_get_type (fill_pattern) != CAIRO_PATTERN_TYPE_SOLID ||
       color.r != stroke_color.r ||
@@ -496,6 +508,9 @@ void CairoOutputDev::updateStrokeColor(GfxState *state) {
 void CairoOutputDev::updateFillOpacity(GfxState *state) {
   double opacity = fill_opacity;
 
+  if (inUncoloredPattern)
+    return;
+
   fill_opacity = state->getFillOpacity();
   if (opacity != fill_opacity) {
     cairo_pattern_destroy(fill_pattern);
@@ -511,6 +526,9 @@ void CairoOutputDev::updateFillOpacity(GfxState *state) {
 void CairoOutputDev::updateStrokeOpacity(GfxState *state) {
   double opacity = stroke_opacity;
 
+  if (inUncoloredPattern)
+    return;
+
   stroke_opacity = state->getStrokeOpacity();
   if (opacity != stroke_opacity) {
     cairo_pattern_destroy(stroke_pattern);
@@ -524,6 +542,9 @@ void CairoOutputDev::updateStrokeOpacity(GfxState *state) {
 }
 
 void CairoOutputDev::updateFillColorStop(GfxState *state, double offset) {
+  if (inUncoloredPattern)
+    return;
+
   state->getFillRGB(&fill_color);
 
   cairo_pattern_add_color_stop_rgba(fill_pattern, offset,
@@ -602,7 +623,7 @@ void CairoOutputDev::updateFont(GfxState *state) {
   if (text)
     text->updateFont(state);
   
-  currentFont = fontEngine->getFont (state->getFont(), doc, printing);
+  currentFont = fontEngine->getFont (state->getFont(), doc, printing, xref);
 
   if (!currentFont)
     return;
@@ -805,7 +826,7 @@ void CairoOutputDev::eoFill(GfxState *state) {
 
 }
 
-GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *cat, Object *str,
+GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat, Object *str,
 					double *pmat, int paintType, int /*tilingType*/, Dict *resDict,
 					double *mat, double *bbox,
 					int x0, int y0, int x1, int y1,
@@ -846,8 +867,12 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *cat
   box.x2 = bbox[2]; box.y2 = bbox[3];
   strokePathTmp = strokePathClip;
   strokePathClip = NULL;
-  gfx = new Gfx(doc, this, resDict, &box, NULL);
+  gfx = new Gfx(doc, this, resDict, &box, NULL, NULL, NULL, gfxA->getXRef());
+  if (paintType == 2)
+    inUncoloredPattern = gTrue;
   gfx->display(str);
+  if (paintType == 2)
+    inUncoloredPattern = gFalse;
   delete gfx;
   strokePathClip = strokePathTmp;
 
@@ -1552,7 +1577,7 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
 
   LOG(printf ("set softMask\n"));
 
-  if (alpha == false) {
+  if (!alpha || transferFunc) {
     /* We need to mask according to the luminocity of the group.
      * So we paint the group to an image surface convert it to a luminocity map
      * and then use that as the mask. */
@@ -1595,13 +1620,15 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
     cairo_t *maskCtx = cairo_create(source);
 
     //XXX: hopefully this uses the correct color space */
-    GfxRGB backdropColorRGB;
-    groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB);
-    /* paint the backdrop */
-    cairo_set_source_rgb(maskCtx,
-			 colToDbl(backdropColorRGB.r),
-			 colToDbl(backdropColorRGB.g),
-			 colToDbl(backdropColorRGB.b));
+    if (!alpha) {
+      GfxRGB backdropColorRGB;
+      groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB);
+      /* paint the backdrop */
+      cairo_set_source_rgb(maskCtx,
+                           colToDbl(backdropColorRGB.r),
+                           colToDbl(backdropColorRGB.g),
+                           colToDbl(backdropColorRGB.b));
+    }
     cairo_paint(maskCtx);
 
     /* Copy source ctm to mask ctm and translate origin so that the
@@ -1628,15 +1655,14 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
     int stride = cairo_image_surface_get_stride(source)/4;
     for (int y=0; y<height; y++) {
       for (int x=0; x<width; x++) {
-	int lum;
-	lum = luminocity(source_data[y*stride + x]);
-	if (transferFunc) {
-	  double lum_in, lum_out;
-	  lum_in = lum/256.0;
-	  transferFunc->transform(&lum_in, &lum_out);
-	  lum = (int)(lum_out * 255.0 + 0.5);
-	}
-	source_data[y*stride + x] = lum << 24;
+	int lum = alpha ? fill_opacity : luminocity(source_data[y*stride + x]);
+        if (transferFunc) {
+          double lum_in, lum_out;
+          lum_in = lum/256.0;
+          transferFunc->transform(&lum_in, &lum_out);
+          lum = (int)(lum_out * 255.0 + 0.5);
+        }
+        source_data[y*stride + x] = lum << 24;
       }
     }
     cairo_surface_mark_dirty (source);
@@ -1656,7 +1682,7 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
     }
 
     cairo_surface_destroy(source);
-  } else {
+  } else if (alpha) {
     mask = cairo_pattern_reference(group);
     cairo_get_matrix(cairo, &mask_matrix);
   }
@@ -1710,27 +1736,26 @@ get_singular_values (const cairo_matrix_t *matrix,
 		*minor = sqrt (f - delta);
 }
 
-void CairoOutputDev::getScaledSize(int  orig_width,
-				   int  orig_height,
-				   int *scaledWidth,
-				   int *scaledHeight) {
-  cairo_matrix_t matrix;
-  cairo_get_matrix(cairo, &matrix);
-
+void CairoOutputDev::getScaledSize(const cairo_matrix_t *matrix,
+                                   int                   orig_width,
+				   int                   orig_height,
+				   int                  *scaledWidth,
+				   int                  *scaledHeight)
+{
   double xScale;
   double yScale;
   if (orig_width > orig_height)
-    get_singular_values (&matrix, &xScale, &yScale);
+    get_singular_values (matrix, &xScale, &yScale);
   else
-    get_singular_values (&matrix, &yScale, &xScale);
+    get_singular_values (matrix, &yScale, &xScale);
 
   int tx, tx2, ty, ty2; /* the integer co-oridinates of the resulting image */
   if (xScale >= 0) {
-    tx = splashRound(matrix.x0 - 0.01);
-    tx2 = splashRound(matrix.x0 + xScale + 0.01) - 1;
+    tx = splashRound(matrix->x0 - 0.01);
+    tx2 = splashRound(matrix->x0 + xScale + 0.01) - 1;
   } else {
-    tx = splashRound(matrix.x0 + 0.01) - 1;
-    tx2 = splashRound(matrix.x0 + xScale - 0.01);
+    tx = splashRound(matrix->x0 + 0.01) - 1;
+    tx2 = splashRound(matrix->x0 + xScale - 0.01);
   }
   *scaledWidth = abs(tx2 - tx) + 1;
   //scaledWidth = splashRound(fabs(xScale));
@@ -1741,11 +1766,11 @@ void CairoOutputDev::getScaledSize(int  orig_width,
     *scaledWidth = 1;
   }
   if (yScale >= 0) {
-    ty = splashFloor(matrix.y0 + 0.01);
-    ty2 = splashCeil(matrix.y0 + yScale - 0.01);
+    ty = splashFloor(matrix->y0 + 0.01);
+    ty2 = splashCeil(matrix->y0 + yScale - 0.01);
   } else {
-    ty = splashCeil(matrix.y0 - 0.01);
-    ty2 = splashFloor(matrix.y0 + yScale + 0.01);
+    ty = splashCeil(matrix->y0 - 0.01);
+    ty2 = splashFloor(matrix->y0 + yScale + 0.01);
   }
   *scaledHeight = abs(ty2 - ty);
   if (*scaledHeight == 0) {
@@ -1765,8 +1790,14 @@ CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
   if (orig_width == 0 || orig_height == 0)
 	  return CAIRO_FILTER_NEAREST;
 
+  /* When printing, don't change the interpolation. */
+  if (printing)
+    return CAIRO_FILTER_NEAREST;
+
+  cairo_matrix_t matrix;
+  cairo_get_matrix(cairo, &matrix);
   int scaled_width, scaled_height;
-  getScaledSize (orig_width, orig_height, &scaled_width, &scaled_height);
+  getScaledSize (&matrix, orig_width, orig_height, &scaled_width, &scaled_height);
 
   /* When scale factor is >= 400% we don't interpolate. See bugs #25268, #9860 */
   if (scaled_width / orig_width >= 4 || scaled_height / orig_height >= 4)
@@ -2860,7 +2891,8 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 
   LOG (printf ("drawImage %dx%d\n", widthA, heightA));
 
-  getScaledSize (widthA, heightA, &scaledWidth, &scaledHeight);
+  cairo_get_matrix(cairo, &matrix);
+  getScaledSize (&matrix, widthA, heightA, &scaledWidth, &scaledHeight);
   image = rescale.getSourceImage(str, widthA, heightA, scaledWidth, scaledHeight, printing, colorMap, maskColors);
   if (!image)
     return;
@@ -2963,7 +2995,35 @@ void CairoImageOutputDev::saveImage(CairoImage *image)
 	  images = (CairoImage **) greallocn (images, size, sizeof (CairoImage *));
   }
   images[numImages++] = image;
-}	
+}
+
+void CairoImageOutputDev::getBBox(GfxState *state, int width, int height,
+                                  double *x1, double *y1, double *x2, double *y2)
+{
+  double *ctm = state->getCTM();
+  cairo_matrix_t matrix;
+  cairo_matrix_init(&matrix,
+                    ctm[0], ctm[1],
+                    -ctm[2], -ctm[3],
+                    ctm[2] + ctm[4], ctm[3] + ctm[5]);
+
+  int scaledWidth, scaledHeight;
+  getScaledSize (&matrix, width, height, &scaledWidth, &scaledHeight);
+
+  if (matrix.xx >= 0) {
+    *x1 = matrix.x0;
+  } else {
+    *x1 = matrix.x0 - scaledWidth;
+  }
+  *x2 = *x1 + scaledWidth;
+
+  if (matrix.yy >= 0) {
+    *y1 = matrix.y0;
+  } else {
+    *y1 = matrix.y0 - scaledHeight;
+  }
+  *y2 = *y1 + scaledHeight;
+}
 
 void CairoImageOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 					int width, int height, GBool invert,
@@ -2972,22 +3032,9 @@ void CairoImageOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *st
   cairo_t *cr;
   cairo_surface_t *surface;
   double x1, y1, x2, y2;
-  double *ctm;
-  double mat[6];
   CairoImage *image;
 
-  ctm = state->getCTM();
-  
-  mat[0] = ctm[0];
-  mat[1] = ctm[1];
-  mat[2] = -ctm[2];
-  mat[3] = -ctm[3];
-  mat[4] = ctm[2] + ctm[4];
-  mat[5] = ctm[3] + ctm[5];
-  x1 = mat[4];
-  y1 = mat[5];
-  x2 = x1 + width;
-  y2 = y1 + height;
+  getBBox(state, width, height, &x1, &y1, &x2, &y2);
 
   image = new CairoImage (x1, y1, x2, y2);
   saveImage (image);
@@ -3015,22 +3062,9 @@ void CairoImageOutputDev::setSoftMaskFromImageMask(GfxState *state, Object *ref,
   cairo_t *cr;
   cairo_surface_t *surface;
   double x1, y1, x2, y2;
-  double *ctm;
-  double mat[6];
   CairoImage *image;
 
-  ctm = state->getCTM();
-
-  mat[0] = ctm[0];
-  mat[1] = ctm[1];
-  mat[2] = -ctm[2];
-  mat[3] = -ctm[3];
-  mat[4] = ctm[2] + ctm[4];
-  mat[5] = ctm[3] + ctm[5];
-  x1 = mat[4];
-  y1 = mat[5];
-  x2 = x1 + width;
-  y2 = y1 + height;
+  getBBox(state, width, height, &x1, &y1, &x2, &y2);
 
   image = new CairoImage (x1, y1, x2, y2);
   saveImage (image);
@@ -3061,22 +3095,9 @@ void CairoImageOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   cairo_t *cr;
   cairo_surface_t *surface;
   double x1, y1, x2, y2;
-  double *ctm;
-  double mat[6];
   CairoImage *image;
 
-  ctm = state->getCTM();
-  
-  mat[0] = ctm[0];
-  mat[1] = ctm[1];
-  mat[2] = -ctm[2];
-  mat[3] = -ctm[3];
-  mat[4] = ctm[2] + ctm[4];
-  mat[5] = ctm[3] + ctm[5];
-  x1 = mat[4];
-  y1 = mat[5];
-  x2 = x1 + width;
-  y2 = y1 + height;
+  getBBox(state, width, height, &x1, &y1, &x2, &y2);
 
   image = new CairoImage (x1, y1, x2, y2);
   saveImage (image);
@@ -3109,22 +3130,9 @@ void CairoImageOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stre
   cairo_t *cr;
   cairo_surface_t *surface;
   double x1, y1, x2, y2;
-  double *ctm;
-  double mat[6];
   CairoImage *image;
 
-  ctm = state->getCTM();
-  
-  mat[0] = ctm[0];
-  mat[1] = ctm[1];
-  mat[2] = -ctm[2];
-  mat[3] = -ctm[3];
-  mat[4] = ctm[2] + ctm[4];
-  mat[5] = ctm[3] + ctm[5];
-  x1 = mat[4];
-  y1 = mat[5];
-  x2 = x1 + width;
-  y2 = y1 + height;
+  getBBox(state, width, height, &x1, &y1, &x2, &y2);
 
   image = new CairoImage (x1, y1, x2, y2);
   saveImage (image);
@@ -3157,22 +3165,9 @@ void CairoImageOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *
   cairo_t *cr;
   cairo_surface_t *surface;
   double x1, y1, x2, y2;
-  double *ctm;
-  double mat[6];
   CairoImage *image;
 
-  ctm = state->getCTM();
-  
-  mat[0] = ctm[0];
-  mat[1] = ctm[1];
-  mat[2] = -ctm[2];
-  mat[3] = -ctm[3];
-  mat[4] = ctm[2] + ctm[4];
-  mat[5] = ctm[3] + ctm[5];
-  x1 = mat[4];
-  y1 = mat[5];
-  x2 = x1 + width;
-  y2 = y1 + height;
+  getBBox(state, width, height, &x1, &y1, &x2, &y2);
 
   image = new CairoImage (x1, y1, x2, y2);
   saveImage (image);
diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
index a699a7b4..c9ae33d4 100644
--- a/poppler/CairoOutputDev.h
+++ b/poppler/CairoOutputDev.h
@@ -17,10 +17,10 @@
 // Copyright (C) 2005-2008 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2011, 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2008, 2009, 2011-2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
-// Copyright (C) 2010-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -124,7 +124,7 @@ public:
   //----- initialization and control
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
 
   // End a page.
   virtual void endPage();
@@ -192,7 +192,6 @@ public:
 			       CharCode code, Unicode *u, int uLen);
   virtual void endType3Char(GfxState *state);
   virtual void beginTextObject(GfxState *state);
-  virtual GBool deviceHasTextClip(GfxState *state) { return textClipPath; }
   virtual void endTextObject(GfxState *state);
 
   //----- image drawing
@@ -267,7 +266,8 @@ public:
 protected:
   void doPath(cairo_t *cairo, GfxState *state, GfxPath *path);
   cairo_surface_t *downscaleSurface(cairo_surface_t *orig_surface);
-  void getScaledSize(int orig_width, int orig_height,
+  void getScaledSize(const cairo_matrix_t *matrix,
+                     int orig_width, int orig_height,
 		     int *scaledWidth, int *scaledHeight);
   cairo_filter_t getFilterForSurface(cairo_surface_t *image,
 				     GBool interpolate);
@@ -284,6 +284,7 @@ protected:
   GBool adjusted_stroke_width;
   GBool align_stroke_coords;
   CairoFont *currentFont;
+  XRef *xref;
 
   struct StrokePathClip {
     GfxPath *path;
@@ -319,6 +320,7 @@ protected:
   int utf8Count;
   int utf8Max;
   cairo_path_t *textClipPath;
+  GBool inUncoloredPattern;     // inside a uncolored pattern (PaintType = 2)
   GBool inType3Char;		// inside a Type 3 CharProc
   double t3_glyph_wx, t3_glyph_wy;
   GBool t3_glyph_has_bbox;
@@ -492,6 +494,8 @@ public:
 
 private:
   void saveImage(CairoImage *image);
+  void getBBox(GfxState *state, int width, int height,
+               double *x1, double *y1, double *x2, double *y2);
   
   CairoImage **images;
   int numImages;
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index cf6dff0a..6bd511a1 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Jeff Muizelaar <jrmuizel@nit.ca>
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
@@ -25,6 +25,8 @@
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr>
 //
 // 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
@@ -55,6 +57,11 @@
 #include "ViewerPreferences.h"
 #include "FileSpec.h"
 
+#if MULTITHREADED
+#  define catalogLocker()   MutexLocker locker(&mutex)
+#else
+#  define catalogLocker()
+#endif
 //------------------------------------------------------------------------
 // Catalog
 //------------------------------------------------------------------------
@@ -64,6 +71,9 @@ Catalog::Catalog(PDFDoc *docA) {
   Object obj, obj2;
   Object optContentProps;
 
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
   ok = gTrue;
   doc = docA;
   xref = doc->getXRef();
@@ -129,7 +139,7 @@ Catalog::~Catalog() {
   delete kidsIdxList;
   if (attrsList) {
     std::vector<PageAttrs *>::iterator it;
-    for (it = attrsList->begin() ; it < attrsList->end(); it++ ) {
+    for (it = attrsList->begin() ; it != attrsList->end(); ++it ) {
       delete *it;
     }
     delete attrsList;
@@ -137,7 +147,7 @@ Catalog::~Catalog() {
   delete pagesRefList;
   if (pagesList) {
     std::vector<Dict *>::iterator it;
-    for (it = pagesList->begin() ; it < pagesList->end(); it++ ) {
+    for (it = pagesList->begin() ; it != pagesList->end(); ++it ) {
       if (!(*it)->decRef()) {
          delete *it;
       }
@@ -170,6 +180,9 @@ Catalog::~Catalog() {
   outline.free();
   acroForm.free();
   viewerPreferences.free();
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
 }
 
 GooString *Catalog::readMetadata() {
@@ -177,6 +190,7 @@ GooString *Catalog::readMetadata() {
   Dict *dict;
   Object obj;
 
+  catalogLocker();
   if (metadata.isNone()) {
     Object catDict;
 
@@ -209,8 +223,12 @@ Page *Catalog::getPage(int i)
 {
   if (i < 1) return NULL;
 
+  catalogLocker();
   if (i > lastCachedPage) {
-     if (cachePageTree(i) == gFalse) return NULL;
+     GBool cached = cachePageTree(i);
+     if ( cached == gFalse) {
+       return NULL;
+     }
   }
   return pages[i-1];
 }
@@ -219,8 +237,12 @@ Ref *Catalog::getPageRef(int i)
 {
   if (i < 1) return NULL;
 
+  catalogLocker();
   if (i > lastCachedPage) {
-     if (cachePageTree(i) == gFalse) return NULL;
+     GBool cached = cachePageTree(i);
+     if ( cached == gFalse) {
+       return NULL;
+     }
   }
   return &pageRefs[i-1];
 }
@@ -423,6 +445,7 @@ LinkDest *Catalog::findDest(GooString *name) {
       obj1.free();
   }
   if (!found) {
+    catalogLocker();
     if (getDestNameTree()->lookup(name, &obj1))
       found = gTrue;
     else
@@ -457,6 +480,7 @@ FileSpec *Catalog::embeddedFile(int i)
 {
     Object efDict;
     Object obj;
+    catalogLocker();
     obj = getEmbeddedFileNameTree()->getValue(i);
     FileSpec *embeddedFile = 0;
     if (obj.isRef()) {
@@ -477,6 +501,7 @@ GooString *Catalog::getJS(int i)
   Object obj;
   // getJSNameTree()->getValue(i) returns a shallow copy of the object so we
   // do not need to free it
+  catalogLocker();
   getJSNameTree()->getValue(i).fetch(xref, &obj);
 
   if (!obj.isDict()) {
@@ -512,6 +537,7 @@ GooString *Catalog::getJS(int i)
 
 Catalog::PageMode Catalog::getPageMode() {
 
+  catalogLocker();
   if (pageMode == pageModeNull) {
 
     Object catDict, obj;
@@ -547,6 +573,7 @@ Catalog::PageMode Catalog::getPageMode() {
 
 Catalog::PageLayout Catalog::getPageLayout() {
 
+  catalogLocker();
   if (pageLayout == pageLayoutNull) {
 
     Object catDict, obj;
@@ -746,6 +773,7 @@ GBool Catalog::indexToLabel(int index, GooString *label)
 
 int Catalog::getNumPages()
 {
+  catalogLocker();
   if (numPages == -1)
   {
     Object catDict, pagesDict, obj;
@@ -787,6 +815,7 @@ int Catalog::getNumPages()
 
 PageLabelInfo *Catalog::getPageLabelInfo()
 {
+  catalogLocker();
   if (!pageLabelInfo) {
     Object catDict;
     Object obj;
@@ -810,6 +839,7 @@ PageLabelInfo *Catalog::getPageLabelInfo()
 
 Object *Catalog::getStructTreeRoot()
 {
+  catalogLocker();
   if (structTreeRoot.isNone())
   {
      Object catDict;
@@ -829,6 +859,7 @@ Object *Catalog::getStructTreeRoot()
 
 Object *Catalog::getOutline()
 {
+  catalogLocker();
   if (outline.isNone())
   {
      Object catDict;
@@ -848,6 +879,7 @@ Object *Catalog::getOutline()
 
 Object *Catalog::getDests()
 {
+  catalogLocker();
   if (dests.isNone())
   {
      Object catDict;
@@ -885,6 +917,7 @@ Catalog::FormType Catalog::getFormType()
 
 Form *Catalog::getForm()
 {
+  catalogLocker();
   if (!form) {
     if (acroForm.isDict()) {
       form = new Form(doc, &acroForm);
@@ -898,6 +931,7 @@ Form *Catalog::getForm()
 
 ViewerPreferences *Catalog::getViewerPreferences()
 {
+  catalogLocker();
   if (!viewerPrefs) {
     if (viewerPreferences.isDict()) {
       viewerPrefs = new ViewerPreferences(viewerPreferences.getDict());
diff --git a/poppler/Catalog.h b/poppler/Catalog.h
index ef469ec8..24a3dcfb 100644
--- a/poppler/Catalog.h
+++ b/poppler/Catalog.h
@@ -14,13 +14,14 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2007, 2009-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007, 2009-2011, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
 // Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2008, 2011 Pino Toscano <pino@kde.org>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -34,7 +35,9 @@
 #pragma interface
 #endif
 
+#include "poppler-config.h"
 #include "Object.h"
+#include "goo/GooMutex.h"
 
 #include <vector>
 
@@ -232,6 +235,9 @@ private:
   NameTree *getDestNameTree();
   NameTree *getEmbeddedFileNameTree();
   NameTree *getJSNameTree();
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 
 };
 
diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
index 6302c8b6..bfdb0eaf 100644
--- a/poppler/DCTStream.cc
+++ b/poppler/DCTStream.cc
@@ -10,7 +10,7 @@
 // Copyright 2010 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright 2011 Daiki Ueno <ueno@unixuser.org>
 // Copyright 2011 Tomas Hoger <thoger@redhat.com>
-// Copyright 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 //========================================================================
 
@@ -60,9 +60,20 @@ static void str_term_source(j_decompress_ptr cinfo)
 {
 }
 
-DCTStream::DCTStream(Stream *strA, int colorXformA) :
+DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion) :
   FilterStream(strA) {
   colorXform = colorXformA;
+  if (dict != NULL) {
+    Object obj;
+
+    dict->dictLookup("Width", &obj, recursion);
+    err.width = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0;
+    obj.free();
+    dict->dictLookup("Height", &obj, recursion);
+    err.height = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0;
+    obj.free();
+  } else
+    err.height = err.width = 0;
   init();
 }
 
@@ -74,7 +85,12 @@ DCTStream::~DCTStream() {
 static void exitErrorHandler(jpeg_common_struct *error) {
   j_decompress_ptr cinfo = (j_decompress_ptr)error;
   str_error_mgr * err = (struct str_error_mgr *)cinfo->err;
-  longjmp(err->setjmp_buffer, 1);
+  if (cinfo->err->msg_code == JERR_IMAGE_TOO_BIG && err->width != 0 && err->height != 0) {
+    cinfo->image_height = err->height;
+    cinfo->image_width = err->width;
+  } else {
+    longjmp(err->setjmp_buffer, 1);
+  }
 }
 
 void DCTStream::init()
@@ -143,40 +159,43 @@ void DCTStream::reset() {
     }
   }
 
-  if (!setjmp(err.setjmp_buffer) && jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED)
+  if (!setjmp(err.setjmp_buffer))
   {
-    // figure out color transform
-    if (colorXform == -1 && !cinfo.saw_Adobe_marker) {
-      if (cinfo.num_components == 3) {
-        if (cinfo.saw_JFIF_marker) {
-	  colorXform = 1;
-        } else if (cinfo.cur_comp_info[0]->component_id == 82 &&
-		   cinfo.cur_comp_info[1]->component_id == 71 &&
-		   cinfo.cur_comp_info[2]->component_id == 66) { // ASCII "RGB"
-	  colorXform = 0;
+    if (jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED)
+    {
+      // figure out color transform
+      if (colorXform == -1 && !cinfo.saw_Adobe_marker) {
+	if (cinfo.num_components == 3) {
+	  if (cinfo.saw_JFIF_marker) {
+	    colorXform = 1;
+	  } else if (cinfo.cur_comp_info[0]->component_id == 82 &&
+	      cinfo.cur_comp_info[1]->component_id == 71 &&
+	      cinfo.cur_comp_info[2]->component_id == 66) { // ASCII "RGB"
+	    colorXform = 0;
+	  } else {
+	    colorXform = 1;
+	  }
 	} else {
-	  colorXform = 1;
+	  colorXform = 0;
 	}
-      } else {
-        colorXform = 0;
+      } else if (cinfo.saw_Adobe_marker) {
+	colorXform = cinfo.Adobe_transform;
       }
-    } else if (cinfo.saw_Adobe_marker) {
-      colorXform = cinfo.Adobe_transform;
-    }
 
-    switch (cinfo.num_components) {
-    case 3:
-	    cinfo.jpeg_color_space = colorXform ? JCS_YCbCr : JCS_RGB;
-	    break;
-    case 4:
-	    cinfo.jpeg_color_space = colorXform ? JCS_YCCK : JCS_CMYK;
-	    break;
-    }
+      switch (cinfo.num_components) {
+      case 3:
+	cinfo.jpeg_color_space = colorXform ? JCS_YCbCr : JCS_RGB;
+	break;
+      case 4:
+	cinfo.jpeg_color_space = colorXform ? JCS_YCCK : JCS_CMYK;
+	break;
+      }
 
-    jpeg_start_decompress(&cinfo);
+      jpeg_start_decompress(&cinfo);
 
-    row_stride = cinfo.output_width * cinfo.output_components;
-    row_buffer = cinfo.mem->alloc_sarray((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+      row_stride = cinfo.output_width * cinfo.output_components;
+      row_buffer = cinfo.mem->alloc_sarray((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+    }
   }
 }
 
diff --git a/poppler/DCTStream.h b/poppler/DCTStream.h
index 55bd985d..bc20a7aa 100644
--- a/poppler/DCTStream.h
+++ b/poppler/DCTStream.h
@@ -9,6 +9,7 @@
 // Copyright 2005-2007, 2009-2011 Albert Astals Cid <aacid@kde.org>
 // Copyright 2010 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright 2011 Daiki Ueno <ueno@unixuser.org>
+// Copyright 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 //========================================================================
 
@@ -43,6 +44,7 @@
 
 extern "C" {
 #include <jpeglib.h>
+#include <jerror.h>
 }
 
 struct str_src_mgr {
@@ -55,12 +57,14 @@ struct str_src_mgr {
 struct str_error_mgr {
   struct jpeg_error_mgr pub;
   jmp_buf setjmp_buffer;
+  int width;
+  int height;
 };
 
 class DCTStream: public FilterStream {
 public:
 
-  DCTStream(Stream *strA, int colorXformA);
+  DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion);
   virtual ~DCTStream();
   virtual StreamKind getKind() { return strDCT; }
   virtual void reset();
diff --git a/poppler/Decrypt.cc b/poppler/Decrypt.cc
index 44f69619..ba44f959 100644
--- a/poppler/Decrypt.cc
+++ b/poppler/Decrypt.cc
@@ -18,6 +18,7 @@
 // Copyright (C) 2009 Matthias Franz <matthias@ktug.or.kr>
 // Copyright (C) 2009 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -341,7 +342,7 @@ void BaseCryptStream::reset() {
   str->reset();
 }
 
-int BaseCryptStream::getPos() {
+Goffset BaseCryptStream::getPos() {
   return charactersRead;
 }
 
diff --git a/poppler/Decrypt.h b/poppler/Decrypt.h
index c049f5c9..10a6386c 100644
--- a/poppler/Decrypt.h
+++ b/poppler/Decrypt.h
@@ -16,6 +16,9 @@
 // Copyright (C) 2008 Julien Rebetez <julien@fhtagn.net>
 // Copyright (C) 2009 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -103,11 +106,11 @@ public:
   BaseCryptStream(Stream *strA, Guchar *fileKey, CryptAlgorithm algoA,
                   int keyLength, int objNum, int objGen);
   virtual ~BaseCryptStream();
-  virtual StreamKind getKind() { return strWeird; }
+  virtual StreamKind getKind() { return strCrypt; }
   virtual void reset();
   virtual int getChar();
   virtual int lookChar() = 0;
-  virtual int getPos();
+  virtual Goffset getPos();
   virtual GBool isBinary(GBool last);
   virtual Stream *getUndecodedStream() { return this; }
   void setAutoDelete(GBool val);
@@ -116,7 +119,7 @@ protected:
   CryptAlgorithm algo;
   int objKeyLength;
   Guchar objKey[32];
-  int charactersRead; // so that getPos() can be correct
+  Goffset charactersRead; // so that getPos() can be correct
   int nextCharBuff;   // EOF means not read yet
   GBool autoDelete;
 
diff --git a/poppler/Dict.cc b/poppler/Dict.cc
index c4f667bf..4cf42dcd 100644
--- a/poppler/Dict.cc
+++ b/poppler/Dict.cc
@@ -16,9 +16,10 @@
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -39,6 +40,11 @@
 #include "XRef.h"
 #include "Dict.h"
 
+#if MULTITHREADED
+#  define dictLocker()   MutexLocker locker(&mutex)
+#else
+#  define dictLocker()
+#endif
 //------------------------------------------------------------------------
 // Dict
 //------------------------------------------------------------------------
@@ -74,21 +80,44 @@ Dict::Dict(XRef *xrefA) {
   size = length = 0;
   ref = 1;
   sorted = gFalse;
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
 }
 
 Dict::Dict(Dict* dictA) {
   xref = dictA->xref;
   size = length = dictA->length;
   ref = 1;
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
 
   sorted = dictA->sorted;
   entries = (DictEntry *)gmallocn(size, sizeof(DictEntry));
   for (int i=0; i<length; i++) {
-    entries[i].key = strdup(dictA->entries[i].key);
+    entries[i].key = copyString(dictA->entries[i].key);
     dictA->entries[i].val.copy(&entries[i].val);
   }
 }
 
+Dict *Dict::copy(XRef *xrefA) {
+  dictLocker();
+  Dict *dictA = new Dict(this);
+  dictA->xref = xrefA;
+  for (int i=0; i<length; i++) {
+    if (dictA->entries[i].val.getType() == objDict) {
+       Dict *dict = dictA->entries[i].val.getDict();
+       Object obj;
+       obj.initDict(dict->copy(xrefA));
+       dictA->entries[i].val.free();
+       dictA->entries[i].val = obj;
+       obj.free();
+    }
+  }
+  return dictA;
+}
+
 Dict::~Dict() {
   int i;
 
@@ -97,9 +126,25 @@ Dict::~Dict() {
     entries[i].val.free();
   }
   gfree(entries);
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
+}
+
+int Dict::incRef() {
+  dictLocker();
+  ++ref;
+  return ref;
+}
+
+int Dict::decRef() {
+  dictLocker();
+  --ref;
+  return ref;
 }
 
 void Dict::add(char *key, Object *val) {
+  dictLocker();
   if (sorted) {
     // We use add on very few occasions so
     // virtually this will never be hit
@@ -122,6 +167,7 @@ void Dict::add(char *key, Object *val) {
 inline DictEntry *Dict::find(const char *key) {
   if (!sorted && length >= SORT_LENGTH_LOWER_LIMIT)
   {
+      dictLocker();
       sorted = gTrue;
       std::sort(entries, entries+length, cmpDictEntries);
   }
@@ -147,6 +193,7 @@ GBool Dict::hasKey(const char *key) {
 }
 
 void Dict::remove(const char *key) {
+  dictLocker();
   if (sorted) {
     const int pos = binarySearch(key, entries, length);
     if (pos != -1) {
@@ -159,7 +206,9 @@ void Dict::remove(const char *key) {
     int i; 
     bool found = false;
     DictEntry tmp;
-    if(length == 0) return;
+    if(length == 0) {
+      return;
+    }
 
     for(i=0; i<length; i++) {
       if (!strcmp(key, entries[i].key)) {
@@ -167,7 +216,9 @@ void Dict::remove(const char *key) {
         break;
       }
     }
-    if(!found) return;
+    if(!found) {
+      return;
+    }
     //replace the deleted entry with the last entry
     length -= 1;
     tmp = entries[length];
@@ -184,6 +235,7 @@ void Dict::set(const char *key, Object *val) {
   }
   e = find (key);
   if (e) {
+    dictLocker();
     e->val.free();
     e->val = *val;
   } else {
diff --git a/poppler/Dict.h b/poppler/Dict.h
index 897f2213..fba99edc 100644
--- a/poppler/Dict.h
+++ b/poppler/Dict.h
@@ -18,6 +18,7 @@
 // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -31,7 +32,9 @@
 #pragma interface
 #endif
 
+#include "poppler-config.h"
 #include "Object.h"
+#include "goo/GooMutex.h"
 
 //------------------------------------------------------------------------
 // Dict
@@ -48,13 +51,14 @@ public:
   // Constructor.
   Dict(XRef *xrefA);
   Dict(Dict* dictA);
+  Dict *copy(XRef *xrefA);
 
   // Destructor.
   ~Dict();
 
   // Reference counting.
-  int incRef() { return ++ref; }
-  int decRef() { return --ref; }
+  int incRef();
+  int decRef();
 
   // Get number of entries.
   int getLength() { return length; }
@@ -98,6 +102,9 @@ private:
   int size;			// size of <entries> array
   int length;			// number of entries in dictionary
   int ref;			// reference count
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 
   DictEntry *find(const char *key);
 };
diff --git a/poppler/Error.cc b/poppler/Error.cc
index ce71820b..99ca3ad3 100644
--- a/poppler/Error.cc
+++ b/poppler/Error.cc
@@ -17,6 +17,7 @@
 // Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2012 Marek Kasik <mkasik@redhat.com>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -48,17 +49,17 @@ static const char *errorCategoryNames[] = {
 };
 
 static void (*errorCbk)(void *data, ErrorCategory category,
-			int pos, char *msg) = NULL;
+			Goffset pos, char *msg) = NULL;
 static void *errorCbkData = NULL;
 
 void setErrorCallback(void (*cbk)(void *data, ErrorCategory category,
-				  int pos, char *msg),
+				  Goffset pos, char *msg),
 		      void *data) {
   errorCbk = cbk;
   errorCbkData = data;
 }
 
-void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
+void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...) {
   va_list args;
   GooString *s, *sanitized;
 
@@ -84,8 +85,8 @@ void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
     (*errorCbk)(errorCbkData, category, pos, sanitized->getCString());
   } else {
     if (pos >= 0) {
-      fprintf(stderr, "%s (%d): %s\n",
-	      errorCategoryNames[category], pos, sanitized->getCString());
+      fprintf(stderr, "%s (%lld): %s\n",
+	      errorCategoryNames[category], (long long)pos, sanitized->getCString());
     } else {
       fprintf(stderr, "%s: %s\n",
 	      errorCategoryNames[category], sanitized->getCString());
diff --git a/poppler/Error.h b/poppler/Error.h
index d7a0991f..88fc3ea4 100644
--- a/poppler/Error.h
+++ b/poppler/Error.h
@@ -16,6 +16,7 @@
 // Copyright (C) 2005, 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -31,6 +32,7 @@
 
 #include <stdarg.h>
 #include "poppler-config.h"
+#include "goo/gtypes.h"
 
 enum ErrorCategory {
   errSyntaxWarning,    // PDF syntax error which can be worked around;
@@ -48,9 +50,9 @@ enum ErrorCategory {
 };
 
 extern void setErrorCallback(void (*cbk)(void *data, ErrorCategory category,
-					 int pos, char *msg),
+					 Goffset pos, char *msg),
 			     void *data);
 
-extern void CDECL error(ErrorCategory category, int pos, const char *msg, ...);
+extern void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...);
 
 #endif
diff --git a/poppler/FontInfo.cc b/poppler/FontInfo.cc
index 35d5f5f2..8fc89e9d 100644
--- a/poppler/FontInfo.cc
+++ b/poppler/FontInfo.cc
@@ -9,7 +9,7 @@
 // Copyright (C) 2009 Pino Toscano <pino@kde.org>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2010, 2012 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2010 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 //
@@ -68,17 +68,19 @@ GooList *FontInfoScanner::scan(int nPages) {
     lastPage = doc->getNumPages() + 1;
   }
 
+  XRef *xrefA = doc->getXRef()->copy();
   for (int pg = currentPage; pg < lastPage; ++pg) {
     page = doc->getPage(pg);
     if (!page) continue;
 
-    if ((resDict = page->getResourceDict())) {
-      scanFonts(resDict, result);
+    if ((resDict = page->getResourceDictCopy(xrefA))) {
+      scanFonts(xrefA, resDict, result);
+      delete resDict;
     }
     annots = page->getAnnots();
     for (int i = 0; i < annots->getNumAnnots(); ++i) {
       if (annots->getAnnot(i)->getAppearanceResDict(&obj1)->isDict()) {
-        scanFonts(obj1.getDict(), result);
+        scanFonts(xrefA, obj1.getDict(), result);
       }
       obj1.free();
     }
@@ -86,10 +88,11 @@ GooList *FontInfoScanner::scan(int nPages) {
 
   currentPage = lastPage;
 
+  delete xrefA;
   return result;
 }
 
-void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
+void FontInfoScanner::scanFonts(XRef *xrefA, Dict *resDict, GooList *fontsList) {
   Object obj1, obj2, objDict, resObj;
   Ref r;
   GfxFontDict *gfxFontDict;
@@ -100,14 +103,14 @@ void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
   gfxFontDict = NULL;
   resDict->lookupNF("Font", &obj1);
   if (obj1.isRef()) {
-    obj1.fetch(doc->getXRef(), &obj2);
+    obj1.fetch(xrefA, &obj2);
     if (obj2.isDict()) {
       r = obj1.getRef();
-      gfxFontDict = new GfxFontDict(doc->getXRef(), &r, obj2.getDict());
+      gfxFontDict = new GfxFontDict(xrefA, &r, obj2.getDict());
     }
     obj2.free();
   } else if (obj1.isDict()) {
-    gfxFontDict = new GfxFontDict(doc->getXRef(), NULL, obj1.getDict());
+    gfxFontDict = new GfxFontDict(xrefA, NULL, obj1.getDict());
   }
   if (gfxFontDict) {
     for (i = 0; i < gfxFontDict->getNumFonts(); ++i) {
@@ -116,7 +119,7 @@ void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
 
         // add this font to the list if not already found
         if (fonts.find(fontRef.num) == fonts.end()) {
-          fontsList->append(new FontInfo(font, doc));
+          fontsList->append(new FontInfo(font, xrefA));
           fonts.insert(fontRef.num);
         }
       }
@@ -144,12 +147,12 @@ void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
           visitedObjects.insert(r.num);
         }
 
-        obj1.fetch(doc->getXRef(), &obj2);
+        obj1.fetch(xrefA, &obj2);
 
         if (obj2.isStream()) {
           obj2.streamGetDict()->lookup("Resources", &resObj);
           if (resObj.isDict() && resObj.getDict() != resDict) {
-            scanFonts(resObj.getDict(), fontsList);
+            scanFonts(xrefA, resObj.getDict(), fontsList);
           }
           resObj.free();
         }
@@ -161,7 +164,7 @@ void FontInfoScanner::scanFonts(Dict *resDict, GooList *fontsList) {
   }
 }
 
-FontInfo::FontInfo(GfxFont *font, PDFDoc *doc) {
+FontInfo::FontInfo(GfxFont *font, XRef *xref) {
   GooString *origName;
   Object fontObj, toUnicodeObj;
   int i;
@@ -201,7 +204,7 @@ FontInfo::FontInfo(GfxFont *font, PDFDoc *doc) {
 
   // look for a ToUnicode map
   hasToUnicode = gFalse;
-  if (doc->getXRef()->fetch(fontRef.num, fontRef.gen, &fontObj)->isDict()) {
+  if (xref->fetch(fontRef.num, fontRef.gen, &fontObj)->isDict()) {
     hasToUnicode = fontObj.dictLookup("ToUnicode", &toUnicodeObj)->isStream();
     toUnicodeObj.free();
   }
diff --git a/poppler/FontInfo.h b/poppler/FontInfo.h
index db90440d..615b6793 100644
--- a/poppler/FontInfo.h
+++ b/poppler/FontInfo.h
@@ -7,6 +7,7 @@
 // Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
 // Copyright (C) 2009 Pino Toscano <pino@kde.org>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -49,7 +50,7 @@ public:
   };
     
   // Constructor.
-  FontInfo(GfxFont *fontA, PDFDoc *doc);
+  FontInfo(GfxFont *fontA, XRef *xrefA);
   // Copy constructor
   FontInfo(FontInfo& f);
   // Destructor.
@@ -96,7 +97,7 @@ private:
   std::set<int> fonts;
   std::set<int> visitedObjects;
 
-  void scanFonts(Dict *resDict, GooList *fontsList);
+  void scanFonts(XRef *xrefA, Dict *resDict, GooList *fontsList);
 };
 
 #endif
diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index 5c9ed35c..f2971d66 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
-// Copyright (C) 2005-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -28,14 +28,14 @@
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2009 M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
-// Copyright (C) 2009-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 William Bader <williambader@hotmail.com>
 // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2010 Nils Höglund <nils.hoglund@gmail.com>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Axel Strübing <axel.struebing@freenet.de>
 // Copyright (C) 2012 Even Rouault <even.rouault@mines-paris.org>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
@@ -62,6 +62,7 @@
 #include "Object.h"
 #include "PDFDoc.h"
 #include "Array.h"
+#include "Annot.h"
 #include "Dict.h"
 #include "Stream.h"
 #include "Lexer.h"
@@ -322,14 +323,15 @@ static inline GBool isSameGfxColor(const GfxColor &colorA, const GfxColor &color
 // GfxResources
 //------------------------------------------------------------------------
 
-GfxResources::GfxResources(XRef *xref, Dict *resDict, GfxResources *nextA) :
+GfxResources::GfxResources(XRef *xref, Dict *resDictA, GfxResources *nextA) :
     gStateCache(2, xref) {
   Object obj1, obj2;
   Ref r;
 
-  if (resDict) {
+  if (resDictA) {
 
     // build font dictionary
+    Dict *resDict = resDictA->copy(xref);
     fonts = NULL;
     resDict->lookupNF("Font", &obj1);
     if (obj1.isRef()) {
@@ -362,6 +364,7 @@ GfxResources::GfxResources(XRef *xref, Dict *resDict, GfxResources *nextA) :
     // get properties dictionary
     resDict->lookup("Properties", &propertiesDict);
 
+    delete resDict;
   } else {
     fonts = NULL;
     xObjDict.initNull();
@@ -457,7 +460,7 @@ void GfxResources::lookupColorSpace(const char *name, Object *obj) {
   obj->initNull();
 }
 
-GfxPattern *GfxResources::lookupPattern(char *name, Gfx *gfx) {
+GfxPattern *GfxResources::lookupPattern(char *name, OutputDev *out) {
   GfxResources *resPtr;
   GfxPattern *pattern;
   Object obj;
@@ -465,7 +468,7 @@ GfxPattern *GfxResources::lookupPattern(char *name, Gfx *gfx) {
   for (resPtr = this; resPtr; resPtr = resPtr->next) {
     if (resPtr->patternDict.isDict()) {
       if (!resPtr->patternDict.dictLookup(name, &obj)->isNull()) {
-	pattern = GfxPattern::parse(&obj, gfx);
+	pattern = GfxPattern::parse(&obj, out);
 	obj.free();
 	return pattern;
       }
@@ -476,7 +479,7 @@ GfxPattern *GfxResources::lookupPattern(char *name, Gfx *gfx) {
   return NULL;
 }
 
-GfxShading *GfxResources::lookupShading(char *name, Gfx *gfx) {
+GfxShading *GfxResources::lookupShading(char *name, OutputDev *out) {
   GfxResources *resPtr;
   GfxShading *shading;
   Object obj;
@@ -484,7 +487,7 @@ GfxShading *GfxResources::lookupShading(char *name, Gfx *gfx) {
   for (resPtr = this; resPtr; resPtr = resPtr->next) {
     if (resPtr->shadingDict.isDict()) {
       if (!resPtr->shadingDict.dictLookup(name, &obj)->isNull()) {
-	shading = GfxShading::parse(&obj, gfx);
+	shading = GfxShading::parse(&obj, out);
 	obj.free();
 	return shading;
       }
@@ -534,15 +537,12 @@ Gfx::Gfx(PDFDoc *docA, OutputDev *outA, int pageNum, Dict *resDict,
 	 double hDPI, double vDPI, PDFRectangle *box,
 	 PDFRectangle *cropBox, int rotate,
 	 GBool (*abortCheckCbkA)(void *data),
-	 void *abortCheckCbkDataA)
-#ifdef USE_CMS
- : iccColorSpaceCache(5)
-#endif
+	 void *abortCheckCbkDataA, XRef *xrefA)
 {
   int i;
 
   doc = docA;
-  xref = doc->getXRef();
+  xref = (xrefA == NULL) ? doc->getXRef() : xrefA;
   catalog = doc->getCatalog();
   subPage = gFalse;
   printCommands = globalParams->getPrintCommands();
@@ -561,7 +561,7 @@ Gfx::Gfx(PDFDoc *docA, OutputDev *outA, int pageNum, Dict *resDict,
   fontChanged = gFalse;
   clip = clipNone;
   ignoreUndef = 0;
-  out->startPage(pageNum, state);
+  out->startPage(pageNum, state, xref);
   out->setDefaultCTM(state->getCTM());
   out->updateAll(state);
   for (i = 0; i < 6; ++i) {
@@ -589,15 +589,12 @@ Gfx::Gfx(PDFDoc *docA, OutputDev *outA, int pageNum, Dict *resDict,
 Gfx::Gfx(PDFDoc *docA, OutputDev *outA, Dict *resDict,
 	 PDFRectangle *box, PDFRectangle *cropBox,
 	 GBool (*abortCheckCbkA)(void *data),
-	 void *abortCheckCbkDataA)
- #ifdef USE_CMS
- : iccColorSpaceCache(5)
-#endif
+	 void *abortCheckCbkDataA, XRef *xrefA)
 {
   int i;
 
   doc = docA;
-  xref = doc->getXRef();
+  xref = (xrefA == NULL) ? doc->getXRef() : xrefA;
   catalog = doc->getCatalog();
   subPage = gTrue;
   printCommands = globalParams->getPrintCommands();
@@ -893,7 +890,7 @@ GBool Gfx::checkArg(Object *arg, TchkType type) {
   return gFalse;
 }
 
-int Gfx::getPos() {
+Goffset Gfx::getPos() {
   return parser ? parser->getPos() : -1;
 }
 
@@ -1186,7 +1183,7 @@ void Gfx::opSetExtGState(Object args[], int numArgs) {
 	  blendingColorSpace = NULL;
 	  isolated = knockout = gFalse;
 	  if (!obj4.dictLookup("CS", &obj5)->isNull()) {
-	    blendingColorSpace = GfxColorSpace::parse(&obj5, this);
+	    blendingColorSpace = GfxColorSpace::parse(&obj5, out);
 	  }
 	  obj5.free();
 	  if (obj4.dictLookup("I", &obj5)->isBool()) {
@@ -1388,7 +1385,7 @@ void Gfx::opSetFillGray(Object args[], int numArgs) {
   state->setFillPattern(NULL);
   res->lookupColorSpace("DefaultGray", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceGrayColorSpace();
@@ -1409,7 +1406,7 @@ void Gfx::opSetStrokeGray(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultGray", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceGrayColorSpace();
@@ -1430,7 +1427,7 @@ void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
 
   res->lookupColorSpace("DefaultCMYK", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceCMYKColorSpace();
@@ -1455,7 +1452,7 @@ void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultCMYK", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceCMYKColorSpace();
@@ -1479,7 +1476,7 @@ void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
   state->setFillPattern(NULL);
   res->lookupColorSpace("DefaultRGB", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceRGBColorSpace();
@@ -1503,7 +1500,7 @@ void Gfx::opSetStrokeRGBColor(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultRGB", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceRGBColorSpace();
@@ -1525,9 +1522,9 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
 
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0], this);
+    colorSpace = GfxColorSpace::parse(&args[0], out);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   obj.free();
   if (colorSpace) {
@@ -1550,9 +1547,9 @@ void Gfx::opSetStrokeColorSpace(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0], this);
+    colorSpace = GfxColorSpace::parse(&args[0], out);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj, this);
+    colorSpace = GfxColorSpace::parse(&obj, out);
   }
   obj.free();
   if (colorSpace) {
@@ -1623,7 +1620,7 @@ void Gfx::opSetFillColorN(Object args[], int numArgs) {
     }
     if (numArgs > 0) {
       if (args[numArgs-1].isName() &&
-	  (pattern = res->lookupPattern(args[numArgs-1].getName(), this))) {
+	  (pattern = res->lookupPattern(args[numArgs-1].getName(), out))) {
         state->setFillPattern(pattern);
       }
     }
@@ -1675,7 +1672,7 @@ void Gfx::opSetStrokeColorN(Object args[], int numArgs) {
       return;
     }
     if (args[numArgs-1].isName() &&
-	(pattern = res->lookupPattern(args[numArgs-1].getName(), this))) {
+	(pattern = res->lookupPattern(args[numArgs-1].getName(), out))) {
       state->setStrokePattern(pattern);
     }
 
@@ -2205,10 +2202,20 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat,
   //~ edge instead of left/bottom (?)
   xstep = fabs(tPat->getXStep());
   ystep = fabs(tPat->getYStep());
-  xi0 = (int)ceil((xMin - tPat->getBBox()[2]) / xstep);
-  xi1 = (int)floor((xMax - tPat->getBBox()[0]) / xstep) + 1;
-  yi0 = (int)ceil((yMin - tPat->getBBox()[3]) / ystep);
-  yi1 = (int)floor((yMax - tPat->getBBox()[1]) / ystep) + 1;
+  if (tPat->getBBox()[0] < tPat->getBBox()[2]) {
+    xi0 = (int)ceil((xMin - tPat->getBBox()[2]) / xstep);
+    xi1 = (int)floor((xMax - tPat->getBBox()[0]) / xstep) + 1;
+  } else {
+    xi0 = (int)ceil((xMin - tPat->getBBox()[0]) / xstep);
+    xi1 = (int)floor((xMax - tPat->getBBox()[2]) / xstep) + 1;
+  }
+  if (tPat->getBBox()[1] < tPat->getBBox()[3]) {
+    yi0 = (int)ceil((yMin - tPat->getBBox()[3]) / ystep);
+    yi1 = (int)floor((yMax - tPat->getBBox()[1]) / ystep) + 1;
+  } else {
+    yi0 = (int)ceil((yMin - tPat->getBBox()[1]) / ystep);
+    yi1 = (int)floor((yMax - tPat->getBBox()[3]) / ystep) + 1;
+  }
   for (i = 0; i < 4; ++i) {
     m1[i] = m[i];
   }
@@ -2375,7 +2382,7 @@ void Gfx::opShFill(Object args[], int numArgs) {
     return;
   }
 
-  if (!(shading = res->lookupShading(args[0].getName(), this))) {
+  if (!(shading = res->lookupShading(args[0].getName(), out))) {
     return;
   }
 
@@ -4123,10 +4130,25 @@ void Gfx::opXObject(Object args[], int numArgs) {
     }
   } else if (obj2.isName("Form")) {
     res->lookupXObjectNF(name, &refObj);
-    if (out->useDrawForm() && refObj.isRef()) {
-      out->drawForm(refObj.getRef());
-    } else {
-      doForm(&obj1);
+    GBool shouldDoForm = gTrue;
+    std::set<int>::iterator drawingFormIt;
+    if (refObj.isRef()) {
+      const int num = refObj.getRef().num;
+      if (formsDrawing.find(num) == formsDrawing.end()) {
+	drawingFormIt = formsDrawing.insert(num).first;
+      } else {
+	shouldDoForm = gFalse;	
+      }
+    }
+    if (shouldDoForm) {
+      if (out->useDrawForm() && refObj.isRef()) {
+	out->drawForm(refObj.getRef());
+      } else {
+	doForm(&obj1);
+      }
+    }
+    if (refObj.isRef() && shouldDoForm) {
+      formsDrawing.erase(drawingFormIt);
     }
     refObj.free();
   } else if (obj2.isName("PS")) {
@@ -4317,14 +4339,14 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       }
     }
     if (!obj1.isNull()) {
-      colorSpace = GfxColorSpace::parse(&obj1, this);
+      colorSpace = GfxColorSpace::parse(&obj1, out);
     } else if (csMode == streamCSDeviceGray) {
       Object objCS;
       res->lookupColorSpace("DefaultGray", &objCS);
       if (objCS.isNull()) {
         colorSpace = new GfxDeviceGrayColorSpace();
       } else {
-        colorSpace = GfxColorSpace::parse(&objCS, this);
+        colorSpace = GfxColorSpace::parse(&objCS, out);
       }
       objCS.free();
     } else if (csMode == streamCSDeviceRGB) {
@@ -4333,7 +4355,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       if (objCS.isNull()) {
         colorSpace = new GfxDeviceRGBColorSpace();
       } else {
-        colorSpace = GfxColorSpace::parse(&objCS, this);
+        colorSpace = GfxColorSpace::parse(&objCS, out);
       }
       objCS.free();
     } else if (csMode == streamCSDeviceCMYK) {
@@ -4342,7 +4364,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       if (objCS.isNull()) {
         colorSpace = new GfxDeviceCMYKColorSpace();
       } else {
-        colorSpace = GfxColorSpace::parse(&objCS, this);
+        colorSpace = GfxColorSpace::parse(&objCS, out);
       }
       objCS.free();
     } else {
@@ -4437,7 +4459,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
 	  obj2.free();
 	}
       }
-      maskColorSpace = GfxColorSpace::parse(&obj1, this);
+      maskColorSpace = GfxColorSpace::parse(&obj1, out);
       obj1.free();
       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
 	goto err1;
@@ -4733,7 +4755,7 @@ void Gfx::doForm(Object *str) {
   if (dict->lookup("Group", &obj1)->isDict()) {
     if (obj1.dictLookup("S", &obj2)->isName("Transparency")) {
       if (!obj1.dictLookup("CS", &obj3)->isNull()) {
-	blendingColorSpace = GfxColorSpace::parse(&obj3, this);
+	blendingColorSpace = GfxColorSpace::parse(&obj3, out);
       }
       obj3.free();
       if (obj1.dictLookup("I", &obj3)->isBool()) {
@@ -5110,8 +5132,20 @@ void Gfx::opMarkPoint(Object args[], int numArgs) {
 // misc
 //------------------------------------------------------------------------
 
+struct GfxStackStateSaver {
+  GfxStackStateSaver(Gfx *gfx) : gfx(gfx) {
+    gfx->saveState();
+  }
+
+  ~GfxStackStateSaver() {
+    gfx->restoreState();
+  }
+
+  Gfx * const gfx;
+};
+
 void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
-		    double xMin, double yMin, double xMax, double yMax) {
+		    double xMin, double yMin, double xMax, double yMax, int rotate) {
   Dict *dict, *resDict;
   Object matrixObj, bboxObj, resObj, obj1;
   double formXMin, formYMin, formXMax, formYMax;
@@ -5132,6 +5166,28 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
     return;
   }
 
+  // saves gfx state and automatically restores it on return
+  GfxStackStateSaver stackStateSaver(this);
+
+  // Rotation around the topleft corner (for the NoRotate flag)
+  if (rotate != 0) {
+    const double angle_rad = rotate * M_PI / 180;
+    const double c = cos(angle_rad);
+    const double s = sin(angle_rad);
+
+    // (xMin, yMax) is the pivot
+    const double unrotateMTX[6] = {
+        +c, -s,
+        +s, +c,
+        -c*xMin - s*yMax + xMin, -c*yMax + s*xMin + yMax
+    };
+
+    state->concatCTM(unrotateMTX[0], unrotateMTX[1], unrotateMTX[2],
+                     unrotateMTX[3], unrotateMTX[4], unrotateMTX[5]);
+    out->updateCTM(state, unrotateMTX[0], unrotateMTX[1], unrotateMTX[2],
+                          unrotateMTX[3], unrotateMTX[4], unrotateMTX[5]);
+  }
+
   // draw the appearance stream (if there is one)
   if (str->isStream()) {
 
@@ -5255,7 +5311,6 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
 
   // draw the border
   if (border && border->getWidth() > 0) {
-    saveState();
     if (state->getStrokeColorSpace()->getMode() != csDeviceRGB) {
       state->setStrokePattern(NULL);
       state->setStrokeColorSpace(new GfxDeviceRGBColorSpace());
@@ -5294,7 +5349,6 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
       state->closePath();
     }
     out->stroke(state);
-    restoreState();
   }
 }
 
@@ -5361,10 +5415,3 @@ void Gfx::popResources() {
   delete res;
   res = resPtr;
 }
-
-#ifdef USE_CMS
-PopplerCache *Gfx::getIccColorSpaceCache()
-{
-  return &iccColorSpaceCache;
-}
-#endif
diff --git a/poppler/Gfx.h b/poppler/Gfx.h
index 7c42f14d..aba3b7e5 100644
--- a/poppler/Gfx.h
+++ b/poppler/Gfx.h
@@ -17,10 +17,11 @@
 // Copyright (C) 2007 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009-2012 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2009, 2010, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2010, 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2010 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 //
 // 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
@@ -116,8 +117,8 @@ public:
   GBool lookupXObjectNF(char *name, Object *obj);
   GBool lookupMarkedContentNF(char *name, Object *obj);
   void lookupColorSpace(const char *name, Object *obj);
-  GfxPattern *lookupPattern(char *name, Gfx *gfx);
-  GfxShading *lookupShading(char *name, Gfx *gfx);
+  GfxPattern *lookupPattern(char *name, OutputDev *out);
+  GfxShading *lookupShading(char *name, OutputDev *out);
   GBool lookupGState(char *name, Object *obj);
   GBool lookupGStateNF(char *name, Object *obj);
 
@@ -148,23 +149,25 @@ public:
       double hDPI, double vDPI, PDFRectangle *box,
       PDFRectangle *cropBox, int rotate,
       GBool (*abortCheckCbkA)(void *data) = NULL,
-      void *abortCheckCbkDataA = NULL);
+      void *abortCheckCbkDataA = NULL, XRef *xrefA = NULL);
 
   // Constructor for a sub-page object.
   Gfx(PDFDoc *docA, OutputDev *outA, Dict *resDict,
       PDFRectangle *box, PDFRectangle *cropBox,
       GBool (*abortCheckCbkA)(void *data) = NULL,
-      void *abortCheckCbkDataA = NULL);
+      void *abortCheckCbkDataA = NULL, XRef *xrefA = NULL);
 
   ~Gfx();
 
+  XRef *getXRef() { return xref; }
+
   // Interpret a stream or array of streams.
   void display(Object *obj, GBool topLevel = gTrue);
 
   // Display an annotation, given its appearance (a Form XObject),
   // border style, and bounding box (in default user space).
   void drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
-		 double xMin, double yMin, double xMax, double yMax);
+		 double xMin, double yMin, double xMax, double yMax, int rotate);
 
   // Save graphics state.
   void saveState();
@@ -192,10 +195,6 @@ public:
 
   void pushResources(Dict *resDict);
   void popResources();
- 
-#ifdef USE_CMS
-  PopplerCache *getIccColorSpaceCache();
-#endif
 
 private:
 
@@ -225,10 +224,8 @@ private:
   MarkedContentStack *mcStack;	// current BMC/EMC stack
 
   Parser *parser;		// parser for page content stream(s)
-
-#ifdef USE_CMS
-  PopplerCache iccColorSpaceCache;
-#endif
+  
+  std::set<int> formsDrawing;	// the forms that are being drawn
 
   GBool				// callback to check for an abort
     (*abortCheckCbk)(void *data);
@@ -240,7 +237,7 @@ private:
   void execOp(Object *cmd, Object args[], int numArgs);
   Operator *findOp(char *name);
   GBool checkArg(Object *arg, TchkType type);
-  int getPos();
+  Goffset getPos();
 
   int bottomGuard();
 
diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index 73a37812..0bafb6d3 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2006-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009, 2012 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2009, 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Christian Persch <chpe@gnome.org>
@@ -24,6 +24,7 @@
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
 // Copyright (C) 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
 //
 // 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
@@ -51,6 +52,7 @@
 #include "GfxFont.h"
 #include "GlobalParams.h"
 #include "PopplerCache.h"
+#include "OutputDev.h"
 
 //------------------------------------------------------------------------
 
@@ -254,7 +256,7 @@ GfxColorSpace::GfxColorSpace() {
 GfxColorSpace::~GfxColorSpace() {
 }
 
-GfxColorSpace *GfxColorSpace::parse(Object *csObj, Gfx *gfx, int recursion) {
+GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, int recursion) {
   GfxColorSpace *cs;
   Object obj1;
 
@@ -291,15 +293,15 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, Gfx *gfx, int recursion) {
     } else if (obj1.isName("Lab")) {
       cs = GfxLabColorSpace::parse(csObj->getArray());
     } else if (obj1.isName("ICCBased")) {
-      cs = GfxICCBasedColorSpace::parse(csObj->getArray(), gfx, recursion);
+      cs = GfxICCBasedColorSpace::parse(csObj->getArray(), out, recursion);
     } else if (obj1.isName("Indexed") || obj1.isName("I")) {
-      cs = GfxIndexedColorSpace::parse(csObj->getArray(), gfx, recursion);
+      cs = GfxIndexedColorSpace::parse(csObj->getArray(), out, recursion);
     } else if (obj1.isName("Separation")) {
-      cs = GfxSeparationColorSpace::parse(csObj->getArray(), gfx, recursion);
+      cs = GfxSeparationColorSpace::parse(csObj->getArray(), out, recursion);
     } else if (obj1.isName("DeviceN")) {
-      cs = GfxDeviceNColorSpace::parse(csObj->getArray(), gfx, recursion);
+      cs = GfxDeviceNColorSpace::parse(csObj->getArray(), out, recursion);
     } else if (obj1.isName("Pattern")) {
-      cs = GfxPatternColorSpace::parse(csObj->getArray(), gfx, recursion);
+      cs = GfxPatternColorSpace::parse(csObj->getArray(), out, recursion);
     } else {
       error(errSyntaxWarning, -1, "Bad color space");
     }
@@ -1624,7 +1626,7 @@ GfxColorSpace *GfxICCBasedColorSpace::copy() {
   return cs;
 }
 
-GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, Gfx *gfx, int recursion) {
+GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, int recursion) {
   GfxICCBasedColorSpace *cs;
   Ref iccProfileStreamA;
   int nCompsA;
@@ -1647,9 +1649,9 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, Gfx *gfx, int recursion)
   obj1.free();
 #ifdef USE_CMS
   // check cache
-  if (gfx && iccProfileStreamA.num > 0) {
+  if (out && iccProfileStreamA.num > 0) {
     GfxICCBasedColorSpaceKey k(iccProfileStreamA.num, iccProfileStreamA.gen);
-    GfxICCBasedColorSpaceItem *item = static_cast<GfxICCBasedColorSpaceItem *>(gfx->getIccColorSpaceCache()->lookup(k));
+    GfxICCBasedColorSpaceItem *item = static_cast<GfxICCBasedColorSpaceItem *>(out->getIccColorSpaceCache()->lookup(k));
     if (item != NULL)
     {
       cs = static_cast<GfxICCBasedColorSpace*>(item->cs->copy());
@@ -1679,7 +1681,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, Gfx *gfx, int recursion)
     nCompsA = 4;
   }
   if (dict->lookup("Alternate", &obj2)->isNull() ||
-      !(altA = GfxColorSpace::parse(&obj2, gfx, recursion + 1))) {
+      !(altA = GfxColorSpace::parse(&obj2, out, recursion + 1))) {
     switch (nCompsA) {
     case 1:
       altA = new GfxDeviceGrayColorSpace();
@@ -1761,10 +1763,10 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, Gfx *gfx, int recursion)
   }
   obj1.free();
   // put this colorSpace into cache
-  if (gfx && iccProfileStreamA.num > 0) {
+  if (out && iccProfileStreamA.num > 0) {
     GfxICCBasedColorSpaceKey *k = new GfxICCBasedColorSpaceKey(iccProfileStreamA.num, iccProfileStreamA.gen);
     GfxICCBasedColorSpaceItem *item = new GfxICCBasedColorSpaceItem(cs);
-    gfx->getIccColorSpaceCache()->put(k, item);
+    out->getIccColorSpaceCache()->put(k, item);
   }
 #endif
   return cs;
@@ -1991,7 +1993,7 @@ GfxColorSpace *GfxIndexedColorSpace::copy() {
   return cs;
 }
 
-GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, Gfx *gfx, int recursion) {
+GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, OutputDev *out, int recursion) {
   GfxIndexedColorSpace *cs;
   GfxColorSpace *baseA;
   int indexHighA;
@@ -2004,7 +2006,7 @@ GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, Gfx *gfx, int recursion)
     goto err1;
   }
   arr->get(1, &obj1);
-  if (!(baseA = GfxColorSpace::parse(&obj1, gfx, recursion + 1))) {
+  if (!(baseA = GfxColorSpace::parse(&obj1, out, recursion + 1))) {
     error(errSyntaxWarning, -1, "Bad Indexed color space (base color space)");
     goto err2;
   }
@@ -2226,7 +2228,7 @@ GfxColorSpace *GfxSeparationColorSpace::copy() {
 }
 
 //~ handle the 'All' and 'None' colorants
-GfxColorSpace *GfxSeparationColorSpace::parse(Array *arr, Gfx *gfx, int recursion) {
+GfxColorSpace *GfxSeparationColorSpace::parse(Array *arr, OutputDev *out, int recursion) {
   GfxSeparationColorSpace *cs;
   GooString *nameA;
   GfxColorSpace *altA;
@@ -2244,7 +2246,7 @@ GfxColorSpace *GfxSeparationColorSpace::parse(Array *arr, Gfx *gfx, int recursio
   nameA = new GooString(obj1.getName());
   obj1.free();
   arr->get(2, &obj1);
-  if (!(altA = GfxColorSpace::parse(&obj1, gfx, recursion + 1))) {
+  if (!(altA = GfxColorSpace::parse(&obj1, out, recursion + 1))) {
     error(errSyntaxWarning, -1, "Bad Separation color space (alternate color space)");
     goto err3;
   }
@@ -2475,7 +2477,7 @@ GfxColorSpace *GfxDeviceNColorSpace::copy() {
 }
 
 //~ handle the 'None' colorant
-GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, Gfx *gfx, int recursion) {
+GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, int recursion) {
   GfxDeviceNColorSpace *cs;
   int nCompsA;
   GooString *namesA[gfxColorMaxComps];
@@ -2510,7 +2512,7 @@ GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, Gfx *gfx, int recursion)
   }
   obj1.free();
   arr->get(2, &obj1);
-  if (!(altA = GfxColorSpace::parse(&obj1, gfx, recursion + 1))) {
+  if (!(altA = GfxColorSpace::parse(&obj1, out, recursion + 1))) {
     error(errSyntaxWarning, -1, "Bad DeviceN color space (alternate color space)");
     goto err3;
   }
@@ -2532,7 +2534,14 @@ GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, Gfx *gfx, int recursion)
       for (i = 0; i < colorants->getLength(); i++) {
         Object obj3;
         colorants->getVal(i, &obj3);
-        separationList->append(GfxSeparationColorSpace::parse(obj3.getArray(), gfx, recursion));
+        if (obj3.isArray()) {
+          separationList->append(GfxSeparationColorSpace::parse(obj3.getArray(), out, recursion));
+        } else {
+          obj3.free();
+          obj2.free();
+          error(errSyntaxWarning, -1, "Bad DeviceN color space (colorant value entry is not an Array)");
+          goto err4;
+        }
         obj3.free();
       }
     }
@@ -2734,7 +2743,7 @@ GfxColorSpace *GfxPatternColorSpace::copy() {
 				          (GfxColorSpace *)NULL);
 }
 
-GfxColorSpace *GfxPatternColorSpace::parse(Array *arr, Gfx *gfx, int recursion) {
+GfxColorSpace *GfxPatternColorSpace::parse(Array *arr, OutputDev *out, int recursion) {
   GfxPatternColorSpace *cs;
   GfxColorSpace *underA;
   Object obj1;
@@ -2746,7 +2755,7 @@ GfxColorSpace *GfxPatternColorSpace::parse(Array *arr, Gfx *gfx, int recursion)
   underA = NULL;
   if (arr->getLength() == 2) {
     arr->get(1, &obj1);
-    if (!(underA = GfxColorSpace::parse(&obj1, gfx, recursion + 1))) {
+    if (!(underA = GfxColorSpace::parse(&obj1, out, recursion + 1))) {
       error(errSyntaxWarning, -1, "Bad Pattern color space (underlying color space)");
       obj1.free();
       return NULL;
@@ -2791,7 +2800,7 @@ GfxPattern::GfxPattern(int typeA) {
 GfxPattern::~GfxPattern() {
 }
 
-GfxPattern *GfxPattern::parse(Object *obj, Gfx *gfx) {
+GfxPattern *GfxPattern::parse(Object *obj, OutputDev *out) {
   GfxPattern *pattern;
   Object obj1;
 
@@ -2806,7 +2815,7 @@ GfxPattern *GfxPattern::parse(Object *obj, Gfx *gfx) {
   if (obj1.isInt() && obj1.getInt() == 1) {
     pattern = GfxTilingPattern::parse(obj);
   } else if (obj1.isInt() && obj1.getInt() == 2) {
-    pattern = GfxShadingPattern::parse(obj, gfx);
+    pattern = GfxShadingPattern::parse(obj, out);
   }
   obj1.free();
   return pattern;
@@ -2934,7 +2943,7 @@ GfxPattern *GfxTilingPattern::copy() {
 // GfxShadingPattern
 //------------------------------------------------------------------------
 
-GfxShadingPattern *GfxShadingPattern::parse(Object *patObj, Gfx *gfx) {
+GfxShadingPattern *GfxShadingPattern::parse(Object *patObj, OutputDev *out) {
   Dict *dict;
   GfxShading *shadingA;
   double matrixA[6];
@@ -2947,7 +2956,7 @@ GfxShadingPattern *GfxShadingPattern::parse(Object *patObj, Gfx *gfx) {
   dict = patObj->getDict();
 
   dict->lookup("Shading", &obj1);
-  shadingA = GfxShading::parse(&obj1, gfx);
+  shadingA = GfxShading::parse(&obj1, out);
   obj1.free();
   if (!shadingA) {
     return NULL;
@@ -3020,7 +3029,7 @@ GfxShading::~GfxShading() {
   }
 }
 
-GfxShading *GfxShading::parse(Object *obj, Gfx *gfx) {
+GfxShading *GfxShading::parse(Object *obj, OutputDev *out) {
   GfxShading *shading;
   Dict *dict;
   int typeA;
@@ -3044,17 +3053,17 @@ GfxShading *GfxShading::parse(Object *obj, Gfx *gfx) {
 
   switch (typeA) {
   case 1:
-    shading = GfxFunctionShading::parse(dict, gfx);
+    shading = GfxFunctionShading::parse(dict, out);
     break;
   case 2:
-    shading = GfxAxialShading::parse(dict, gfx);
+    shading = GfxAxialShading::parse(dict, out);
     break;
   case 3:
-    shading = GfxRadialShading::parse(dict, gfx);
+    shading = GfxRadialShading::parse(dict, out);
     break;
   case 4:
     if (obj->isStream()) {
-      shading = GfxGouraudTriangleShading::parse(4, dict, obj->getStream(), gfx);
+      shading = GfxGouraudTriangleShading::parse(4, dict, obj->getStream(), out);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 4 shading object");
       goto err1;
@@ -3062,7 +3071,7 @@ GfxShading *GfxShading::parse(Object *obj, Gfx *gfx) {
     break;
   case 5:
     if (obj->isStream()) {
-      shading = GfxGouraudTriangleShading::parse(5, dict, obj->getStream(), gfx);
+      shading = GfxGouraudTriangleShading::parse(5, dict, obj->getStream(), out);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 5 shading object");
       goto err1;
@@ -3070,7 +3079,7 @@ GfxShading *GfxShading::parse(Object *obj, Gfx *gfx) {
     break;
   case 6:
     if (obj->isStream()) {
-      shading = GfxPatchMeshShading::parse(6, dict, obj->getStream(), gfx);
+      shading = GfxPatchMeshShading::parse(6, dict, obj->getStream(), out);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 6 shading object");
       goto err1;
@@ -3078,7 +3087,7 @@ GfxShading *GfxShading::parse(Object *obj, Gfx *gfx) {
     break;
   case 7:
     if (obj->isStream()) {
-      shading = GfxPatchMeshShading::parse(7, dict, obj->getStream(), gfx);
+      shading = GfxPatchMeshShading::parse(7, dict, obj->getStream(), out);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 7 shading object");
       goto err1;
@@ -3095,12 +3104,12 @@ GfxShading *GfxShading::parse(Object *obj, Gfx *gfx) {
   return NULL;
 }
 
-GBool GfxShading::init(Dict *dict, Gfx *gfx) {
+GBool GfxShading::init(Dict *dict, OutputDev *out) {
   Object obj1, obj2;
   int i;
 
   dict->lookup("ColorSpace", &obj1);
-  if (!(colorSpace = GfxColorSpace::parse(&obj1, gfx))) {
+  if (!(colorSpace = GfxColorSpace::parse(&obj1, out))) {
     error(errSyntaxWarning, -1, "Bad color space in shading dictionary");
     obj1.free();
     return gFalse;
@@ -3207,7 +3216,7 @@ GfxFunctionShading::~GfxFunctionShading() {
   }
 }
 
-GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, Gfx *gfx) {
+GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, OutputDev *out) {
   GfxFunctionShading *shading;
   double x0A, y0A, x1A, y1A;
   double matrixA[6];
@@ -3275,7 +3284,7 @@ GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, Gfx *gfx) {
 
   shading = new GfxFunctionShading(x0A, y0A, x1A, y1A, matrixA,
 				   funcsA, nFuncsA);
-  if (!shading->init(dict, gfx)) {
+  if (!shading->init(dict, out)) {
     delete shading;
     return NULL;
   }
@@ -3526,7 +3535,7 @@ GfxAxialShading::GfxAxialShading(GfxAxialShading *shading):
 GfxAxialShading::~GfxAxialShading() {
 }
 
-GfxAxialShading *GfxAxialShading::parse(Dict *dict, Gfx *gfx) {
+GfxAxialShading *GfxAxialShading::parse(Dict *dict, OutputDev *out) {
   GfxAxialShading *shading;
   double x0A, y0A, x1A, y1A;
   double t0A, t1A;
@@ -3623,7 +3632,7 @@ GfxAxialShading *GfxAxialShading::parse(Dict *dict, Gfx *gfx) {
 
   shading = new GfxAxialShading(x0A, y0A, x1A, y1A, t0A, t1A,
 				funcsA, nFuncsA, extend0A, extend1A);
-  if (!shading->init(dict, gfx)) {
+  if (!shading->init(dict, out)) {
     delete shading;
     return NULL;
   }
@@ -3734,7 +3743,7 @@ GfxRadialShading::GfxRadialShading(GfxRadialShading *shading):
 GfxRadialShading::~GfxRadialShading() {
 }
 
-GfxRadialShading *GfxRadialShading::parse(Dict *dict, Gfx *gfx) {
+GfxRadialShading *GfxRadialShading::parse(Dict *dict, OutputDev *out) {
   GfxRadialShading *shading;
   double x0A, y0A, r0A, x1A, y1A, r1A;
   double t0A, t1A;
@@ -3813,7 +3822,7 @@ GfxRadialShading *GfxRadialShading::parse(Dict *dict, Gfx *gfx) {
 
   shading = new GfxRadialShading(x0A, y0A, r0A, x1A, y1A, r1A, t0A, t1A,
 				 funcsA, nFuncsA, extend0A, extend1A);
-  if (!shading->init(dict, gfx)) {
+  if (!shading->init(dict, out)) {
     delete shading;
     return NULL;
   }
@@ -4257,7 +4266,7 @@ GfxGouraudTriangleShading::~GfxGouraudTriangleShading() {
 GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(int typeA,
 							    Dict *dict,
 							    Stream *str,
-							    Gfx *gfx) {
+							    OutputDev *out) {
   GfxGouraudTriangleShading *shading;
   Function *funcsA[gfxColorMaxComps];
   int nFuncsA;
@@ -4453,7 +4462,7 @@ GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(int typeA,
   shading = new GfxGouraudTriangleShading(typeA, verticesA, nVerticesA,
 					  trianglesA, nTrianglesA,
 					  funcsA, nFuncsA);
-  if (!shading->init(dict, gfx)) {
+  if (!shading->init(dict, out)) {
     delete shading;
     return NULL;
   }
@@ -4600,7 +4609,7 @@ GfxPatchMeshShading::~GfxPatchMeshShading() {
 }
 
 GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
-						Stream *str, Gfx *gfx) {
+						Stream *str, OutputDev *out) {
   GfxPatchMeshShading *shading;
   Function *funcsA[gfxColorMaxComps];
   int nFuncsA;
@@ -5124,7 +5133,7 @@ GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
 
   shading = new GfxPatchMeshShading(typeA, patchesA, nPatchesA,
 				    funcsA, nFuncsA);
-  if (!shading->init(dict, gfx)) {
+  if (!shading->init(dict, out)) {
     delete shading;
     return NULL;
   }
@@ -6160,7 +6169,7 @@ void GfxState::concatCTM(double a, double b, double c,
   ctm[5] = e * b1 + f * d1 + ctm[5];
 }
 
-void GfxState::shiftCTM(double tx, double ty) {
+void GfxState::shiftCTMAndClip(double tx, double ty) {
   ctm[4] += tx;
   ctm[5] += ty;
   clipXMin += tx;
diff --git a/poppler/GfxState.h b/poppler/GfxState.h
index f2ce6b20..2f3efcfb 100644
--- a/poppler/GfxState.h
+++ b/poppler/GfxState.h
@@ -17,10 +17,11 @@
 // Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2006 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
 // Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
 //
 // 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
@@ -49,6 +50,7 @@ class PDFRectangle;
 class GfxShading;
 class PopplerCache;
 class GooList;
+class OutputDev;
 
 class Matrix {
 public:
@@ -197,7 +199,7 @@ public:
   virtual GfxColorSpaceMode getMode() = 0;
 
   // Construct a color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Object *csObj, Gfx *gfx, int recursion = 0);
+  static GfxColorSpace *parse(Object *csObj, OutputDev *out, int recursion = 0);
 
   // Convert to gray, RGB, or CMYK.
   virtual void getGray(GfxColor *color, GfxGray *gray) = 0;
@@ -491,7 +493,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csICCBased; }
 
   // Construct an ICCBased color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, Gfx *gfx, int recursion);
+  static GfxColorSpace *parse(Array *arr, OutputDev *out, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -537,7 +539,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csIndexed; }
 
   // Construct an Indexed color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, Gfx *gfx, int recursion);
+  static GfxColorSpace *parse(Array *arr, OutputDev *out, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -586,7 +588,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csSeparation; }
 
   // Construct a Separation color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, Gfx *gfx, int recursion);
+  static GfxColorSpace *parse(Array *arr, OutputDev *out, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -631,7 +633,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csDeviceN; }
 
   // Construct a DeviceN color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, Gfx *gfx, int recursion);
+  static GfxColorSpace *parse(Array *arr, OutputDev *out, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -678,7 +680,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csPattern; }
 
   // Construct a Pattern color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, Gfx *gfx, int recursion);
+  static GfxColorSpace *parse(Array *arr, OutputDev *out, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -707,7 +709,7 @@ public:
   GfxPattern(int typeA);
   virtual ~GfxPattern();
 
-  static GfxPattern *parse(Object *obj, Gfx *gfx);
+  static GfxPattern *parse(Object *obj, OutputDev *out);
 
   virtual GfxPattern *copy() = 0;
 
@@ -763,7 +765,7 @@ private:
 class GfxShadingPattern: public GfxPattern {
 public:
 
-  static GfxShadingPattern *parse(Object *patObj, Gfx *gfx);
+  static GfxShadingPattern *parse(Object *patObj, OutputDev *out);
   virtual ~GfxShadingPattern();
 
   virtual GfxPattern *copy();
@@ -790,7 +792,7 @@ public:
   GfxShading(GfxShading *shading);
   virtual ~GfxShading();
 
-  static GfxShading *parse(Object *obj, Gfx *gfx);
+  static GfxShading *parse(Object *obj, OutputDev *out);
 
   virtual GfxShading *copy() = 0;
 
@@ -804,7 +806,7 @@ public:
 
 protected:
 
-  GBool init(Dict *dict, Gfx *gfx);
+  GBool init(Dict *dict, OutputDev *out);
 
   int type;
   GfxColorSpace *colorSpace;
@@ -873,7 +875,7 @@ public:
   GfxFunctionShading(GfxFunctionShading *shading);
   virtual ~GfxFunctionShading();
 
-  static GfxFunctionShading *parse(Dict *dict, Gfx *gfx);
+  static GfxFunctionShading *parse(Dict *dict, OutputDev *out);
 
   virtual GfxShading *copy();
 
@@ -907,7 +909,7 @@ public:
   GfxAxialShading(GfxAxialShading *shading);
   virtual ~GfxAxialShading();
 
-  static GfxAxialShading *parse(Dict *dict, Gfx *gfx);
+  static GfxAxialShading *parse(Dict *dict, OutputDev *out);
 
   virtual GfxShading *copy();
 
@@ -940,7 +942,7 @@ public:
   GfxRadialShading(GfxRadialShading *shading);
   virtual ~GfxRadialShading();
 
-  static GfxRadialShading *parse(Dict *dict, Gfx *gfx);
+  static GfxRadialShading *parse(Dict *dict, OutputDev *out);
 
   virtual GfxShading *copy();
 
@@ -978,7 +980,7 @@ public:
   GfxGouraudTriangleShading(GfxGouraudTriangleShading *shading);
   virtual ~GfxGouraudTriangleShading();
 
-  static GfxGouraudTriangleShading *parse(int typeA, Dict *dict, Stream *str, Gfx *gfx);
+  static GfxGouraudTriangleShading *parse(int typeA, Dict *dict, Stream *str, OutputDev *out);
 
   virtual GfxShading *copy();
 
@@ -1064,7 +1066,7 @@ public:
   GfxPatchMeshShading(GfxPatchMeshShading *shading);
   virtual ~GfxPatchMeshShading();
 
-  static GfxPatchMeshShading *parse(int typeA, Dict *dict, Stream *str, Gfx *gfx);
+  static GfxPatchMeshShading *parse(int typeA, Dict *dict, Stream *str, OutputDev *out);
 
   virtual GfxShading *copy();
 
@@ -1443,7 +1445,7 @@ public:
 	      double d, double e, double f);
   void concatCTM(double a, double b, double c,
 		 double d, double e, double f);
-  void shiftCTM(double tx, double ty);
+  void shiftCTMAndClip(double tx, double ty);
   void setFillColorSpace(GfxColorSpace *colorSpace);
   void setStrokeColorSpace(GfxColorSpace *colorSpace);
   void setFillColor(GfxColor *color) { fillColor = *color; }
diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index b76e1564..084b49bf 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -2,10 +2,11 @@
    but mostly based on xpdf code.
    
    // Copyright (C) 2010, 2012 Hib Eris <hib@hiberis.nl>
-   // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+   // Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
    // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
    // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
    // Copyright (C) 2012 Mark Brand <mabrand@mabrand.nl>
+   // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 
 TODO: instead of a fixed mapping defined in displayFontTab, it could
 scan the whole fonts directory, parse TTF files and build font
@@ -408,9 +409,7 @@ void GlobalParams::setupBaseFonts(char * dir)
 {
     const char *dataRoot = popplerDataDir ? popplerDataDir : POPPLER_DATADIR;
     GooString *fileName = NULL;
-    struct stat buf;
-    FILE *file;
-    int size = 0;
+    GooFile *file;
 
     if (baseFontsInitialized)
         return;
@@ -453,15 +452,9 @@ void GlobalParams::setupBaseFonts(char * dir)
 
     fileName = new GooString(dataRoot);
     fileName->append("/cidfmap");
-    if (stat(fileName->getCString(), &buf) == 0) {
-      size = buf.st_size;
-    }
+
     // try to open file
-#ifdef VMS
-    file = fopen(fileName->getCString(), "rb", "ctx=stm");
-#else
-    file = fopen(fileName->getCString(), "rb");
-#endif
+    file = GooFile::open(fileName);
 
     if (file != NULL) {
       Parser *parser;
@@ -470,7 +463,7 @@ void GlobalParams::setupBaseFonts(char * dir)
       obj1.initNull();
       parser = new Parser(NULL,
 	      new Lexer(NULL,
-	      new FileStream(file, 0, gFalse, size, &obj1)),
+	      new FileStream(file, 0, gFalse, file->size(), &obj1)),
 	      gTrue);
       obj1.free();
       parser->getObj(&obj1);
@@ -498,7 +491,7 @@ void GlobalParams::setupBaseFonts(char * dir)
 	  parser->getObj(&obj1);
 	}
       }
-      fclose(file);
+      delete file;
       delete parser;
     }
 }
diff --git a/poppler/Hints.cc b/poppler/Hints.cc
index 13bcc902..49e201da 100644
--- a/poppler/Hints.cc
+++ b/poppler/Hints.cc
@@ -5,8 +5,9 @@
 // This file is licensed under the GPLv2 or later
 //
 // Copyright 2010, 2012 Hib Eris <hib@hiberis.nl>
-// Copyright 2010, 2011 Albert Astals Cid <aacid@kde.org>
-// Copyright 2010 Pino Toscano <pino@kde.org>
+// Copyright 2010, 2011, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright 2010, 2013 Pino Toscano <pino@kde.org>
+// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 //========================================================================
 
@@ -51,12 +52,12 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security
   pageObjectNum = (int *) gmallocn_checkoverflow(nPages, sizeof(int));
   xRefOffset = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
   pageLength = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
-  pageOffset = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
+  pageOffset = (Goffset *) gmallocn_checkoverflow(nPages, sizeof(Goffset));
   numSharedObject = (Guint *) gmallocn_checkoverflow(nPages, sizeof(Guint));
   sharedObjectId = (Guint **) gmallocn_checkoverflow(nPages, sizeof(Guint*));
   if (!nObjects || !pageObjectNum || !xRefOffset || !pageLength || !pageOffset ||
       !numSharedObject || !sharedObjectId) {
-    error(errSyntaxWarning, -1, "Failed to allocate memory for hints tabel");
+    error(errSyntaxWarning, -1, "Failed to allocate memory for hints table");
     nPages = 0;
   }
 
@@ -282,7 +283,8 @@ void Hints::readSharedObjectsTable(Stream *str)
   }
   if ((!nSharedGroupsFirst) || (nSharedGroupsFirst > nSharedGroups)) {
      error(errSyntaxWarning, -1, "Invalid number of first page shared object groups");
-     nSharedGroupsFirst = nSharedGroups;
+     nSharedGroups = 0;
+     return;
   }
 
   groupLength = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint));
@@ -344,7 +346,7 @@ void Hints::readSharedObjectsTable(Stream *str)
   }
 }
 
-Guint Hints::getPageOffset(int page)
+Goffset Hints::getPageOffset(int page)
 {
   if ((page < 1) || (page > nPages)) return 0;
 
diff --git a/poppler/Hints.h b/poppler/Hints.h
index d598e796..f5225f9f 100644
--- a/poppler/Hints.h
+++ b/poppler/Hints.h
@@ -6,6 +6,7 @@
 //
 // Copyright 2010 Hib Eris <hib@hiberis.nl>
 // Copyright 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 //========================================================================
 
@@ -33,7 +34,7 @@ public:
   ~Hints();
 
   int getPageObjectNum(int page);
-  Guint getPageOffset(int page);
+  Goffset getPageOffset(int page);
   std::vector<ByteRange>* getPageRanges(int page);
 
 private:
@@ -54,7 +55,7 @@ private:
   int nPages;
   int pageFirst;
   int pageObjectFirst;
-  Guint pageOffsetFirst;
+  Goffset pageOffsetFirst;
   Guint pageEndFirst;
   int objectNumberFirst;
 
@@ -76,7 +77,7 @@ private:
   int *pageObjectNum;
   Guint *xRefOffset;
   Guint *pageLength;
-  Guint *pageOffset;
+  Goffset *pageOffset;
   Guint *numSharedObject;
   Guint **sharedObjectId;
 
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index afba8c61..12de50e1 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -20,6 +20,7 @@
 // Copyright (C) 2011 Edward Jiang <ejiang@google.com>
 // Copyright (C) 2012 William Bader <williambader@hotmail.com>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -1284,7 +1285,7 @@ int JBIG2Stream::lookChar() {
   return EOF;
 }
 
-int JBIG2Stream::getPos() {
+Goffset JBIG2Stream::getPos() {
   if (pageBitmap == NULL) {
     return 0;
   }
@@ -1320,7 +1321,7 @@ void JBIG2Stream::readSegments() {
   Guint segNum, segFlags, segType, page, segLength;
   Guint refFlags, nRefSegs;
   Guint *refSegs;
-  int segDataPos;
+  Goffset segDataPos;
   int c1, c2, c3;
   Guint i;
 
@@ -1483,7 +1484,7 @@ void JBIG2Stream::readSegments() {
 
     if (segLength != 0xffffffff) {
 
-      int segExtraBytes = segDataPos + segLength - curStr->getPos();
+      Goffset segExtraBytes = segDataPos + segLength - curStr->getPos();
       if (segExtraBytes > 0) {
 
 	// If we didn't read all of the bytes in the segment data,
@@ -1501,7 +1502,7 @@ void JBIG2Stream::readSegments() {
 	// hopefully we're not doing this much
 	
 	int trash;
-	for (int i = segExtraBytes; i > 0; i--) {
+	for (Goffset i = segExtraBytes; i > 0; i--) {
 	  readByte(&trash);
 	}
 	
diff --git a/poppler/JBIG2Stream.h b/poppler/JBIG2Stream.h
index c518aa5e..be1b3bd7 100644
--- a/poppler/JBIG2Stream.h
+++ b/poppler/JBIG2Stream.h
@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2009 David Benjamin <davidben@mit.edu>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -50,7 +51,7 @@ public:
   virtual StreamKind getKind() { return strJBIG2; }
   virtual void reset();
   virtual void close();
-  virtual int getPos();
+  virtual Goffset getPos();
   virtual int getChar();
   virtual int lookChar();
   virtual GooString *getPSFilter(int psLevel, const char *indent);
diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc
index e2fd8086..703d471c 100644
--- a/poppler/JPEG2000Stream.cc
+++ b/poppler/JPEG2000Stream.cc
@@ -6,6 +6,7 @@
 //
 // Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
+// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // Licensed under GPLv2 or later
 //
@@ -46,7 +47,7 @@ void JPXStream::close() {
   }
 }
 
-int JPXStream::getPos() {
+Goffset JPXStream::getPos() {
   return counter * ncomps + ccounter;
 }
 
diff --git a/poppler/JPEG2000Stream.h b/poppler/JPEG2000Stream.h
index 5aed32d4..3feccbef 100644
--- a/poppler/JPEG2000Stream.h
+++ b/poppler/JPEG2000Stream.h
@@ -6,6 +6,7 @@
 //
 // Copyright 2008, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
+// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // Licensed under GPLv2 or later
 //
@@ -29,7 +30,7 @@ public:
   virtual StreamKind getKind() { return strJPX; }
   virtual void reset();
   virtual void close();
-  virtual int getPos();
+  virtual Goffset getPos();
   virtual int getChar();
   virtual int lookChar();
   virtual GooString *getPSFilter(int psLevel, const char *indent);
diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
index 01b730bd..bd7546f8 100644
--- a/poppler/Lexer.cc
+++ b/poppler/Lexer.cc
@@ -16,7 +16,8 @@
 // Copyright (C) 2006-2010, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2012, 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -62,6 +63,7 @@ static const char specialChars[256] = {
 };
 
 static const int IntegerSafeLimit = (INT_MAX - 9) / 10;
+static const long long LongLongSafeLimit = (LLONG_MAX - 9) / 10;
 
 //------------------------------------------------------------------------
 // Lexer
@@ -155,10 +157,10 @@ int Lexer::lookChar() {
 Object *Lexer::getObj(Object *obj, int objNum) {
   char *p;
   int c, c2;
-  GBool comment, neg, done, overflownInteger, overflownUnsignedInteger;
+  GBool comment, neg, done, overflownInteger, overflownLongLong;
   int numParen;
   int xi;
-  unsigned int xui = 0;
+  long long xll = 0;
   double xf = 0, scale;
   GooString *s;
   int n, m;
@@ -187,7 +189,7 @@ Object *Lexer::getObj(Object *obj, int objNum) {
   case '5': case '6': case '7': case '8': case '9':
   case '+': case '-': case '.':
     overflownInteger = gFalse;
-    overflownUnsignedInteger = gFalse;
+    overflownLongLong = gFalse;
     neg = gFalse;
     xi = 0;
     if (c == '-') {
@@ -201,23 +203,21 @@ Object *Lexer::getObj(Object *obj, int objNum) {
       c = lookChar();
       if (isdigit(c)) {
 	getChar();
-	if (unlikely(overflownInteger)) {
-	  if (overflownUnsignedInteger) {
-	    xf = xf * 10.0 + (c - '0');
+	if (unlikely(overflownLongLong)) {
+	  xf = xf * 10.0 + (c - '0');
+	} else if (unlikely (overflownInteger)) {
+	  if (unlikely(xll > LongLongSafeLimit) &&
+	      (xll > (LLONG_MAX - (c - '0')) / 10.0)) {
+	    overflownLongLong = gTrue;
+	    xf = xll * 10.0 + (c - '0');
 	  } else {
-	    overflownUnsignedInteger = gTrue;
-	    xf = xui * 10.0 + (c - '0');
+	    xll = xll * 10 + (c - '0');
 	  }
 	} else {
 	  if (unlikely(xi > IntegerSafeLimit) &&
 	      (xi > (INT_MAX - (c - '0')) / 10.0)) {
 	    overflownInteger = gTrue;
-	    if (xi > (UINT_MAX - (c - '0')) / 10.0) {
-	      overflownUnsignedInteger = gTrue;
-	      xf = xi * 10.0 + (c - '0');
-	    } else {
-	      xui = xi * 10.0 + (c - '0');
-	    }
+	    xll = xi * 10LL + (c - '0');
 	  } else {
 	    xi = xi * 10 + (c - '0');
 	  }
@@ -231,22 +231,17 @@ Object *Lexer::getObj(Object *obj, int objNum) {
     }
     if (neg) {
       xi = -xi;
+      xll = -xll;
       xf = -xf;
     }
     if (unlikely(overflownInteger)) {
-      if (overflownUnsignedInteger) {
+      if (overflownLongLong) {
         obj->initReal(xf);
       } else {
-        if (neg) {
-          if (xui-1 == INT_MAX) {
-            obj->initInt(INT_MIN);
-          } else {
-            xf = xui;
-            xf = -xf;
-            obj->initReal(xf);
-          }
+        if (unlikely(xll == INT_MIN)) {
+          obj->initInt(INT_MIN);
         } else {
-          obj->initUint(xui);
+          obj->initInt64(xll);
         }
       }
     } else {
@@ -256,8 +251,8 @@ Object *Lexer::getObj(Object *obj, int objNum) {
   doReal:
     if (likely(!overflownInteger)) {
       xf = xi;
-    } else if (!overflownUnsignedInteger) {
-      xf = xui;
+    } else if (!overflownLongLong) {
+      xf = xll;
     }
     scale = 0.1;
     while (1) {
@@ -586,6 +581,48 @@ Object *Lexer::getObj(Object *obj, int objNum) {
   return obj;
 }
 
+Object *Lexer::getObj(Object *obj, const char *cmdA) {
+  char *p;
+  int c;
+  GBool comment;
+  int n;
+
+  // skip whitespace and comments
+  comment = gFalse;
+  const char *cmd1 = tokBuf;
+  *tokBuf = 0;
+  while (strcmp(cmdA, cmd1)) {
+    while (1) {
+      if ((c = getChar()) == EOF) {
+        return obj->initEOF();
+      }
+      if (comment) {
+        if (c == '\r' || c == '\n') {
+          comment = gFalse;
+        }
+      } else if (c == '%') {
+        comment = gTrue;
+      } else if (specialChars[c] != 1) {
+        break;
+      }
+    }
+    p = tokBuf;
+    *p++ = c;
+    n = 1;
+    while ((c = lookChar()) != EOF && specialChars[c] == 0) {
+      getChar();
+      if (++n == tokBufSize) {
+        break;
+      }
+      *p++ = c;
+    }
+    *p = '\0';
+  }
+  obj->initCmd(tokBuf);
+  
+  return obj;
+}
+
 void Lexer::skipToNextLine() {
   int c;
 
diff --git a/poppler/Lexer.h b/poppler/Lexer.h
index 284479df..d9c23dc8 100644
--- a/poppler/Lexer.h
+++ b/poppler/Lexer.h
@@ -15,6 +15,8 @@
 //
 // Copyright (C) 2006, 2007, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -55,6 +57,7 @@ public:
 
   // Get the next object from the input stream.
   Object *getObj(Object *obj, int objNum = -1);
+  Object *getObj(Object *obj, const char *cmdA);
 
   // Skip to the beginning of the next line in the input stream.
   void skipToNextLine();
@@ -67,12 +70,12 @@ public:
     { return curStr.isStream() ? curStr.getStream() : (Stream *)NULL; }
 
   // Get current position in file.  This is only used for error
-  // messages, so it returns an int instead of a Guint.
-  int getPos()
-    { return curStr.isStream() ? (int)curStr.streamGetPos() : -1; }
+  // messages.
+  Goffset getPos()
+    { return curStr.isStream() ? curStr.streamGetPos() : -1; }
 
   // Set position in file.
-  void setPos(Guint pos, int dir = 0)
+  void setPos(Goffset pos, int dir = 0)
     { if (curStr.isStream()) curStr.streamSetPos(pos, dir); }
 
   // Returns true if <c> is a whitespace character.
diff --git a/poppler/Link.cc b/poppler/Link.cc
index b5b2bd3a..20184d13 100644
--- a/poppler/Link.cc
+++ b/poppler/Link.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2006, 2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
-// Copyright (C) 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008-2010, 2012, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2012 Tobias Koening <tobias.koenig@kdab.com>
@@ -220,8 +220,8 @@ LinkDest::LinkDest(Array *a) {
       if (obj2.isNull()) {
 	changeZoom = gFalse;
       } else if (obj2.isNum()) {
-	changeZoom = gTrue;
 	zoom = obj2.getNum();
+	changeZoom = (zoom == 0) ? gFalse : gTrue;
       } else {
 	error(errSyntaxWarning, -1, "Bad annotation destination position");
 	goto err1;
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index c25ab03b..aa7c9242 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -15,24 +15,6 @@ splash_libs =					\
 
 endif
 
-if BUILD_POPPLER_QT4
-
-poppler_arthur = libpoppler-arthur.la
-
-libpoppler_arthur_la_SOURCES =			\
-	ArthurOutputDev.h			\
-	ArthurOutputDev.cc
-
-arthur_includes =				\
-	$(POPPLER_QT4_CFLAGS)
-
-arthur_libs =					\
-	$(POPPLER_QT4_LIBS)
-
-endif
-
-
-
 if BUILD_CAIRO_OUTPUT
 
 poppler_cairo = libpoppler-cairo.la
@@ -144,7 +126,6 @@ INCLUDES =					\
 	$(cms_includes)				\
 	$(splash_includes)			\
 	$(cairo_includes)			\
-	$(arthur_includes)			\
 	$(libjpeg_includes)			\
 	$(libtiff_includes)			\
 	$(libjpeg2000_includes)			\
@@ -155,8 +136,7 @@ INCLUDES =					\
 
 lib_LTLIBRARIES = libpoppler.la
 
-noinst_LTLIBRARIES = $(poppler_cairo)		\
-	$(poppler_arthur)
+noinst_LTLIBRARIES = $(poppler_cairo)
 
 CFLAGS+=$(PTHREAD_CFLAGS)
 CXXFLAGS+=$(PTHREAD_CFLAGS)
@@ -177,7 +157,7 @@ libpoppler_la_LIBADD =				\
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 43:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
@@ -262,7 +242,6 @@ endif
 libpoppler_la_SOURCES =		\
 	$(splash_sources)	\
 	$(cairo_sources)	\
-	$(arthur_sources)	\
 	$(libjpeg_sources)	\
 	$(zlib_sources)		\
 	$(libjpeg2000_sources)	\
@@ -330,4 +309,5 @@ libpoppler_la_SOURCES =		\
 	XpdfPluginAPI.cc
 
 EXTRA_DIST = gen-unicode-tables.py	\
-             GlobalParamsWin.cc
+             GlobalParamsWin.cc         \
+             PageLabelInfo_p.h
diff --git a/poppler/Makefile.in b/poppler/Makefile.in
index be8bae90..f566ad94 100644
--- a/poppler/Makefile.in
+++ b/poppler/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,11 +80,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = poppler
-DIST_COMMON = $(am__poppler_include_HEADERS_DIST) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/poppler-config.h.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/poppler-config.h.in $(top_srcdir)/depcomp \
+	$(am__poppler_include_HEADERS_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -101,16 +128,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(poppler_includedir)" \
 	"$(DESTDIR)$(poppler_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-libpoppler_arthur_la_LIBADD =
-am__libpoppler_arthur_la_SOURCES_DIST = ArthurOutputDev.h \
-	ArthurOutputDev.cc
-@BUILD_POPPLER_QT4_TRUE@am_libpoppler_arthur_la_OBJECTS =  \
-@BUILD_POPPLER_QT4_TRUE@	ArthurOutputDev.lo
-libpoppler_arthur_la_OBJECTS = $(am_libpoppler_arthur_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-@BUILD_POPPLER_QT4_TRUE@am_libpoppler_arthur_la_rpath =
 libpoppler_cairo_la_LIBADD =
 am__libpoppler_cairo_la_SOURCES_DIST = CairoFontEngine.cc \
 	CairoFontEngine.h CairoOutputDev.cc CairoOutputDev.h \
@@ -119,6 +136,10 @@ am__libpoppler_cairo_la_SOURCES_DIST = CairoFontEngine.cc \
 @BUILD_CAIRO_OUTPUT_TRUE@	CairoFontEngine.lo CairoOutputDev.lo \
 @BUILD_CAIRO_OUTPUT_TRUE@	CairoRescaleBox.lo
 libpoppler_cairo_la_OBJECTS = $(am_libpoppler_cairo_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 @BUILD_CAIRO_OUTPUT_TRUE@am_libpoppler_cairo_la_rpath =
 am__DEPENDENCIES_1 =
 @USE_CMS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@@ -185,6 +206,18 @@ libpoppler_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(libpoppler_la_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -197,17 +230,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -216,21 +248,18 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libpoppler_arthur_la_SOURCES) \
-	$(libpoppler_cairo_la_SOURCES) $(libpoppler_la_SOURCES)
-DIST_SOURCES = $(am__libpoppler_arthur_la_SOURCES_DIST) \
-	$(am__libpoppler_cairo_la_SOURCES_DIST) \
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libpoppler_cairo_la_SOURCES) $(libpoppler_la_SOURCES)
+DIST_SOURCES = $(am__libpoppler_cairo_la_SOURCES_DIST) \
 	$(am__libpoppler_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -256,6 +285,24 @@ am__poppler_include_HEADERS_DIST = SplashOutputDev.h CurlCachedFile.h \
 	NameToUnicodeTable.h PSOutputDev.h TextOutputDev.h \
 	SecurityHandler.h UTF.h UTF8.h XpdfPluginAPI.h Sound.h
 HEADERS = $(nodist_poppler_include_HEADERS) $(poppler_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)poppler-config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -351,6 +398,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -385,10 +435,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -410,13 +466,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -472,17 +528,6 @@ win32_libs = @win32_libs@
 @BUILD_SPLASH_OUTPUT_TRUE@	$(SPLASH_LIBS)				\
 @BUILD_SPLASH_OUTPUT_TRUE@	$(top_builddir)/splash/libsplash.la
 
-@BUILD_POPPLER_QT4_TRUE@poppler_arthur = libpoppler-arthur.la
-@BUILD_POPPLER_QT4_TRUE@libpoppler_arthur_la_SOURCES = \
-@BUILD_POPPLER_QT4_TRUE@	ArthurOutputDev.h			\
-@BUILD_POPPLER_QT4_TRUE@	ArthurOutputDev.cc
-
-@BUILD_POPPLER_QT4_TRUE@arthur_includes = \
-@BUILD_POPPLER_QT4_TRUE@	$(POPPLER_QT4_CFLAGS)
-
-@BUILD_POPPLER_QT4_TRUE@arthur_libs = \
-@BUILD_POPPLER_QT4_TRUE@	$(POPPLER_QT4_LIBS)
-
 @BUILD_CAIRO_OUTPUT_TRUE@poppler_cairo = libpoppler-cairo.la
 @BUILD_CAIRO_OUTPUT_TRUE@cairo_includes = \
 @BUILD_CAIRO_OUTPUT_TRUE@	$(CAIRO_CFLAGS)
@@ -563,7 +608,6 @@ INCLUDES = \
 	$(cms_includes)				\
 	$(splash_includes)			\
 	$(cairo_includes)			\
-	$(arthur_includes)			\
 	$(libjpeg_includes)			\
 	$(libtiff_includes)			\
 	$(libjpeg2000_includes)			\
@@ -573,9 +617,7 @@ INCLUDES = \
 	$(FONTCONFIG_CFLAGS)
 
 lib_LTLIBRARIES = libpoppler.la
-noinst_LTLIBRARIES = $(poppler_cairo)		\
-	$(poppler_arthur)
-
+noinst_LTLIBRARIES = $(poppler_cairo)
 libpoppler_la_LIBADD = \
 	$(top_builddir)/goo/libgoo.la		\
 	$(top_builddir)/fofi/libfofi.la		\
@@ -592,7 +634,7 @@ libpoppler_la_LIBADD = \
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 43:0:0 @create_shared_lib@ @auto_import_flags@
 @ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler
 @ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \
 @ENABLE_XPDF_HEADERS_TRUE@	$(splash_headers)	\
@@ -672,7 +714,6 @@ libpoppler_la_LDFLAGS = -version-info 34:0:0 @create_shared_lib@ @auto_import_fl
 libpoppler_la_SOURCES = \
 	$(splash_sources)	\
 	$(cairo_sources)	\
-	$(arthur_sources)	\
 	$(libjpeg_sources)	\
 	$(zlib_sources)		\
 	$(libjpeg2000_sources)	\
@@ -740,7 +781,8 @@ libpoppler_la_SOURCES = \
 	XpdfPluginAPI.cc
 
 EXTRA_DIST = gen-unicode-tables.py	\
-             GlobalParamsWin.cc
+             GlobalParamsWin.cc         \
+             PageLabelInfo_p.h
 
 all: poppler-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -785,13 +827,10 @@ poppler-config.h: stamp-h2
 stamp-h2: $(srcdir)/poppler-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status poppler/poppler-config.h
-$(srcdir)/poppler-config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h2
-	touch $@
 
 distclean-hdr:
 	-rm -f poppler-config.h stamp-h2
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -818,25 +857,29 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libpoppler-arthur.la: $(libpoppler_arthur_la_OBJECTS) $(libpoppler_arthur_la_DEPENDENCIES) $(EXTRA_libpoppler_arthur_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(CXXLINK) $(am_libpoppler_arthur_la_rpath) $(libpoppler_arthur_la_OBJECTS) $(libpoppler_arthur_la_LIBADD) $(LIBS)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libpoppler-cairo.la: $(libpoppler_cairo_la_OBJECTS) $(libpoppler_cairo_la_DEPENDENCIES) $(EXTRA_libpoppler_cairo_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(CXXLINK) $(am_libpoppler_cairo_la_rpath) $(libpoppler_cairo_la_OBJECTS) $(libpoppler_cairo_la_LIBADD) $(LIBS)
+
 libpoppler.la: $(libpoppler_la_OBJECTS) $(libpoppler_la_DEPENDENCIES) $(EXTRA_libpoppler_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(libpoppler_la_LINK) -rpath $(libdir) $(libpoppler_la_OBJECTS) $(libpoppler_la_LIBADD) $(LIBS)
 
@@ -848,7 +891,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Annot.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Array.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArthurOutputDev.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFont.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BuiltinFontTables.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CMap.Plo@am__quote@
@@ -1008,26 +1050,15 @@ uninstall-poppler_includeHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(poppler_includedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) poppler-config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) poppler-config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1039,15 +1070,11 @@ TAGS:  $(HEADERS) $(SOURCES) poppler-config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) poppler-config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) poppler-config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1056,6 +1083,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1203,20 +1245,21 @@ uninstall-am: uninstall-libLTLIBRARIES \
 
 .MAKE: all install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
-	ctags distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-nodist_poppler_includeHEADERS install-pdf \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man \
+	install-nodist_poppler_includeHEADERS install-pdf \
 	install-pdf-am install-poppler_includeHEADERS install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-nodist_poppler_includeHEADERS \
 	uninstall-poppler_includeHEADERS
diff --git a/poppler/Object.cc b/poppler/Object.cc
index 1963b7f8..d06bb39f 100644
--- a/poppler/Object.cc
+++ b/poppler/Object.cc
@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2008, 2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -53,7 +54,7 @@ static const char *objTypeNames[numObjTypes] = {
   "error",
   "eof",
   "none",
-  "unsigned integer"
+  "integer64"
 };
 
 #ifdef DEBUG_MEM
@@ -224,8 +225,8 @@ void Object::print(FILE *f) {
   case objNone:
     fprintf(f, "<none>");
     break;
-  case objUint:
-    fprintf(f, "%u", uintg);
+  case objInt64:
+    fprintf(f, "%lld", int64g);
     break;
   }
 }
diff --git a/poppler/Object.h b/poppler/Object.h
index c885d739..1b123549 100644
--- a/poppler/Object.h
+++ b/poppler/Object.h
@@ -18,6 +18,8 @@
 // Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Jakub Wilk <ubanus@users.sf.net>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -47,10 +49,10 @@
         abort(); \
     }
 
-#define OBJECT_2TYPES_CHECK(wanted_type1, wanted_type2) \
-    if (unlikely(type != wanted_type1) && unlikely(type != wanted_type2)) { \
+#define OBJECT_3TYPES_CHECK(wanted_type1, wanted_type2, wanted_type3) \
+    if (unlikely(type != wanted_type1) && unlikely(type != wanted_type2) && unlikely(type != wanted_type3)) { \
         error(errInternal, 0, (char *) "Call to Object where the object was type {0:d}, " \
-                 "not the expected type {1:d} or {2:d}", type, wanted_type1, wanted_type2); \
+	      "not the expected type {1:d}, {2:d} or {3:d}", type, wanted_type1, wanted_type2, wanted_type3); \
         abort(); \
     }
 
@@ -94,7 +96,7 @@ enum ObjType {
   objNone,			// uninitialized object
 
   // poppler-only objects
-  objUint			// overflown integer that still fits in a unsigned integer
+  objInt64			// integer with at least 64-bits
 };
 
 #define numObjTypes 15		// total number of object types
@@ -143,8 +145,8 @@ public:
     { initObj(objError); return this; }
   Object *initEOF()
     { initObj(objEOF); return this; }
-  Object *initUint(unsigned int uintgA)
-    { initObj(objUint); uintg = uintgA; return this; }
+  Object *initInt64(long long int64gA)
+    { initObj(objInt64); int64g = int64gA; return this; }
 
   // Copy an object.
   Object *copy(Object *obj);
@@ -165,7 +167,7 @@ public:
   GBool isBool() { return type == objBool; }
   GBool isInt() { return type == objInt; }
   GBool isReal() { return type == objReal; }
-  GBool isNum() { return type == objInt || type == objReal; }
+  GBool isNum() { return type == objInt || type == objReal || type == objInt64; }
   GBool isString() { return type == objString; }
   GBool isName() { return type == objName; }
   GBool isNull() { return type == objNull; }
@@ -177,7 +179,7 @@ public:
   GBool isError() { return type == objError; }
   GBool isEOF() { return type == objEOF; }
   GBool isNone() { return type == objNone; }
-  GBool isUint() { return type == objUint; }
+  GBool isInt64() { return type == objInt64; }
 
   // Special type checking.
   GBool isName(const char *nameA)
@@ -191,7 +193,11 @@ public:
   GBool getBool() { OBJECT_TYPE_CHECK(objBool); return booln; }
   int getInt() { OBJECT_TYPE_CHECK(objInt); return intg; }
   double getReal() { OBJECT_TYPE_CHECK(objReal); return real; }
-  double getNum() { OBJECT_2TYPES_CHECK(objInt, objReal); return type == objInt ? (double)intg : real; }
+
+  // Note: integers larger than 2^53 can not be exactly represented by a double.
+  // Where the exact value of integers up to 2^63 is required, use isInt64()/getInt64().
+  double getNum() { OBJECT_3TYPES_CHECK(objInt, objInt64, objReal);
+    return type == objInt ? (double)intg : type == objInt64 ? (double)int64g : real; }
   GooString *getString() { OBJECT_TYPE_CHECK(objString); return string; }
   char *getName() { OBJECT_TYPE_CHECK(objName); return name; }
   Array *getArray() { OBJECT_TYPE_CHECK(objArray); return array; }
@@ -201,13 +207,13 @@ public:
   int getRefNum() { OBJECT_TYPE_CHECK(objRef); return ref.num; }
   int getRefGen() { OBJECT_TYPE_CHECK(objRef); return ref.gen; }
   char *getCmd() { OBJECT_TYPE_CHECK(objCmd); return cmd; }
-  unsigned int getUint() { OBJECT_TYPE_CHECK(objUint); return uintg; }
+  long long getInt64() { OBJECT_TYPE_CHECK(objInt64); return int64g; }
 
   // Array accessors.
   int arrayGetLength();
   void arrayAdd(Object *elem);
   void arrayRemove(int i);
-  Object *arrayGet(int i, Object *obj);
+  Object *arrayGet(int i, Object *obj, int recursion);
   Object *arrayGetNF(int i, Object *obj);
 
   // Dict accessors.
@@ -229,8 +235,8 @@ public:
   int streamGetChars(int nChars, Guchar *buffer);
   int streamLookChar();
   char *streamGetLine(char *buf, int size);
-  Guint streamGetPos();
-  void streamSetPos(Guint pos, int dir = 0);
+  Goffset streamGetPos();
+  void streamSetPos(Goffset pos, int dir = 0);
   Dict *streamGetDict();
 
   // Output.
@@ -246,7 +252,7 @@ private:
   union {			// value for each type:
     GBool booln;		//   boolean
     int intg;			//   integer
-    unsigned int uintg;		//   unsigned integer
+    long long int64g;           //   64-bit integer
     double real;		//   real
     GooString *string;		//   string
     char *name;			//   name
@@ -278,8 +284,8 @@ inline void Object::arrayAdd(Object *elem)
 inline void Object::arrayRemove(int i)
   { OBJECT_TYPE_CHECK(objArray); array->remove(i); }
 
-inline Object *Object::arrayGet(int i, Object *obj)
-  { OBJECT_TYPE_CHECK(objArray); return array->get(i, obj); }
+inline Object *Object::arrayGet(int i, Object *obj, int recursion = 0)
+  { OBJECT_TYPE_CHECK(objArray); return array->get(i, obj, recursion); }
 
 inline Object *Object::arrayGetNF(int i, Object *obj)
   { OBJECT_TYPE_CHECK(objArray); return array->getNF(i, obj); }
@@ -350,10 +356,10 @@ inline int Object::streamLookChar()
 inline char *Object::streamGetLine(char *buf, int size)
   { OBJECT_TYPE_CHECK(objStream); return stream->getLine(buf, size); }
 
-inline Guint Object::streamGetPos()
+inline Goffset Object::streamGetPos()
   { OBJECT_TYPE_CHECK(objStream); return stream->getPos(); }
 
-inline void Object::streamSetPos(Guint pos, int dir)
+inline void Object::streamSetPos(Goffset pos, int dir)
   { OBJECT_TYPE_CHECK(objStream); stream->setPos(pos, dir); }
 
 inline Dict *Object::streamGetDict()
diff --git a/poppler/OutputDev.cc b/poppler/OutputDev.cc
index 54580d0c..ee3cf5a3 100644
--- a/poppler/OutputDev.cc
+++ b/poppler/OutputDev.cc
@@ -17,7 +17,7 @@
 // Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
 // Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // To see a description of the changes please see the Changelog file that
@@ -193,3 +193,9 @@ GooHash *OutputDev::endProfile() {
   return profile;
 }
 
+#ifdef USE_CMS
+PopplerCache *OutputDev::getIccColorSpaceCache()
+{
+  return &iccColorSpaceCache;
+}
+#endif
diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
index f540d573..e8a7a479 100644
--- a/poppler/OutputDev.h
+++ b/poppler/OutputDev.h
@@ -17,9 +17,9 @@
 // Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2007, 2011 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2009-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 William Bader <williambader@hotmail.com>
@@ -40,6 +40,7 @@
 #include "goo/gtypes.h"
 #include "CharTypes.h"
 #include "Object.h"
+#include "PopplerCache.h"
 
 class Annot;
 class Dict;
@@ -72,7 +73,13 @@ class OutputDev {
 public:
 
   // Constructor.
-  OutputDev() { profileHash = NULL; }
+  OutputDev() 
+#ifdef USE_CMS
+ : iccColorSpaceCache(5)
+#endif
+  {
+      profileHash = NULL;
+  }
 
   // Destructor.
   virtual ~OutputDev() {}
@@ -137,7 +144,7 @@ public:
     { return gTrue; }
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state) {}
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref) {}
 
   // End a page.
   virtual void endPage() {}
@@ -243,7 +250,6 @@ public:
 			       CharCode /*code*/, Unicode * /*u*/, int /*uLen*/);
   virtual void endType3Char(GfxState * /*state*/) {}
   virtual void beginTextObject(GfxState * /*state*/) {}
-  virtual GBool deviceHasTextClip(GfxState * /*state*/) { return gFalse; }
   virtual void endTextObject(GfxState * /*state*/) {}
   virtual void incCharCount(int /*nChars*/) {}
   virtual void beginActualText(GfxState * /*state*/, GooString * /*text*/ ) {}
@@ -326,11 +332,19 @@ public:
   virtual void setVectorAntialias(GBool /*vaa*/) {}
 #endif
 
+#ifdef USE_CMS
+  PopplerCache *getIccColorSpaceCache();
+#endif
+
 private:
 
   double defCTM[6];		// default coordinate transform matrix
   double defICTM[6];		// inverse of default CTM
   GooHash *profileHash;
+
+#ifdef USE_CMS
+  PopplerCache iccColorSpaceCache;
+#endif
 };
 
 #endif
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index 0d78588c..c78d5ca5 100644
--- a/poppler/PDFDoc.cc
+++ b/poppler/PDFDoc.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2005, 2007-2009, 2011, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2009, 2011-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org>
 // Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -26,8 +26,10 @@
 // Copyright (C) 2010 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com>
 // Copyright (C) 2010 Philip Lorenz <lorenzph+freedesktop@gmail.com>
-// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 //
 // 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
@@ -54,6 +56,7 @@
 #include <sys/stat.h>
 #include "goo/gstrtod.h"
 #include "goo/GooString.h"
+#include "goo/gfile.h"
 #include "poppler-config.h"
 #include "GlobalParams.h"
 #include "Page.h"
@@ -75,6 +78,12 @@
 #include "PDFDoc.h"
 #include "Hints.h"
 
+#if MULTITHREADED
+#  define pdfdocLocker()   MutexLocker locker(&mutex)
+#else
+#  define pdfdocLocker()
+#endif
+
 //------------------------------------------------------------------------
 
 #define headerSearchSize 1024	// read this many bytes at beginning of
@@ -94,6 +103,9 @@
 
 void PDFDoc::init()
 {
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
   ok = gFalse;
   errCode = errNone;
   fileName = NULL;
@@ -106,7 +118,7 @@ void PDFDoc::init()
 #ifndef DISABLE_OUTLINE
   outline = NULL;
 #endif
-  startXRefPos = ~(Guint)0;
+  startXRefPos = -1;
   secHdlr = NULL;
   pageCache = NULL;
 }
@@ -119,7 +131,6 @@ PDFDoc::PDFDoc()
 PDFDoc::PDFDoc(GooString *fileNameA, GooString *ownerPassword,
 	       GooString *userPassword, void *guiDataA) {
   Object obj;
-  int size = 0;
 #ifdef _WIN32
   int n, i;
 #endif
@@ -137,17 +148,8 @@ PDFDoc::PDFDoc(GooString *fileNameA, GooString *ownerPassword,
   fileNameU[n] = L'\0';
 #endif
 
-  struct stat buf;
-  if (stat(fileName->getCString(), &buf) == 0) {
-     size = buf.st_size;
-  }
-
   // try to open file
-#ifdef VMS
-  file = fopen(fileName->getCString(), "rb", "ctx=stm");
-#else
-  file = fopen(fileName->getCString(), "rb");
-#endif
+  file = GooFile::open(fileName);
   if (file == NULL) {
     // fopen() has failed.
     // Keep a copy of the errno returned by fopen so that it can be 
@@ -160,7 +162,7 @@ PDFDoc::PDFDoc(GooString *fileNameA, GooString *ownerPassword,
 
   // create stream
   obj.initNull();
-  str = new FileStream(file, 0, gFalse, size, &obj);
+  str = new FileStream(file, 0, gFalse, file->size(), &obj);
 
   ok = setup(ownerPassword, userPassword);
 }
@@ -184,26 +186,17 @@ PDFDoc::PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword,
     fileNameU[i] = fileNameA[i];
   }
   fileNameU[fileNameLen] = L'\0';
-
-
+  
   // try to open file
   // NB: _wfopen is only available in NT
-  struct _stat buf;
-  int size = 0;
   version.dwOSVersionInfoSize = sizeof(version);
   GetVersionEx(&version);
   if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) {
-    if (_wstat(fileNameU, &buf) == 0) {
-      size = buf.st_size;
-    }
-    file = _wfopen(fileNameU, L"rb");
+    file = GooFile::open(fileNameU);
   } else {
-    if (_stat(fileName->getCString(), &buf) == 0) {
-      size = buf.st_size;
-    }
-    file = fopen(fileName->getCString(), "rb");
+    file = GooFile::open(fileName);
   }
-  if (!size || !file) {
+  if (!file) {
     error(errIO, -1, "Couldn't open file '{0:t}'", fileName);
     errCode = errOpenFile;
     return;
@@ -211,7 +204,7 @@ PDFDoc::PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword,
 
   // create stream
   obj.initNull();
-  str = new FileStream(file, 0, gFalse, size, &obj);
+  str = new FileStream(file, 0, gFalse, file->size(), &obj);
 
   ok = setup(ownerPassword, userPassword);
 }
@@ -246,6 +239,7 @@ PDFDoc::PDFDoc(BaseStream *strA, GooString *ownerPassword,
 }
 
 GBool PDFDoc::setup(GooString *ownerPassword, GooString *userPassword) {
+  pdfdocLocker();
   str->setPos(0, -1);
   if (str->getPos() < 0)
   {
@@ -332,7 +326,7 @@ PDFDoc::~PDFDoc() {
     delete str;
   }
   if (file) {
-    fclose(file);
+    delete file;
   }
   if (fileName) {
     delete fileName;
@@ -342,6 +336,9 @@ PDFDoc::~PDFDoc() {
     gfree(fileNameU);
   }
 #endif
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
 }
 
 
@@ -349,7 +346,7 @@ PDFDoc::~PDFDoc() {
 GBool PDFDoc::checkFooter() {
   // we look in the last 1024 chars because Adobe does the same
   char *eof = new char[1025];
-  int pos = str->getPos();
+  Goffset pos = str->getPos();
   str->setPos(1024, -1);
   int i, ch;
   for (i = 0; i < 1024; i++)
@@ -455,7 +452,7 @@ void PDFDoc::displayPage(OutputDev *out, int page,
 			 GBool (*abortCheckCbk)(void *data),
 			 void *abortCheckCbkData,
                          GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
-                         void *annotDisplayDecideCbkData) {
+                         void *annotDisplayDecideCbkData, GBool copyXRef) {
   if (globalParams->getPrintCommands()) {
     printf("***** page %d *****\n", page);
   }
@@ -464,7 +461,7 @@ void PDFDoc::displayPage(OutputDev *out, int page,
     getPage(page)->display(out, hDPI, vDPI,
 				    rotate, useMediaBox, crop, printing,
 				    abortCheckCbk, abortCheckCbkData,
-				    annotDisplayDecideCbk, annotDisplayDecideCbkData);
+				    annotDisplayDecideCbk, annotDisplayDecideCbkData, copyXRef);
 
 }
 
@@ -491,14 +488,14 @@ void PDFDoc::displayPageSlice(OutputDev *out, int page,
 			      GBool (*abortCheckCbk)(void *data),
 			      void *abortCheckCbkData,
                               GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
-                              void *annotDisplayDecideCbkData) {
+                              void *annotDisplayDecideCbkData, GBool copyXRef) {
   if (getPage(page))
     getPage(page)->displaySlice(out, hDPI, vDPI,
 					 rotate, useMediaBox, crop,
 					 sliceX, sliceY, sliceW, sliceH,
 					 printing,
 					 abortCheckCbk, abortCheckCbkData,
-					 annotDisplayDecideCbk, annotDisplayDecideCbkData);
+					 annotDisplayDecideCbk, annotDisplayDecideCbkData, copyXRef);
 }
 
 Links *PDFDoc::getLinks(int page) {
@@ -747,7 +744,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
   objectsCount++;
   page.free();
 
-  Guint uxrefOffset = outStr->getPos();
+  Goffset uxrefOffset = outStr->getPos();
   Ref ref;
   ref.num = rootNum;
   ref.gen = 0;
@@ -795,7 +792,7 @@ int PDFDoc::saveAs(OutStream *outStr, PDFWriteMode mode) {
   if (!updated && mode == writeStandard) {
     // simply copy the original file
     saveWithoutChangesAs (outStr);
-  } if (mode == writeForceRewrite) {
+  } else if (mode == writeForceRewrite) {
     saveCompleteRewrite(outStr);
   } else {
     saveIncrementalUpdate(outStr);
@@ -826,11 +823,13 @@ int PDFDoc::saveWithoutChangesAs(GooString *name) {
 int PDFDoc::saveWithoutChangesAs(OutStream *outStr) {
   int c;
   
-  str->reset();
-  while ((c = str->getChar()) != EOF) {
+  BaseStream *copyStr = str->copy();
+  copyStr->reset();
+  while ((c = copyStr->getChar()) != EOF) {
     outStr->put(c);
   }
-  str->close();
+  copyStr->close();
+  delete copyStr;
 
   return errNone;
 }
@@ -840,11 +839,13 @@ void PDFDoc::saveIncrementalUpdate (OutStream* outStr)
   XRef *uxref;
   int c;
   //copy the original file
-  str->reset();
-  while ((c = str->getChar()) != EOF) {
+  BaseStream *copyStr = str->copy();
+  copyStr->reset();
+  while ((c = copyStr->getChar()) != EOF) {
     outStr->put(c);
   }
-  str->close();
+  copyStr->close();
+  delete copyStr;
 
   Guchar *fileKey;
   CryptAlgorithm encAlgorithm;
@@ -853,6 +854,7 @@ void PDFDoc::saveIncrementalUpdate (OutStream* outStr)
 
   uxref = new XRef();
   uxref->add(0, 65535, 0, gFalse);
+  xref->lock();
   for(int i=0; i<xref->getNumObjects(); i++) {
     if ((xref->getEntry(i)->type == xrefEntryFree) && 
         (xref->getEntry(i)->gen == 0)) //we skip the irrelevant free objects
@@ -864,8 +866,8 @@ void PDFDoc::saveIncrementalUpdate (OutStream* outStr)
       ref.gen = xref->getEntry(i)->type == xrefEntryCompressed ? 0 : xref->getEntry(i)->gen;
       if (xref->getEntry(i)->type != xrefEntryFree) {
         Object obj1;
-        xref->fetch(ref.num, ref.gen, &obj1);
-        Guint offset = writeObjectHeader(&ref, outStr);
+        xref->fetch(ref.num, ref.gen, &obj1, 1);
+        Goffset offset = writeObjectHeader(&ref, outStr);
         writeObject(&obj1, outStr, fileKey, encAlgorithm, keyLength, ref.num, ref.gen);
         writeObjectFooter(outStr);
         uxref->add(ref.num, ref.gen, offset, gTrue);
@@ -875,12 +877,13 @@ void PDFDoc::saveIncrementalUpdate (OutStream* outStr)
       }
     }
   }
+  xref->unlock();
   if (uxref->getNumObjects() == 0) { //we have nothing to update
     delete uxref;
     return;
   }
 
-  Guint uxrefOffset = outStr->getPos();
+  Goffset uxrefOffset = outStr->getPos();
   int numobjects = xref->getNumObjects();
   const char *fileNameA = fileName ? fileName->getCString() : NULL;
   Ref rootRef, uxrefStreamRef;
@@ -922,6 +925,7 @@ void PDFDoc::saveCompleteRewrite (OutStream* outStr)
   outStr->printf("%%PDF-%d.%d\r\n",pdfMajorVersion,pdfMinorVersion);
   XRef *uxref = new XRef();
   uxref->add(0, 65535, 0, gFalse);
+  xref->lock();
   for(int i=0; i<xref->getNumObjects(); i++) {
     Object obj1;
     Ref ref;
@@ -941,8 +945,8 @@ void PDFDoc::saveCompleteRewrite (OutStream* outStr)
     } else if (type == xrefEntryUncompressed){ 
       ref.num = i;
       ref.gen = xref->getEntry(i)->gen;
-      xref->fetch(ref.num, ref.gen, &obj1);
-      Guint offset = writeObjectHeader(&ref, outStr);
+      xref->fetch(ref.num, ref.gen, &obj1, 1);
+      Goffset offset = writeObjectHeader(&ref, outStr);
       // Write unencrypted objects in unencrypted form
       if (xref->getEntry(i)->getFlag(XRefEntry::Unencrypted)) {
         writeObject(&obj1, outStr, NULL, cryptRC4, 0, 0, 0);
@@ -955,15 +959,16 @@ void PDFDoc::saveCompleteRewrite (OutStream* outStr)
     } else if (type == xrefEntryCompressed) {
       ref.num = i;
       ref.gen = 0; //compressed entries have gen == 0
-      xref->fetch(ref.num, ref.gen, &obj1);
-      Guint offset = writeObjectHeader(&ref, outStr);
+      xref->fetch(ref.num, ref.gen, &obj1, 1);
+      Goffset offset = writeObjectHeader(&ref, outStr);
       writeObject(&obj1, outStr, fileKey, encAlgorithm, keyLength, ref.num, ref.gen);
       writeObjectFooter(outStr);
       uxref->add(ref.num, ref.gen, offset, gTrue);
       obj1.free();
     }
   }
-  Guint uxrefOffset = outStr->getPos();
+  xref->unlock();
+  Goffset uxrefOffset = outStr->getPos();
   writeXRefTableTrailer(uxrefOffset, uxref, gTrue /* write all entries */,
                         uxref->getNumObjects(), outStr, gFalse /* complete rewrite */);
   delete uxref;
@@ -999,17 +1004,21 @@ void PDFDoc::writeRawStream (Stream* str, OutStream* outStr)
 {
   Object obj1;
   str->getDict()->lookup("Length", &obj1);
-  if (!obj1.isInt()) {
+  if (!obj1.isInt() && !obj1.isInt64()) {
     error (errSyntaxError, -1, "PDFDoc::writeRawStream, no Length in stream dict");
     return;
   }
 
-  const int length = obj1.getInt();
+  Goffset length;
+  if (obj1.isInt())
+    length = obj1.getInt();
+  else
+    length = obj1.getInt64();
   obj1.free();
 
   outStr->printf("stream\r\n");
   str->unfilteredReset();
-  for (int i=0; i<length; i++) {
+  for (Goffset i = 0; i < length; i++) {
     int c = str->getUnfilteredChar();
     outStr->printf("%c", c);  
   }
@@ -1073,9 +1082,9 @@ void PDFDoc::writeString (GooString* s, OutStream* outStr, Guchar *fileKey,
   delete sEnc;
 }
 
-Guint PDFDoc::writeObjectHeader (Ref *ref, OutStream* outStr)
+Goffset PDFDoc::writeObjectHeader (Ref *ref, OutStream* outStr)
 {
-  Guint offset = outStr->getPos();
+  Goffset offset = outStr->getPos();
   outStr->printf("%i %i obj ", ref->num, ref->gen);
   return offset;
 }
@@ -1085,7 +1094,7 @@ void PDFDoc::writeObject (Object* obj, OutStream* outStr, XRef *xRef, Guint numO
 {
   Array *array;
   Object obj1;
-  int tmp;
+  Goffset tmp;
 
   switch (obj->getType()) {
     case objBool:
@@ -1094,8 +1103,8 @@ void PDFDoc::writeObject (Object* obj, OutStream* outStr, XRef *xRef, Guint numO
     case objInt:
       outStr->printf("%i ", obj->getInt());
       break;
-    case objUint:
-      outStr->printf("%u ", obj->getUint());
+    case objInt64:
+      outStr->printf("%lli ", obj->getInt64());
       break;
     case objReal:
     {
@@ -1135,12 +1144,42 @@ void PDFDoc::writeObject (Object* obj, OutStream* outStr, XRef *xRef, Guint numO
         //We can't modify stream with the current implementation (no write functions in Stream API)
         // => the only type of streams which that have been modified are internal streams (=strWeird)
         Stream *stream = obj->getStream();
-        if (stream->getKind() == strWeird) {
+        if (stream->getKind() == strWeird || stream->getKind() == strCrypt) {
           //we write the stream unencoded => TODO: write stream encoder
 
           // Encrypt stream
           EncryptStream *encStream = NULL;
-          if (fileKey) {
+          GBool removeFilter = gTrue;
+          if (stream->getKind() == strWeird && fileKey) {
+            Object filter;
+            stream->getDict()->lookup("Filter", &filter);
+            if (!filter.isName("Crypt")) {
+              if (filter.isArray()) {
+                for (int i = 0; i < filter.arrayGetLength(); i++) {
+                  Object filterEle;
+                  filter.arrayGet(i, &filterEle);
+                  if (filterEle.isName("Crypt")) {
+                    filterEle.free();
+                    removeFilter = gFalse;
+                    break;
+                  }
+                  filterEle.free();
+                }
+                if (removeFilter) {
+                  encStream = new EncryptStream(stream, fileKey, encAlgorithm, keyLength, objNum, objGen);
+                  encStream->setAutoDelete(gFalse);
+                  stream = encStream;
+                }
+              } else {
+                encStream = new EncryptStream(stream, fileKey, encAlgorithm, keyLength, objNum, objGen);
+                encStream->setAutoDelete(gFalse);
+                stream = encStream;
+              }
+            } else {
+              removeFilter = gFalse;
+            }
+            filter.free();
+          } else if (fileKey != NULL) { // Encrypt stream
             encStream = new EncryptStream(stream, fileKey, encAlgorithm, keyLength, objNum, objGen);
             encStream->setAutoDelete(gFalse);
             stream = encStream;
@@ -1152,11 +1191,13 @@ void PDFDoc::writeObject (Object* obj, OutStream* outStr, XRef *xRef, Guint numO
           for (int c=stream->getChar(); c!=EOF; c=stream->getChar()) {
             tmp++;
           }
-          obj1.initInt(tmp);
+          obj1.initInt64(tmp);
           stream->getDict()->set("Length", &obj1);
 
           //Remove Stream encoding
-          stream->getDict()->remove("Filter");
+          if (removeFilter) {
+            stream->getDict()->remove("Filter");
+          }
           stream->getDict()->remove("DecodeParms");
 
           writeDictionnary (stream->getDict(),outStr, xRef, numOffset, fileKey, encAlgorithm, keyLength, objNum, objGen);
@@ -1169,10 +1210,10 @@ void PDFDoc::writeObject (Object* obj, OutStream* outStr, XRef *xRef, Guint numO
           if (fs) {
             BaseStream *bs = fs->getBaseStream();
             if (bs) {
-              Guint streamEnd;
+              Goffset streamEnd;
                 if (xRef->getStreamEnd(bs->getStart(), &streamEnd)) {
                   Object val;
-                  val.initInt(streamEnd - bs->getStart());
+                  val.initInt64(streamEnd - bs->getStart());
                   stream->getDict()->set("Length", &val);
                 }
               }
@@ -1208,8 +1249,8 @@ void PDFDoc::writeObjectFooter (OutStream* outStr)
   outStr->printf("endobj\r\n");
 }
 
-Dict *PDFDoc::createTrailerDict(int uxrefSize, GBool incrUpdate, Guint startxRef,
-                                Ref *root, XRef *xRef, const char *fileName, Guint fileSize)
+Dict *PDFDoc::createTrailerDict(int uxrefSize, GBool incrUpdate, Goffset startxRef,
+                                Ref *root, XRef *xRef, const char *fileName, Goffset fileSize)
 {
   Dict *trailerDict = new Dict(xRef);
   Object obj1;
@@ -1230,7 +1271,7 @@ Dict *PDFDoc::createTrailerDict(int uxrefSize, GBool incrUpdate, Guint startxRef
   if (fileName)
     message.append(fileName);
 
-  sprintf(buffer, "%i", fileSize);
+  sprintf(buffer, "%lli", (long long)fileSize);
   message.append(buffer);
 
   //info dict -- only use text string
@@ -1294,7 +1335,7 @@ Dict *PDFDoc::createTrailerDict(int uxrefSize, GBool incrUpdate, Guint startxRef
   trailerDict->set("Root", &obj1);
 
   if (incrUpdate) { 
-    obj1.initInt(startxRef);
+    obj1.initInt64(startxRef);
     trailerDict->set("Prev", &obj1);
   }
   
@@ -1308,17 +1349,17 @@ Dict *PDFDoc::createTrailerDict(int uxrefSize, GBool incrUpdate, Guint startxRef
   return trailerDict;
 }
 
-void PDFDoc::writeXRefTableTrailer(Dict *trailerDict, XRef *uxref, GBool writeAllEntries, Guint uxrefOffset, OutStream* outStr, XRef *xRef)
+void PDFDoc::writeXRefTableTrailer(Dict *trailerDict, XRef *uxref, GBool writeAllEntries, Goffset uxrefOffset, OutStream* outStr, XRef *xRef)
 {
   uxref->writeTableToFile( outStr, writeAllEntries );
   outStr->printf( "trailer\r\n");
   writeDictionnary(trailerDict, outStr, xRef, 0, NULL, cryptRC4, 0, 0, 0);
   outStr->printf( "\r\nstartxref\r\n");
-  outStr->printf( "%i\r\n", uxrefOffset);
+  outStr->printf( "%lli\r\n", uxrefOffset);
   outStr->printf( "%%%%EOF\r\n");
 }
 
-void PDFDoc::writeXRefStreamTrailer (Dict *trailerDict, XRef *uxref, Ref *uxrefStreamRef, Guint uxrefOffset, OutStream* outStr, XRef *xRef)
+void PDFDoc::writeXRefStreamTrailer (Dict *trailerDict, XRef *uxref, Ref *uxrefStreamRef, Goffset uxrefOffset, OutStream* outStr, XRef *xRef)
 {
   GooString stmData;
 
@@ -1335,11 +1376,11 @@ void PDFDoc::writeXRefStreamTrailer (Dict *trailerDict, XRef *uxref, Ref *uxrefS
   obj1.free();
 
   outStr->printf( "startxref\r\n");
-  outStr->printf( "%i\r\n", uxrefOffset);
+  outStr->printf( "%lli\r\n", uxrefOffset);
   outStr->printf( "%%%%EOF\r\n");
 }
 
-void PDFDoc::writeXRefTableTrailer(Guint uxrefOffset, XRef *uxref, GBool writeAllEntries,
+void PDFDoc::writeXRefTableTrailer(Goffset uxrefOffset, XRef *uxref, GBool writeAllEntries,
                                    int uxrefSize, OutStream* outStr, GBool incrUpdate)
 {
   const char *fileNameA = fileName ? fileName->getCString() : NULL;
@@ -1542,7 +1583,7 @@ Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, G
       ref.gen = xRef->getEntry(n)->gen;
       objectsCount++;
       getXRef()->fetch(ref.num - numOffset, ref.gen, &obj);
-      Guint offset = writeObjectHeader(&ref, outStr);
+      Goffset offset = writeObjectHeader(&ref, outStr);
       if (combine) {
         writeObject(&obj, outStr, getXRef(), numOffset, NULL, cryptRC4, 0, 0, 0);
       } else if (xRef->getEntry(n)->getFlag(XRefEntry::Unencrypted)) {
@@ -1562,6 +1603,7 @@ Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, G
 Outline *PDFDoc::getOutline()
 {
   if (!outline) {
+    pdfdocLocker();
     // read outline
     outline = new Outline(catalog->getOutline(), xref);
   }
@@ -1579,14 +1621,14 @@ PDFDoc *PDFDoc::ErrorPDFDoc(int errorCode, GooString *fileNameA)
   return doc;
 }
 
-Guint PDFDoc::strToUnsigned(char *s) {
-  Guint x, d;
+long long PDFDoc::strToLongLong(char *s) {
+  long long x, d;
   char *p;
 
   x = 0;
   for (p = s; *p && isdigit(*p & 0xff); ++p) {
     d = *p - '0';
-    if (x > (UINT_MAX - d) / 10) {
+    if (x > (LLONG_MAX - d) / 10) {
       break;
     }
     x = 10 * x + d;
@@ -1595,9 +1637,9 @@ Guint PDFDoc::strToUnsigned(char *s) {
 }
 
 // Read the 'startxref' position.
-Guint PDFDoc::getStartXRef()
+Goffset PDFDoc::getStartXRef()
 {
-  if (startXRefPos == ~(Guint)0) {
+  if (startXRefPos == -1) {
 
     if (isLinearized()) {
       char buf[linearizationSearchSize+1];
@@ -1648,7 +1690,7 @@ Guint PDFDoc::getStartXRef()
         startXRefPos = 0;
       } else {
         for (p = &buf[i+9]; isspace(*p); ++p) ;
-        startXRefPos =  strToUnsigned(p);
+        startXRefPos =  strToLongLong(p);
       }
     }
 
@@ -1657,7 +1699,7 @@ Guint PDFDoc::getStartXRef()
   return startXRefPos;
 }
 
-Guint PDFDoc::getMainXRefEntriesOffset()
+Goffset PDFDoc::getMainXRefEntriesOffset()
 {
   Guint mainXRefEntriesOffset = 0;
 
@@ -1720,6 +1762,7 @@ Page *PDFDoc::getPage(int page)
   if ((page < 1) || page > getNumPages()) return NULL;
 
   if (isLinearized()) {
+    pdfdocLocker();
     if (!pageCache) {
       pageCache = (Page **) gmallocn(getNumPages(), sizeof(Page *));
       for (int i = 0; i < getNumPages(); i++) {
diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
index 45623465..da9bf5b3 100644
--- a/poppler/PDFDoc.h
+++ b/poppler/PDFDoc.h
@@ -22,8 +22,10 @@
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com>
-// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 //
 // 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
@@ -37,7 +39,9 @@
 #pragma interface
 #endif
 
+#include "poppler-config.h"
 #include <stdio.h>
+#include "goo/GooMutex.h"
 #include "XRef.h"
 #include "Catalog.h"
 #include "Page.h"
@@ -46,6 +50,7 @@
 #include "Stream.h"
 
 class GooString;
+class GooFile;
 class BaseStream;
 class OutputDev;
 class Links;
@@ -146,7 +151,7 @@ public:
 		   GBool (*abortCheckCbk)(void *data) = NULL,
 		   void *abortCheckCbkData = NULL,
                    GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
-                   void *annotDisplayDecideCbkData = NULL);
+                   void *annotDisplayDecideCbkData = NULL, GBool copyXRef = gFalse);
 
   // Display a range of pages.
   void displayPages(OutputDev *out, int firstPage, int lastPage,
@@ -165,7 +170,7 @@ public:
 			GBool (*abortCheckCbk)(void *data) = NULL,
 			void *abortCheckCbkData = NULL,
                         GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
-                        void *annotDisplayDecideCbkData = NULL);
+                        void *annotDisplayDecideCbkData = NULL, GBool copyXRef = gFalse);
 
   // Find a page, given its object ID.  Returns page number, or 0 if
   // not found.
@@ -249,12 +254,12 @@ public:
   static void writeHeader(OutStream *outStr, int major, int minor);
 
   // Ownership goes to the caller
-  static Dict *createTrailerDict (int uxrefSize, GBool incrUpdate, Guint startxRef,
-                                  Ref *root, XRef *xRef, const char *fileName, Guint fileSize);
+  static Dict *createTrailerDict (int uxrefSize, GBool incrUpdate, Goffset startxRef,
+                                  Ref *root, XRef *xRef, const char *fileName, Goffset fileSize);
   static void writeXRefTableTrailer (Dict *trailerDict, XRef *uxref, GBool writeAllEntries,
-                                     Guint uxrefOffset, OutStream* outStr, XRef *xRef);
+                                     Goffset uxrefOffset, OutStream* outStr, XRef *xRef);
   static void writeXRefStreamTrailer (Dict *trailerDict, XRef *uxref, Ref *uxrefStreamRef,
-                                      Guint uxrefOffset, OutStream* outStr, XRef *xRef);
+                                      Goffset uxrefOffset, OutStream* outStr, XRef *xRef);
 
 private:
   // insert referenced objects in XRef
@@ -264,7 +269,7 @@ private:
                                 CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen);
 
   // Write object header to current file stream and return its offset
-  static Guint writeObjectHeader (Ref *ref, OutStream* outStr);
+  static Goffset writeObjectHeader (Ref *ref, OutStream* outStr);
   static void writeObjectFooter (OutStream* outStr);
 
   void writeObject (Object *obj, OutStream* outStr, Guchar *fileKey, CryptAlgorithm encAlgorithm,
@@ -275,7 +280,7 @@ private:
   { writeDictionnary(dict, outStr, getXRef(), 0, fileKey, encAlgorithm, keyLength, objNum, objGen); }
   static void writeStream (Stream* str, OutStream* outStr);
   static void writeRawStream (Stream* str, OutStream* outStr);
-  void writeXRefTableTrailer (Guint uxrefOffset, XRef *uxref, GBool writeAllEntries,
+  void writeXRefTableTrailer (Goffset uxrefOffset, XRef *uxref, GBool writeAllEntries,
                               int uxrefSize, OutStream* outStr, GBool incrUpdate);
   static void writeString (GooString* s, OutStream* outStr, Guchar *fileKey,
                            CryptAlgorithm encAlgorithm, int keyLength, int objNum, int objGen);
@@ -294,17 +299,17 @@ private:
   void checkHeader();
   GBool checkEncryption(GooString *ownerPassword, GooString *userPassword);
   // Get the offset of the start xref table.
-  Guint getStartXRef();
+  Goffset getStartXRef();
   // Get the offset of the entries in the main XRef table of a
   // linearized document (0 for non linearized documents).
-  Guint getMainXRefEntriesOffset();
-  Guint strToUnsigned(char *s);
+  Goffset getMainXRefEntriesOffset();
+  long long strToLongLong(char *s);
 
   GooString *fileName;
 #ifdef _WIN32
   wchar_t *fileNameU;
 #endif
-  FILE *file;
+  GooFile *file;
   BaseStream *str;
   void *guiData;
   int pdfMajorVersion;
@@ -325,7 +330,10 @@ private:
   //then the POSIX errno will be here.
   int fopenErrno;
 
-  Guint startXRefPos;		// offset of last xref table
+  Goffset startXRefPos;		// offset of last xref table
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 };
 
 #endif
diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 95be97fa..4fe5d7b0 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -15,12 +15,12 @@
 //
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2009, 2011, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2009, 2011-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2007, 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008, 2009 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
-// Copyright (C) 2009-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
@@ -1075,7 +1075,6 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
   font16Enc = NULL;
   imgIDs = NULL;
   formIDs = NULL;
-  xobjStack = NULL;
   paperSizes = NULL;
   embFontList = NULL;
   customColors = NULL;
@@ -1142,7 +1141,6 @@ PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
   font16Enc = NULL;
   imgIDs = NULL;
   formIDs = NULL;
-  xobjStack = NULL;
   paperSizes = NULL;
   embFontList = NULL;
   customColors = NULL;
@@ -1238,6 +1236,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
   processColors = 0;
   inType3Char = gFalse;
   inUncoloredPattern = gFalse;
+  t3FillColorOnly = gFalse;
 
 #if OPI_SUPPORT
   // initialize OPI nesting levels
@@ -1275,7 +1274,6 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
   formIDLen = 0;
   formIDSize = 0;
 
-  xobjStack = new GooList();
   numSaves = 0;
   numTilingPatterns = 0;
   nextFunc = 0;
@@ -1375,9 +1373,6 @@ PSOutputDev::~PSOutputDev() {
   }
   gfree(imgIDs);
   gfree(formIDs);
-  if (xobjStack) {
-    delete xobjStack;
-  }
   while (customColors) {
     cc = customColors;
     customColors = cc->next;
@@ -1414,7 +1409,14 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
   obj1.free();
   info.free();
   if(psTitle) {
-    writePSFmt("%%Title: {0:s}\n", psTitle);
+    char *sanitizedTile = strdup(psTitle);
+    for (Guint i = 0; i < strlen(sanitizedTile); ++i) {
+      if (sanitizedTile[i] == '\n' || sanitizedTile[i] == '\r') {
+        sanitizedTile[i] = ' ';
+      }
+    }
+    writePSFmt("%%Title: {0:s}\n", sanitizedTile);
+    free(sanitizedTile);
   }
   writePSFmt("%%LanguageLevel: {0:d}\n",
 	     (level == psLevel1 || level == psLevel1Sep) ? 1 :
@@ -1650,9 +1652,9 @@ void PSOutputDev::writeTrailer() {
 
 void PSOutputDev::setupResources(Dict *resDict) {
   Object xObjDict, xObjRef, xObj, patDict, patRef, pat, resObj;
-  Ref ref0, ref1;
+  Ref ref0;
   GBool skip;
-  int i, j;
+  int i;
 
   setupFonts(resDict);
   setupImages(resDict);
@@ -1667,15 +1669,10 @@ void PSOutputDev::setupResources(Dict *resDict) {
       skip = gFalse;
       if ((xObjDict.dictGetValNF(i, &xObjRef)->isRef())) {
 	ref0 = xObjRef.getRef();
-	for (j = 0; j < xobjStack->getLength(); ++j) {
-	  ref1 = *(Ref *)xobjStack->get(j);
-	  if (ref1.num == ref0.num && ref1.gen == ref0.gen) {
-	    skip = gTrue;
-	    break;
-	  }
-	}
-	if (!skip) {
-	  xobjStack->append(&ref0);
+	if (resourceIDs.find(ref0.num) != resourceIDs.end()) {
+	  skip = gTrue;
+	} else {
+	  resourceIDs.insert(ref0.num);
 	}
       }
       if (!skip) {
@@ -1692,9 +1689,6 @@ void PSOutputDev::setupResources(Dict *resDict) {
 	xObj.free();
       }
 
-      if (xObjRef.isRef() && !skip) {
-	xobjStack->del(xobjStack->getLength() - 1);
-      }
       xObjRef.free();
     }
   }
@@ -1710,15 +1704,10 @@ void PSOutputDev::setupResources(Dict *resDict) {
       skip = gFalse;
       if ((patDict.dictGetValNF(i, &patRef)->isRef())) {
 	ref0 = patRef.getRef();
-	for (j = 0; j < xobjStack->getLength(); ++j) {
-	  ref1 = *(Ref *)xobjStack->get(j);
-	  if (ref1.num == ref0.num && ref1.gen == ref0.gen) {
-	    skip = gTrue;
-	    break;
-	  }
-	}
-	if (!skip) {
-	  xobjStack->append(&ref0);
+	if (resourceIDs.find(ref0.num) != resourceIDs.end()) {
+	  skip = gTrue;
+	} else {
+	  resourceIDs.insert(ref0.num);
 	}
       }
       if (!skip) {
@@ -1735,9 +1724,6 @@ void PSOutputDev::setupResources(Dict *resDict) {
 	pat.free();
       }
 
-      if (patRef.isRef() && !skip) {
-	xobjStack->del(xobjStack->getLength() - 1);
-      }
       patRef.free();
     }
     inType3Char = gFalse;
@@ -3085,7 +3071,7 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
     rotateA += 360;
   }
   state = new GfxState(dpi, dpi, &box, rotateA, gFalse);
-  startPage(page->getNum(), state);
+  startPage(page->getNum(), state, xref);
   delete state;
 
   // set up the SplashOutputDev
@@ -3471,14 +3457,14 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
 #endif // HAVE_SPLASH
 }
 
-void PSOutputDev::startPage(int pageNum, GfxState *state) {
+void PSOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
   Page *page;
   int x1, y1, x2, y2, width, height, t;
   int imgWidth, imgHeight, imgWidth2, imgHeight2;
   GBool landscape;
   GooString *s;
 
-
+  xref = xrefA;
   if (mode == psModePS || mode == psModePSOrigPageSizes) {
     GooString pageLabel;
     const GBool gotLabel = doc->getCatalog()->indexToLabel(pageNum -1, &pageLabel);
@@ -4284,7 +4270,7 @@ GBool PSOutputDev::tilingPatternFillL2(GfxState *state, Catalog *cat, Object *st
   return gTrue;
 }
 
-GBool PSOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
+GBool PSOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat, Object *str,
 				     double *pmat, int paintType, int tilingType, Dict *resDict,
 				     double *mat, double *bbox,
 				     int x0, int y0, int x1, int y1,
@@ -4303,7 +4289,7 @@ GBool PSOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Ob
     box.y1 = bbox[1];
     box.x2 = bbox[2];
     box.y2 = bbox[3];
-    gfx = new Gfx(doc, this, resDict, &box, NULL);
+    gfx = new Gfx(doc, this, resDict, &box, NULL, NULL, NULL, gfxA->getXRef());
     writePSFmt("[{0:.6g} {1:.6g} {2:.6g} {3:.6g} {4:.6g} {5:.6g}] cm\n", mat[0], mat[1], mat[2], mat[3], tx, ty);
     inType3Char = gTrue;
     gfx->display(str);
diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
index 6f290969..92b007ea 100644
--- a/poppler/PSOutputDev.h
+++ b/poppler/PSOutputDev.h
@@ -15,9 +15,9 @@
 //
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2008, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2008, 2012, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007 Brad Hards <bradh@kde.org>
-// Copyright (C) 2009-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
@@ -43,6 +43,7 @@
 #include "GfxState.h"
 #include "GlobalParams.h"
 #include "OutputDev.h"
+#include <set>
 
 class GHooash;
 class PDFDoc;
@@ -186,7 +187,7 @@ public:
 			       void *annotDisplayDecideCbkData = NULL);
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
 
   // End a page.
   virtual void endPage();
@@ -248,7 +249,6 @@ public:
   //----- text drawing
   virtual void drawString(GfxState *state, GooString *s);
   virtual void beginTextObject(GfxState *state);
-  virtual GBool deviceHasTextClip(GfxState *state) { return haveTextClip; }
   virtual void endTextObject(GfxState *state);
 
   //----- image drawing
@@ -429,6 +429,7 @@ private:
   Ref *fontIDs;			// list of object IDs of all used fonts
   int fontIDLen;		// number of entries in fontIDs array
   int fontIDSize;		// size of fontIDs array
+  std::set<int> resourceIDs;	// list of object IDs of objects containing Resources we've already set up
   GooHash *fontNames;		// all used font names
   PST1FontName *t1FontNames;	// font names for Type 1/1C fonts
   int t1FontNameLen;		// number of entries in t1FontNames array
@@ -445,8 +446,6 @@ private:
   Ref *formIDs;			// list of IDs for predefined forms
   int formIDLen;		// number of entries in formIDs array
   int formIDSize;		// size of formIDs array
-  GooList *xobjStack;		// stack of XObject dicts currently being
-				//   processed
   int numSaves;			// current number of gsaves
   int numTilingPatterns;	// current number of nested tiling patterns
   int nextFunc;			// next unique number to use for a function
diff --git a/poppler/Page.cc b/poppler/Page.cc
index 8c2065b3..e0a3b298 100644
--- a/poppler/Page.cc
+++ b/poppler/Page.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Jeff Muizelaar <jeff@infidigm.net>
-// Copyright (C) 2005-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006-2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2006 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
@@ -24,7 +24,9 @@
 // Copyright (C) 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008 Ilya Gorenbein <igorenbein@finjan.com>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
 //
 // 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
@@ -57,6 +59,11 @@
 #include "Catalog.h"
 #include "Form.h"
 
+#if MULTITHREADED
+#  define pageLocker()   MutexLocker locker(&mutex)
+#else
+#  define pageLocker()
+#endif
 //------------------------------------------------------------------------
 // PDFRectangle
 //------------------------------------------------------------------------
@@ -257,6 +264,9 @@ GBool PageAttrs::readBox(Dict *dict, const char *key, PDFRectangle *box) {
 Page::Page(PDFDoc *docA, int numA, Dict *pageDict, Ref pageRefA, PageAttrs *attrsA, Form *form) {
   Object tmp;
 	
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
   ok = gTrue;
   doc = docA;
   xref = doc->getXRef();
@@ -343,12 +353,52 @@ Page::~Page() {
   trans.free();
   thumb.free();
   actions.free();
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
+}
+
+Dict *Page::getResourceDict() { 
+  return attrs->getResourceDict();
+}
+
+Dict *Page::getResourceDictCopy(XRef *xrefA) { 
+  pageLocker();
+  Dict *dict = attrs->getResourceDict();
+  return dict ? dict->copy(xrefA) : NULL;
 }
 
-Annots *Page::getAnnots() {
+void Page::replaceXRef(XRef *xrefA) {
+  Object obj1;
+  Dict *pageDict = pageObj.getDict()->copy(xrefA);
+  xref = xrefA;
+  trans.free();
+  pageDict->lookupNF("Trans", &trans);
+  annotsObj.free();
+  pageDict->lookupNF("Annots", &annotsObj);
+  contents.free();
+  pageDict->lookupNF("Contents", &contents);
+  if (contents.isArray()) {
+    contents.free();
+    pageDict->lookupNF("Contents", &obj1)->getArray()->copy(xrefA, &contents);
+    obj1.free();
+  }
+  thumb.free();
+  pageDict->lookupNF("Thumb", &thumb);
+  actions.free();
+  pageDict->lookupNF("AA", &actions);
+  pageDict->lookup("Resources", &obj1);
+  if (obj1.isDict()) {
+    attrs->replaceResource(obj1);
+  }
+  obj1.free();
+  delete pageDict;
+}
+
+Annots *Page::getAnnots(XRef *xrefA) {
   if (!annots) {
     Object obj;
-    annots = new Annots(doc, num, getAnnots(&obj));
+    annots = new Annots(doc, num, getAnnots(&obj, (xrefA == NULL) ? xref : xrefA));
     obj.free();
   }
 
@@ -363,6 +413,7 @@ void Page::addAnnot(Annot *annot) {
   // Make sure we have annots before adding the new one
   // even if it's an empty list so that we can safely
   // call annots->appendAnnot(annot)
+  pageLocker();
   getAnnots();
 
   if (annotsObj.isNull()) {
@@ -398,17 +449,20 @@ void Page::removeAnnot(Annot *annot) {
   Ref annotRef = annot->getRef();
   Object annArray;
 
+  pageLocker();
   getAnnots(&annArray);
   if (annArray.isArray()) {
     int idx = -1;
     // Get annotation position
     for (int i = 0; idx == -1 && i < annArray.arrayGetLength(); ++i) {
       Object tmp;
-      Ref currAnnot = annArray.arrayGetNF(i, &tmp)->getRef();
-      tmp.free();
-      if (currAnnot.num == annotRef.num && currAnnot.gen == annotRef.gen) {
-        idx = i;
+      if (annArray.arrayGetNF(i, &tmp)->isRef()) {
+        Ref currAnnot = tmp.getRef();
+        if (currAnnot.num == annotRef.num && currAnnot.gen == annotRef.gen) {
+          idx = i;
+        }
       }
+      tmp.free();
     }
 
     if (idx == -1) {
@@ -445,10 +499,11 @@ void Page::display(OutputDev *out, double hDPI, double vDPI,
 		   GBool (*abortCheckCbk)(void *data),
 		   void *abortCheckCbkData,
                    GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
-                   void *annotDisplayDecideCbkData) {
+                   void *annotDisplayDecideCbkData,
+                   GBool copyXRef) {
   displaySlice(out, hDPI, vDPI, rotate, useMediaBox, crop, -1, -1, -1, -1, printing,
 	       abortCheckCbk, abortCheckCbkData,
-               annotDisplayDecideCbk, annotDisplayDecideCbkData);
+               annotDisplayDecideCbk, annotDisplayDecideCbkData, copyXRef);
 }
 
 Gfx *Page::createGfx(OutputDev *out, double hDPI, double vDPI,
@@ -456,7 +511,7 @@ Gfx *Page::createGfx(OutputDev *out, double hDPI, double vDPI,
 		     int sliceX, int sliceY, int sliceW, int sliceH,
 		     GBool printing,
 		     GBool (*abortCheckCbk)(void *data),
-		     void *abortCheckCbkData) {
+		     void *abortCheckCbkData, XRef *xrefA) {
   PDFRectangle *mediaBox, *cropBox;
   PDFRectangle box;
   Gfx *gfx;
@@ -486,7 +541,7 @@ Gfx *Page::createGfx(OutputDev *out, double hDPI, double vDPI,
   }
   gfx = new Gfx(doc, out, num, attrs->getResourceDict(),
 		hDPI, vDPI, &box, crop ? cropBox : (PDFRectangle *)NULL,
-		rotate, abortCheckCbk, abortCheckCbkData);
+		rotate, abortCheckCbk, abortCheckCbkData, xrefA);
 
   return gfx;
 }
@@ -498,7 +553,8 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
 			GBool (*abortCheckCbk)(void *data),
 			void *abortCheckCbkData,
                         GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
-                        void *annotDisplayDecideCbkData) {
+                        void *annotDisplayDecideCbkData,
+                        GBool copyXRef) {
   Gfx *gfx;
   Object obj;
   Annots *annotList;
@@ -511,13 +567,18 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
 			   annotDisplayDecideCbk, annotDisplayDecideCbkData)) {
     return;
   }
+  pageLocker();
+  XRef *localXRef = (copyXRef) ? xref->copy() : xref;
+  if (copyXRef) {
+    replaceXRef(localXRef);
+  }
 
   gfx = createGfx(out, hDPI, vDPI, rotate, useMediaBox, crop,
 		  sliceX, sliceY, sliceW, sliceH,
 		  printing,
-		  abortCheckCbk, abortCheckCbkData);
+		  abortCheckCbk, abortCheckCbkData, localXRef);
 
-  contents.fetch(xref, &obj);
+  contents.fetch(localXRef, &obj);
   if (!obj.isNull()) {
     gfx->saveState();
     gfx->display(&obj);
@@ -548,6 +609,10 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
   }
 
   delete gfx;
+  if (copyXRef) {
+    replaceXRef(doc->getXRef());
+    delete localXRef;
+  }
 }
 
 void Page::display(Gfx *gfx) {
@@ -576,6 +641,7 @@ GBool Page::loadThumb(unsigned char **data_out,
   GfxImageColorMap *colorMap;
 
   /* Get stream dict */
+  pageLocker();
   thumb.fetch(xref, &fetched_thumb);
   if (!fetched_thumb.isStream()) {
     fetched_thumb.free();
diff --git a/poppler/Page.h b/poppler/Page.h
index a6098edc..1c9d0a9c 100644
--- a/poppler/Page.h
+++ b/poppler/Page.h
@@ -21,6 +21,7 @@
 // Copyright (C) 2008 Iñigo Martínez <inigomartinez@gmail.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -34,7 +35,9 @@
 #pragma interface
 #endif
 
+#include "poppler-config.h"
 #include "Object.h"
+#include "goo/GooMutex.h"
 
 class Dict;
 class PDFDoc;
@@ -102,6 +105,8 @@ public:
 	? separationInfo.getDict() : (Dict *)NULL; }
   Dict *getResourceDict()
     { return resources.isDict() ? resources.getDict() : (Dict *)NULL; }
+  void replaceResource(Object obj1) 
+  {  resources.free(); obj1.copy(&resources); }
 
   // Clip all other boxes to the MediaBox.
   void clipBoxes();
@@ -169,10 +174,11 @@ public:
   Ref getRef() { return pageRef; }
 
   // Get resource dictionary.
-  Dict *getResourceDict() { return attrs->getResourceDict(); }
+  Dict *getResourceDict();
+  Dict *getResourceDictCopy(XRef *xrefA);
 
   // Get annotations array.
-  Object *getAnnots(Object *obj) { return annotsObj.fetch(xref, obj); }
+  Object *getAnnots(Object *obj, XRef *xrefA = NULL) { return annotsObj.fetch((xrefA == NULL) ? xref : xrefA, obj); }
   // Add a new annotation to the page
   void addAnnot(Annot *annot);
   // Remove an existing annotation from the page
@@ -182,7 +188,7 @@ public:
   Links *getLinks();
 
   // Return a list of annots. It will be valid until the page is destroyed
-  Annots *getAnnots();
+  Annots *getAnnots(XRef *xrefA = NULL);
 
   // Get contents.
   Object *getContents(Object *obj) { return contents.fetch(xref, obj); }
@@ -210,7 +216,7 @@ public:
 		 int sliceX, int sliceY, int sliceW, int sliceH,
 		 GBool printing,
 		 GBool (*abortCheckCbk)(void *data),
-		 void *abortCheckCbkData);
+		 void *abortCheckCbkData, XRef *xrefA = NULL);
 
   // Display a page.
   void display(OutputDev *out, double hDPI, double vDPI,
@@ -219,7 +225,8 @@ public:
 	       GBool (*abortCheckCbk)(void *data) = NULL,
 	       void *abortCheckCbkData = NULL,
                GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
-               void *annotDisplayDecideCbkData = NULL);
+               void *annotDisplayDecideCbkData = NULL,
+               GBool copyXRef = gFalse);
 
   // Display part of a page.
   void displaySlice(OutputDev *out, double hDPI, double vDPI,
@@ -229,7 +236,8 @@ public:
 		    GBool (*abortCheckCbk)(void *data) = NULL,
 		    void *abortCheckCbkData = NULL,
                     GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
-                    void *annotDisplayDecideCbkData = NULL);
+                    void *annotDisplayDecideCbkData = NULL,
+                    GBool copyXRef = gFalse);
 
   void display(Gfx *gfx);
 
@@ -245,6 +253,8 @@ public:
 		     int rotate, GBool useMediaBox, GBool upsideDown);
 
 private:
+  // replace xref
+  void replaceXRef(XRef *xrefA);
 
   PDFDoc *doc;
   XRef *xref;			// the xref table for this PDF file
@@ -260,6 +270,9 @@ private:
   Object actions;		// page addiction actions
   double duration;              // page duration
   GBool ok;			// true if page is valid
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 };
 
 #endif
diff --git a/poppler/PageLabelInfo.cc b/poppler/PageLabelInfo.cc
index a099d11a..3153377f 100644
--- a/poppler/PageLabelInfo.cc
+++ b/poppler/PageLabelInfo.cc
@@ -3,7 +3,7 @@
 // This file is under the GPLv2 or later license
 //
 // Copyright (C) 2005-2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2011 Simon Kellner <kellner@kit.edu>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 //
@@ -19,140 +19,7 @@
 #include <assert.h>
 
 #include "PageLabelInfo.h"
-
-/* http://mathworld.wolfram.com/RomanNumerals.html */
-
-static int fromRoman(const char *buffer) {
-  int digit_value, prev_digit_value, value;
-  int i;
-
-  prev_digit_value = INT_MAX;
-  value = 0;
-  for (i = 0; buffer[i] != '\0'; i++) {
-    switch (buffer[i]) {
-    case 'm':
-    case 'M':
-      digit_value = 1000;
-      break;
-    case 'd':
-    case 'D':
-      digit_value = 500;
-      break;
-    case 'c':
-    case 'C':
-      digit_value = 100;
-      break;
-    case 'l':
-    case 'L':
-      digit_value = 50;
-      break;
-    case 'x':
-    case 'X':
-      digit_value = 10;
-      break;
-    case 'v':
-    case 'V':
-      digit_value = 5;
-      break;
-    case 'i':
-    case 'I':
-      digit_value = 1;
-      break;
-    default:
-      return -1;
-    }
-
-    if (digit_value <= prev_digit_value)
-      value += digit_value;
-    else
-      value += digit_value - prev_digit_value * 2;
-    prev_digit_value = digit_value;
-  }
-
-  return value;
-}
-
-static void toRoman(int number, GooString *str, GBool uppercase) {
-  static const char uppercaseNumerals[] = "IVXLCDM";
-  static const char lowercaseNumerals[] = "ivxlcdm";
-  int divisor;
-  int i, j, k;
-  const char *wh;
-
-  if (uppercase)
-    wh = uppercaseNumerals;
-  else
-    wh = lowercaseNumerals;
-
-  divisor = 1000;
-  for (k = 3; k >= 0; k--) {
-    i = number / divisor;
-    number = number % divisor;
-
-    switch (i) {
-    case 0:
-      break;
-    case 5:
-      str->append(wh[2 * k + 1]);
-      break;
-    case 9:
-      str->append(wh[2 * k + 0]);
-      str->append(wh[ 2 * k + 2]);
-      break;
-    case 4:
-      str->append(wh[2 * k + 0]);
-      str->append(wh[2 * k + 1]);
-      break;
-    default:
-      if (i > 5) {
-       str->append(wh[2 * k + 1]);
-       i -= 5;
-      }
-      for (j = 0; j < i; j++) {
-       str->append(wh[2 * k + 0]);
-      }
-    }
-       
-    divisor = divisor / 10;
-  }
-}
-
-static int fromLatin(const char *buffer)
-{
-  int count;
-  const char *p;
-
-  for (p = buffer; *p; p++) {
-    if (*p != buffer[0])
-      return -1;
-  }
-
-  count = p - buffer;
-  if (buffer[0] >= 'a' && buffer[0] <= 'z')
-    return 26 * (count - 1) + buffer[0] - 'a' + 1;
-  if (buffer[0] >= 'A' && buffer[0] <= 'Z')
-    return 26 * (count - 1) + buffer[0] - 'A' + 1;
-
-  return -1;
-}
-
-#ifdef TEST
-static void toLatin(int number, GooString *str, GBool uppercase) {
-  char base, letter;
-  int i, count;
-
-  if (uppercase)
-    base = 'A';
-  else
-    base = 'a';
-
-  count = (number - 1) / 26 + 1;
-  letter = base + (number - 1) % 26;
-
-  for (i = 0; i < count; i++)
-    str->append(letter);
-}
-#endif
+#include "PageLabelInfo_p.h"
 
 PageLabelInfo::Interval::Interval(Object *dict, int baseA) {
   Object obj;
@@ -332,9 +199,11 @@ GBool PageLabelInfo::indexToLabel(int index, GooString *label)
   case Interval::UppercaseRoman:
     toRoman(number, &number_string, gTrue);
     break;
-  case Interval::UppercaseLatin:
   case Interval::LowercaseLatin:
-    number = 0;
+    toLatin(number, &number_string, gFalse);
+    break;
+  case Interval::UppercaseLatin:
+    toLatin(number, &number_string, gTrue);
     break;
   case Interval::None:
     break;
@@ -359,30 +228,3 @@ GBool PageLabelInfo::indexToLabel(int index, GooString *label)
 
   return gTrue;
 }
-
-#ifdef TEST
-int main(int argc, char *argv[])
-{
-  {
-    GooString str;
-    toRoman(177, &str, gFalse);
-    assert (str.cmp("clxxvii") == 0);
-  }
-
-  {
-    GooString roman("clxxvii");
-    assert (fromRoman(roman.getCString()) == 177);
-  }
-
-  {
-    GooString str;
-    toLatin(54, &str, gFalse);
-    assert (str.cmp("bbb") == 0);
-  }
-
-  {
-    GooString latin("ddd");
-    assert (fromLatin(latin.getCString()) == 56);
-  }
-}
-#endif
diff --git a/poppler/PageLabelInfo_p.h b/poppler/PageLabelInfo_p.h
new file mode 100644
index 00000000..d3cd89f9
--- /dev/null
+++ b/poppler/PageLabelInfo_p.h
@@ -0,0 +1,147 @@
+//========================================================================
+//
+// This file is under the GPLv2 or later license
+//
+// Copyright (C) 2005-2006 Kristian Høgsberg <krh@redhat.com>
+// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2011 Simon Kellner <kellner@kit.edu>
+// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+//
+// 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
+//
+//========================================================================
+
+/* http://mathworld.wolfram.com/RomanNumerals.html */
+
+#include "goo/GooString.h"
+
+static int fromRoman(const char *buffer) {
+  int digit_value, prev_digit_value, value;
+  int i;
+
+  prev_digit_value = INT_MAX;
+  value = 0;
+  for (i = 0; buffer[i] != '\0'; i++) {
+    switch (buffer[i]) {
+    case 'm':
+    case 'M':
+      digit_value = 1000;
+      break;
+    case 'd':
+    case 'D':
+      digit_value = 500;
+      break;
+    case 'c':
+    case 'C':
+      digit_value = 100;
+      break;
+    case 'l':
+    case 'L':
+      digit_value = 50;
+      break;
+    case 'x':
+    case 'X':
+      digit_value = 10;
+      break;
+    case 'v':
+    case 'V':
+      digit_value = 5;
+      break;
+    case 'i':
+    case 'I':
+      digit_value = 1;
+      break;
+    default:
+      return -1;
+    }
+
+    if (digit_value <= prev_digit_value)
+      value += digit_value;
+    else
+      value += digit_value - prev_digit_value * 2;
+    prev_digit_value = digit_value;
+  }
+
+  return value;
+}
+
+static void toRoman(int number, GooString *str, GBool uppercase) {
+  static const char uppercaseNumerals[] = "IVXLCDM";
+  static const char lowercaseNumerals[] = "ivxlcdm";
+  int divisor;
+  int i, j, k;
+  const char *wh;
+
+  if (uppercase)
+    wh = uppercaseNumerals;
+  else
+    wh = lowercaseNumerals;
+
+  divisor = 1000;
+  for (k = 3; k >= 0; k--) {
+    i = number / divisor;
+    number = number % divisor;
+
+    switch (i) {
+    case 0:
+      break;
+    case 5:
+      str->append(wh[2 * k + 1]);
+      break;
+    case 9:
+      str->append(wh[2 * k + 0]);
+      str->append(wh[ 2 * k + 2]);
+      break;
+    case 4:
+      str->append(wh[2 * k + 0]);
+      str->append(wh[2 * k + 1]);
+      break;
+    default:
+      if (i > 5) {
+       str->append(wh[2 * k + 1]);
+       i -= 5;
+      }
+      for (j = 0; j < i; j++) {
+       str->append(wh[2 * k + 0]);
+      }
+    }
+       
+    divisor = divisor / 10;
+  }
+}
+
+static int fromLatin(const char *buffer)
+{
+  int count;
+  const char *p;
+
+  for (p = buffer; *p; p++) {
+    if (*p != buffer[0])
+      return -1;
+  }
+
+  count = p - buffer;
+  if (buffer[0] >= 'a' && buffer[0] <= 'z')
+    return 26 * (count - 1) + buffer[0] - 'a' + 1;
+  if (buffer[0] >= 'A' && buffer[0] <= 'Z')
+    return 26 * (count - 1) + buffer[0] - 'A' + 1;
+
+  return -1;
+}
+
+static void toLatin(int number, GooString *str, GBool uppercase) {
+  char base, letter;
+  int i, count;
+
+  if (uppercase)
+    base = 'A';
+  else
+    base = 'a';
+
+  count = (number - 1) / 26 + 1;
+  letter = base + (number - 1) % 26;
+
+  for (i = 0; i < count; i++)
+    str->append(letter);
+}
diff --git a/poppler/PageTransition.cc b/poppler/PageTransition.cc
index 3fbd0de2..441634c0 100644
--- a/poppler/PageTransition.cc
+++ b/poppler/PageTransition.cc
@@ -1,6 +1,7 @@
 /* PageTransition.cc
  * Copyright (C) 2005, Net Integration Technologies, Inc.
  * Copyright (C) 2010, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
  *
  * 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
@@ -118,9 +119,9 @@ PageTransition::PageTransition (Object *trans) {
   }
   obj.free();
 
-  // get sacle
-  if (dict->lookup("SS", &obj)->isReal()) {
-    scale = obj.getReal();
+  // get scale
+  if (dict->lookup("SS", &obj)->isNum()) {
+    scale = obj.getNum();
   }
   obj.free();
 
diff --git a/poppler/Parser.cc b/poppler/Parser.cc
index 69304c4d..03705640 100644
--- a/poppler/Parser.cc
+++ b/poppler/Parser.cc
@@ -18,6 +18,7 @@
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -194,7 +195,8 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
   Object obj;
   BaseStream *baseStr;
   Stream *str;
-  Guint pos, endPos, length;
+  Goffset length;
+  Goffset pos, endPos;
 
   // get stream start position
   lexer->skipToNextLine();
@@ -206,7 +208,10 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
   // get length
   dict->dictLookup("Length", &obj, recursion);
   if (obj.isInt()) {
-    length = (Guint)obj.getInt();
+    length = obj.getInt();
+    obj.free();
+  } else if (obj.isInt64()) {
+    length = obj.getInt64();
     obj.free();
   } else {
     error(errSyntaxError, getPos(), "Bad 'Length' attribute in stream");
@@ -237,7 +242,7 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
 
   // refill token buffers and check for 'endstream'
   shift();  // kill '>>'
-  shift();  // kill 'stream'
+  shift("endstream");  // kill 'stream'
   if (buf1.isCmd("endstream")) {
     shift();
   } else {
@@ -246,11 +251,11 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
     if (xref) {
       // shift until we find the proper endstream or we change to another object or reach eof
       while (!buf1.isCmd("endstream") && xref->getNumEntry(lexer->getPos()) == objNum && !buf1.isEOF()) {
-        shift();
+        shift("endstream");
       }
       length = lexer->getPos() - pos;
       if (buf1.isCmd("endstream")) {
-        obj.initInt(length);
+        obj.initInt64(length);
         dict->dictSet("Length", &obj);
         obj.free();
       }
@@ -272,7 +277,7 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
   }
 
   // get filters
-  str = str->addFilters(dict);
+  str = str->addFilters(dict, recursion);
 
   return str;
 }
@@ -297,3 +302,27 @@ void Parser::shift(int objNum) {
   else
     lexer->getObj(&buf2, objNum);
 }
+
+void Parser::shift(const char *cmdA) {
+  if (inlineImg > 0) {
+    if (inlineImg < 2) {
+      ++inlineImg;
+    } else {
+      // in a damaged content stream, if 'ID' shows up in the middle
+      // of a dictionary, we need to reset
+      inlineImg = 0;
+    }
+  } else if (buf2.isCmd("ID")) {
+    lexer->skipChar();		// skip char after 'ID' command
+    inlineImg = 1;
+  }
+  buf1.free();
+  buf2.shallowCopy(&buf1);
+  if (inlineImg > 0) {
+    buf2.initNull();
+  } else if (buf1.isCmd(cmdA)) {
+    lexer->getObj(&buf2, -1);
+  } else {
+    lexer->getObj(&buf2, cmdA);
+  }
+}
diff --git a/poppler/Parser.h b/poppler/Parser.h
index 5ab40995..97027164 100644
--- a/poppler/Parser.h
+++ b/poppler/Parser.h
@@ -15,6 +15,8 @@
 //
 // Copyright (C) 2006, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -58,7 +60,7 @@ public:
   Stream *getStream() { return lexer->getStream(); }
 
   // Get current position in file.
-  int getPos() { return lexer->getPos(); }
+  Goffset getPos() { return lexer->getPos(); }
 
 private:
 
@@ -73,6 +75,7 @@ private:
 		     int objNum, int objGen, int recursion,
 		     GBool strict);
   void shift(int objNum = -1);
+  void shift(const char *cmdA);
 };
 
 #endif
diff --git a/poppler/PreScanOutputDev.cc b/poppler/PreScanOutputDev.cc
index 3a86d526..6a011266 100644
--- a/poppler/PreScanOutputDev.cc
+++ b/poppler/PreScanOutputDev.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2010, 2011 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2011 William Bader <williambader@hotmail.com>
-// Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
 //
 // To see a description of the changes please see the Changelog file that
@@ -52,7 +52,7 @@ PreScanOutputDev::PreScanOutputDev(PDFDoc *docA) {
 PreScanOutputDev::~PreScanOutputDev() {
 }
 
-void PreScanOutputDev::startPage(int /*pageNum*/, GfxState * /*state*/) {
+void PreScanOutputDev::startPage(int /*pageNum*/, GfxState * /*state*/, XRef * /*xref*/) {
 }
 
 void PreScanOutputDev::endPage() {
diff --git a/poppler/PreScanOutputDev.h b/poppler/PreScanOutputDev.h
index 5260a3b7..0fc9d3e3 100644
--- a/poppler/PreScanOutputDev.h
+++ b/poppler/PreScanOutputDev.h
@@ -16,7 +16,7 @@
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2011 William Bader <williambader@hotmail.com>
-// Copyright (C) 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
 //
 // To see a description of the changes please see the Changelog file that
@@ -76,7 +76,7 @@ public:
   //----- initialization and control
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
 
   // End a page.
   virtual void endPage();
diff --git a/poppler/SecurityHandler.cc b/poppler/SecurityHandler.cc
index a48449af..8b85e60d 100644
--- a/poppler/SecurityHandler.cc
+++ b/poppler/SecurityHandler.cc
@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -167,8 +168,8 @@ StandardSecurityHandler::StandardSecurityHandler(PDFDoc *docA,
   encryptDictA->dictLookup("OE", &ownerEncObj);
   encryptDictA->dictLookup("UE", &userEncObj);
   encryptDictA->dictLookup("P", &permObj);
-  if (permObj.isUint()) {
-      unsigned int permUint = permObj.getUint();
+  if (permObj.isInt64()) {
+      unsigned int permUint = permObj.getInt64();
       int perms = permUint - UINT_MAX - 1;
       permObj.free();
       permObj.initInt(perms);
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 6f2d4d6a..8c695025 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -15,12 +15,12 @@
 //
 // Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2006 Stefan Schweizer <genstef@gentoo.org>
-// Copyright (C) 2006-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009 William Bader <williambader@hotmail.com>
 // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
@@ -30,6 +30,8 @@
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
 // Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
 // Copyright (C) 2011, 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
+// Copyright (C) 2013 Li Junling <lijunling@sina.com>
 //
 // 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
@@ -1210,7 +1212,9 @@ SplashOutputDev::SplashOutputDev(SplashColorMode colorModeA,
 				 GBool reverseVideoA,
 				 SplashColorPtr paperColorA,
 				 GBool bitmapTopDownA,
-				 GBool allowAntialiasA) {
+				 GBool allowAntialiasA, 
+         SplashThinLineMode thinLineMode,
+         GBool overprintPreviewA) {
   colorMode = colorModeA;
   bitmapRowPad = bitmapRowPadA;
   bitmapTopDown = bitmapTopDownA;
@@ -1219,6 +1223,7 @@ SplashOutputDev::SplashOutputDev(SplashColorMode colorModeA,
   vectorAntialias = allowAntialias &&
 		      globalParams->getVectorAntialias() &&
 		      colorMode != splashModeMono1;
+  overprintPreview = overprintPreviewA;
   enableFreeTypeHinting = gFalse;
   enableSlightHinting = gFalse;
   setupScreenParams(72.0, 72.0);
@@ -1238,6 +1243,7 @@ SplashOutputDev::SplashOutputDev(SplashColorMode colorModeA,
 			    colorMode != splashModeMono1, bitmapTopDown);
   splash = new Splash(bitmap, vectorAntialias, &screenParams);
   splash->setMinLineWidth(globalParams->getMinLineWidth());
+  splash->setThinLineMode(thinLineMode);
   splash->clear(paperColor, 0);
 
   fontEngine = NULL;
@@ -1250,6 +1256,7 @@ SplashOutputDev::SplashOutputDev(SplashColorMode colorModeA,
   textClipPath = NULL;
   transpGroupStack = NULL;
   nestCount = 0;
+  xref = NULL;
 }
 
 void SplashOutputDev::setupScreenParams(double hDPI, double vDPI) {
@@ -1345,12 +1352,13 @@ void SplashOutputDev::startDoc(PDFDoc *docA) {
   nT3Fonts = 0;
 }
 
-void SplashOutputDev::startPage(int pageNum, GfxState *state) {
+void SplashOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) {
   int w, h;
   double *ctm;
   SplashCoord mat[6];
   SplashColor color;
 
+  xref = xrefA;
   if (state) {
     setupScreenParams(state->getHDPI(), state->getVDPI());
     w = (int)(state->getPageWidth() + 0.5);
@@ -1364,7 +1372,9 @@ void SplashOutputDev::startPage(int pageNum, GfxState *state) {
   } else {
     w = h = 1;
   }
+  SplashThinLineMode thinLineMode = splashThinLineDefault;
   if (splash) {
+    thinLineMode = splash->getThinLineMode();
     delete splash;
     splash = NULL;
   }
@@ -1375,8 +1385,15 @@ void SplashOutputDev::startPage(int pageNum, GfxState *state) {
     }
     bitmap = new SplashBitmap(w, h, bitmapRowPad, colorMode,
 			      colorMode != splashModeMono1, bitmapTopDown);
+    if (!bitmap->getDataPtr()) {
+      delete bitmap;
+      w = h = 1;
+      bitmap = new SplashBitmap(w, h, bitmapRowPad, colorMode,
+                              colorMode != splashModeMono1, bitmapTopDown);
+    }
   }
   splash = new Splash(bitmap, vectorAntialias, &screenParams);
+  splash->setThinLineMode(thinLineMode);
   splash->setMinLineWidth(globalParams->getMinLineWidth());
   if (state) {
     ctm = state->getCTM();
@@ -1667,7 +1684,7 @@ void SplashOutputDev::setOverprintMask(GfxColorSpace *colorSpace,
 		     grayIndexed);
 		return;
 	}
-  if (overprintFlag && globalParams->getOverprintPreview()) {
+  if (overprintFlag && overprintPreview) {
     mask = colorSpace->getOverprintMask();
     if (singleColor && overprintMode &&
 	colorSpace->getMode() == csDeviceCMYK) {
@@ -1840,7 +1857,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
 
   } else {
 
-    if (!(fontLoc = gfxFont->locateFont(doc->getXRef(), gFalse))) {
+    if (!(fontLoc = gfxFont->locateFont((xref) ? xref : doc->getXRef(), gFalse))) {
       error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
 	    gfxFont->getName() ? gfxFont->getName()->getCString()
 	                       : "(unnamed)");
@@ -1850,7 +1867,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
     // embedded font
     if (fontLoc->locType == gfxFontLocEmbedded) {
       // if there is an embedded font, read it to memory
-      tmpBuf = gfxFont->readEmbFontFile(doc->getXRef(), &tmpBufLen);
+      tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : doc->getXRef(), &tmpBufLen);
       if (! tmpBuf)
 	goto err2;
 
@@ -2581,6 +2598,7 @@ void SplashOutputDev::type3D1(GfxState *state, double wx, double wy,
     color[0] = 0xff;
   }
   splash->setMinLineWidth(globalParams->getMinLineWidth());
+  splash->setThinLineMode(splashThinLineDefault);
   splash->setFillPattern(new SplashSolidColor(color));
   splash->setStrokePattern(new SplashSolidColor(color));
   //~ this should copy other state from t3GlyphStack->origSplash?
@@ -2844,20 +2862,28 @@ GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine,
       break;
     case splashModeRGB8:
     case splashModeBGR8:
-      for (x = 0, q = colorLine; x < imgData->width; ++x, p += nComps) {
-	imgData->colorMap->getRGB(p, &rgb);
-	*q++ = colToByte(rgb.r);
-	*q++ = colToByte(rgb.g);
-	*q++ = colToByte(rgb.b);
+      if (imgData->colorMap->useRGBLine()) {
+	imgData->colorMap->getRGBLine(p, (Guchar *) colorLine, imgData->width);
+      } else {
+	for (x = 0, q = colorLine; x < imgData->width; ++x, p += nComps) {
+	  imgData->colorMap->getRGB(p, &rgb);
+	  *q++ = colToByte(rgb.r);
+	  *q++ = colToByte(rgb.g);
+	  *q++ = colToByte(rgb.b);
+	}
       }
       break;
     case splashModeXBGR8:
-      for (x = 0, q = colorLine; x < imgData->width; ++x, p += nComps) {
-	imgData->colorMap->getRGB(p, &rgb);
-	*q++ = colToByte(rgb.r);
-	*q++ = colToByte(rgb.g);
-	*q++ = colToByte(rgb.b);
-	*q++ = 255;
+      if (imgData->colorMap->useRGBLine()) {
+	imgData->colorMap->getRGBXLine(p, (Guchar *) colorLine, imgData->width);
+      } else {
+	for (x = 0, q = colorLine; x < imgData->width; ++x, p += nComps) {
+	  imgData->colorMap->getRGB(p, &rgb);
+	  *q++ = colToByte(rgb.r);
+	  *q++ = colToByte(rgb.g);
+	  *q++ = colToByte(rgb.b);
+	  *q++ = 255;
+	}
       }
       break;
 #if SPLASH_CMYK
@@ -3385,7 +3411,7 @@ void SplashOutputDev::drawMaskedImage(GfxState *state, Object *ref,
   if (maskWidth > width || maskHeight > height) {
     decodeLow.initInt(maskInvert ? 0 : 1);
     decodeHigh.initInt(maskInvert ? 1 : 0);
-    maskDecode.initArray(doc->getXRef());
+    maskDecode.initArray((xref) ? xref : doc->getXRef());
     maskDecode.arrayAdd(&decodeLow);
     maskDecode.arrayAdd(&decodeHigh);
     maskColorMap = new GfxImageColorMap(1, &maskDecode,
@@ -3776,7 +3802,7 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
   transpGroup->ty = ty;
   transpGroup->blendingColorSpace = blendingColorSpace;
   transpGroup->isolated = isolated;
-  transpGroup->shape = (knockout) ? SplashBitmap::copy(bitmap) : NULL;
+  transpGroup->shape = (knockout && !isolated) ? SplashBitmap::copy(bitmap) : NULL;
   transpGroup->knockout = gFalse; 
   transpGroup->knockoutOpacity = 1.0;
   transpGroup->next = transpGroupStack;
@@ -3816,6 +3842,7 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
 			    bitmapTopDown, bitmap->getSeparationList());
   splash = new Splash(bitmap, vectorAntialias,
 		      transpGroup->origSplash->getScreen());
+  splash->setThinLineMode(transpGroup->origSplash->getThinLineMode());
   splash->setMinLineWidth(globalParams->getMinLineWidth());
   //~ Acrobat apparently copies at least the fill and stroke colors, and
   //~ maybe other state(?) -- but not the clipping path (and not sure
@@ -3837,7 +3864,7 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
     splash->setInNonIsolatedGroup(shape, tx, ty);
   }
   transpGroup->tBitmap = bitmap;
-  state->shiftCTM(-tx, -ty);
+  state->shiftCTMAndClip(-tx, -ty);
   updateCTM(state, 0, 0, 0, 0, 0, 0);
   ++nestCount;
 }
@@ -3849,7 +3876,7 @@ void SplashOutputDev::endTransparencyGroup(GfxState *state) {
   bitmap = transpGroupStack->origBitmap;
   colorMode = bitmap->getMode();
   splash = transpGroupStack->origSplash;
-  state->shiftCTM(transpGroupStack->tx, transpGroupStack->ty);
+  state->shiftCTMAndClip(transpGroupStack->tx, transpGroupStack->ty);
   updateCTM(state, 0, 0, 0, 0, 0, 0);
 }
 
@@ -3975,7 +4002,12 @@ void SplashOutputDev::setSoftMask(GfxState *state, double *bbox,
   for (y = 0; y < yMax; ++y) {
     for (x = 0; x < xMax; ++x) {
       if (alpha) {
-	p[x] = tBitmap->getAlpha(x, y);
+	if (transferFunc) {
+	  lum = tBitmap->getAlpha(x, y) / 255.0;
+	  transferFunc->transform(&lum, &lum2);
+	  p[x] = (int)(lum2 * 255.0 + 0.5);
+	} else 
+	  p[x] = tBitmap->getAlpha(x, y);
       } else {
 	  tBitmap->getPixel(x, y, color);
 	  // convert to luminosity
@@ -4075,7 +4107,7 @@ void SplashOutputDev::setFreeTypeHinting(GBool enable, GBool enableSlightHinting
   enableSlightHinting = enableSlightHintingA;
 }
 
-GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *catalog, Object *str,
+GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *catalog, Object *str,
 					double *ptm, int paintType, int /*tilingType*/, Dict *resDict,
 					double *mat, double *bbox,
 					int x0, int y0, int x1, int y1,
@@ -4109,8 +4141,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *ca
   state->concatCTM(1, 0, 0, 1, bbox[0], bbox[1]);
   ctm = state->getCTM();
   for (i = 0; i < 6; ++i) {
-    if (!isfinite(ctm[i]))
+    if (!isfinite(ctm[i])) {
+      state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
       return gFalse;
+    }
   }
   matc[4] = x0 * xStep * ctm[0] + y0 * yStep * ctm[2] + ctm[4];
   matc[5] = x0 * xStep * ctm[1] + y0 * yStep * ctm[3] + ctm[5];
@@ -4152,8 +4186,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *ca
     repeatX = x1 - x0;
     repeatY = y1 - y0;
   } else {
-    if ((unsigned long) result_width * result_height > 0x800000L)
+    if ((unsigned long) result_width * result_height > 0x800000L) {
+      state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
       return gFalse;
+    }
     while(fabs(kx) > 16384 || fabs(ky) > 16384) {
       // limit pattern bitmap size
       m1.m[0] /= 2;
@@ -4184,34 +4220,39 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *ca
   matc[2] = ctm[2];
   matc[3] = ctm[3];
 
-  if (surface_width == 0 || surface_height == 0)
+  if (surface_width == 0 || surface_height == 0) {
+    state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
     return gFalse;
+  }
   m1.transform(bbox[0], bbox[1], &kx, &ky);
   m1.m[4] = -kx;
   m1.m[5] = -ky;
 
   bitmap = new SplashBitmap(surface_width, surface_height, 1,
                             (paintType == 1) ? colorMode : splashModeMono8, gTrue);
-  memset(bitmap->getAlphaPtr(), 0, bitmap->getWidth() * bitmap->getHeight());
+  splash = new Splash(bitmap, gTrue);
   if (paintType == 2) {
+    SplashColor clearColor;
 #if SPLASH_CMYK
-    memset(bitmap->getDataPtr(), 
-      (colorMode == splashModeCMYK8 || colorMode == splashModeDeviceN8) ? 0x00 : 0xFF, 
-      bitmap->getRowSize() * bitmap->getHeight());
+    clearColor[0] = (colorMode == splashModeCMYK8 || colorMode == splashModeDeviceN8) ? 0x00 : 0xFF;
 #else
-    memset(bitmap->getDataPtr(), 0xFF, bitmap->getRowSize() * bitmap->getHeight());
+    clearColor[0] = 0xFF;
 #endif
+    splash->clear(clearColor, 0);
+  } else {
+    splash->clear(paperColor, 0);
   }
-  splash = new Splash(bitmap, gTrue);
+  splash->setThinLineMode(formerSplash->getThinLineMode());
   splash->setMinLineWidth(globalParams->getMinLineWidth());
 
   box.x1 = bbox[0]; box.y1 = bbox[1];
   box.x2 = bbox[2]; box.y2 = bbox[3];
-  gfx = new Gfx(doc, this, resDict, &box, NULL);
+  gfx = new Gfx(doc, this, resDict, &box, NULL, NULL, NULL, gfxA->getXRef());
   // set pattern transformation matrix
   gfx->getState()->setCTM(m1.m[0], m1.m[1], m1.m[2], m1.m[3], m1.m[4], m1.m[5]);
   updateCTM(gfx->getState(), m1.m[0], m1.m[1], m1.m[2], m1.m[3], m1.m[4], m1.m[5]);
   gfx->display(str);
+  delete splash;
   splash = formerSplash;
   TilingSplashOutBitmap imgData;
   imgData.bitmap = bitmap;
@@ -4241,7 +4282,20 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx1, Catalog *ca
   matc[1] = ctm[1];
   matc[2] = ctm[2];
   matc[3] = ctm[3];
-  retValue = splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc, gTrue) == splashOk;
+  GBool minorAxisZero = matc[1] == 0 && matc[2] == 0;
+  if (matc[0] > 0 && minorAxisZero && matc[3] > 0) {
+    // draw the tiles
+    for (int y = 0; y < imgData.repeatY; ++y) {
+      for (int x = 0; x < imgData.repeatX; ++x) {
+        x0 = splashFloor(matc[4]) + x * tBitmap->getWidth();
+        y0 = splashFloor(matc[5]) + y * tBitmap->getHeight();
+        splash->blitImage(tBitmap, gTrue, x0, y0);
+      }
+    }
+    retValue = gTrue;
+  } else {
+    retValue = splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc, gFalse, gTrue) == splashOk;
+  }
   delete tBitmap;
   delete gfx;
   return retValue;
diff --git a/poppler/SplashOutputDev.h b/poppler/SplashOutputDev.h
index de7934d4..ce1d50d0 100644
--- a/poppler/SplashOutputDev.h
+++ b/poppler/SplashOutputDev.h
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
-// Copyright (C) 2009-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
@@ -40,6 +40,7 @@
 #include "poppler-config.h"
 #include "OutputDev.h"
 #include "GfxState.h"
+#include "GlobalParams.h"
 
 class PDFDoc;
 class Gfx8BitFont;
@@ -163,7 +164,9 @@ public:
   SplashOutputDev(SplashColorMode colorModeA, int bitmapRowPadA,
 		  GBool reverseVideoA, SplashColorPtr paperColorA,
 		  GBool bitmapTopDownA = gTrue,
-		  GBool allowAntialiasA = gTrue);
+		  GBool allowAntialiasA = gTrue,
+		  SplashThinLineMode thinLineMode = splashThinLineDefault,
+      GBool overprintPreviewA = globalParams->getOverprintPreview());
 
   // Destructor.
   virtual ~SplashOutputDev();
@@ -195,7 +198,7 @@ public:
   //----- initialization and control
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
 
   // End a page.
   virtual void endPage();
@@ -258,7 +261,6 @@ public:
 			       CharCode code, Unicode *u, int uLen);
   virtual void endType3Char(GfxState *state);
   virtual void beginTextObject(GfxState *state);
-  virtual GBool deviceHasTextClip(GfxState *state) { return textClipPath; }
   virtual void endTextObject(GfxState *state);
 
   //----- image drawing
@@ -390,6 +392,7 @@ private:
   GBool bitmapUpsideDown;
   GBool allowAntialias;
   GBool vectorAntialias;
+  GBool overprintPreview;
   GBool enableFreeTypeHinting;
   GBool enableSlightHinting;
   GBool reverseVideo;		// reverse video mode
@@ -399,6 +402,7 @@ private:
   GBool skipRotatedText;
 
   PDFDoc *doc;			// the current document
+  XRef *xref;       // the xref of the current document
 
   SplashBitmap *bitmap;
   Splash *splash;
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index 4cb3326e..41cb8c1d 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -23,10 +23,13 @@
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2010 Tomas Hoger <thoger@redhat.com>
 // Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com>
-// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Oliver Sander <sander@mi.fu-berlin.de>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Even Rouault <even.rouault@mines-paris.org>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Pino Toscano <pino@kde.org>
 //
 // 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
@@ -86,15 +89,38 @@ static GBool setDJSYSFLAGS = gFalse;
 #endif
 #endif
 
+#if MULTITHREADED
+#  define streamLocker()   MutexLocker locker(&mutex)
+#else
+#  define streamLocker()
+#endif
 //------------------------------------------------------------------------
 // Stream (base class)
 //------------------------------------------------------------------------
 
 Stream::Stream() {
   ref = 1;
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
 }
 
 Stream::~Stream() {
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
+}
+
+int Stream::incRef() {
+  streamLocker();
+  ++ref;
+  return ref;
+}
+
+int Stream::decRef() {
+  streamLocker();
+  --ref;
+  return ref;
 }
 
 void Stream::close() {
@@ -139,34 +165,34 @@ GooString *Stream::getPSFilter(int psLevel, const char *indent) {
   return new GooString();
 }
 
-Stream *Stream::addFilters(Object *dict) {
+Stream *Stream::addFilters(Object *dict, int recursion) {
   Object obj, obj2;
   Object params, params2;
   Stream *str;
   int i;
 
   str = this;
-  dict->dictLookup("Filter", &obj);
+  dict->dictLookup("Filter", &obj, recursion);
   if (obj.isNull()) {
     obj.free();
     dict->dictLookup("F", &obj);
   }
-  dict->dictLookup("DecodeParms", &params);
+  dict->dictLookup("DecodeParms", &params, recursion);
   if (params.isNull()) {
     params.free();
     dict->dictLookup("DP", &params);
   }
   if (obj.isName()) {
-    str = makeFilter(obj.getName(), str, &params);
+    str = makeFilter(obj.getName(), str, &params, recursion, dict);
   } else if (obj.isArray()) {
     for (i = 0; i < obj.arrayGetLength(); ++i) {
-      obj.arrayGet(i, &obj2);
+      obj.arrayGet(i, &obj2, recursion);
       if (params.isArray())
-	params.arrayGet(i, &params2);
+	params.arrayGet(i, &params2, recursion);
       else
 	params2.initNull();
       if (obj2.isName()) {
-	str = makeFilter(obj2.getName(), str, &params2);
+	str = makeFilter(obj2.getName(), str, &params2, recursion);
       } else {
 	error(errSyntaxError, getPos(), "Bad filter name");
 	str = new EOFStream(str);
@@ -183,7 +209,7 @@ Stream *Stream::addFilters(Object *dict) {
   return str;
 }
 
-Stream *Stream::makeFilter(char *name, Stream *str, Object *params) {
+Stream *Stream::makeFilter(char *name, Stream *str, Object *params, int recursion, Object *dict) {
   int pred;			// parameters
   int colors;
   int bits;
@@ -205,23 +231,23 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params) {
     bits = 8;
     early = 1;
     if (params->isDict()) {
-      params->dictLookup("Predictor", &obj);
+      params->dictLookup("Predictor", &obj, recursion);
       if (obj.isInt())
 	pred = obj.getInt();
       obj.free();
-      params->dictLookup("Columns", &obj);
+      params->dictLookup("Columns", &obj, recursion);
       if (obj.isInt())
 	columns = obj.getInt();
       obj.free();
-      params->dictLookup("Colors", &obj);
+      params->dictLookup("Colors", &obj, recursion);
       if (obj.isInt())
 	colors = obj.getInt();
       obj.free();
-      params->dictLookup("BitsPerComponent", &obj);
+      params->dictLookup("BitsPerComponent", &obj, recursion);
       if (obj.isInt())
 	bits = obj.getInt();
       obj.free();
-      params->dictLookup("EarlyChange", &obj);
+      params->dictLookup("EarlyChange", &obj, recursion);
       if (obj.isInt())
 	early = obj.getInt();
       obj.free();
@@ -238,37 +264,37 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params) {
     endOfBlock = gTrue;
     black = gFalse;
     if (params->isDict()) {
-      params->dictLookup("K", &obj);
+      params->dictLookup("K", &obj, recursion);
       if (obj.isInt()) {
 	encoding = obj.getInt();
       }
       obj.free();
-      params->dictLookup("EndOfLine", &obj);
+      params->dictLookup("EndOfLine", &obj, recursion);
       if (obj.isBool()) {
 	endOfLine = obj.getBool();
       }
       obj.free();
-      params->dictLookup("EncodedByteAlign", &obj);
+      params->dictLookup("EncodedByteAlign", &obj, recursion);
       if (obj.isBool()) {
 	byteAlign = obj.getBool();
       }
       obj.free();
-      params->dictLookup("Columns", &obj);
+      params->dictLookup("Columns", &obj, recursion);
       if (obj.isInt()) {
 	columns = obj.getInt();
       }
       obj.free();
-      params->dictLookup("Rows", &obj);
+      params->dictLookup("Rows", &obj, recursion);
       if (obj.isInt()) {
 	rows = obj.getInt();
       }
       obj.free();
-      params->dictLookup("EndOfBlock", &obj);
+      params->dictLookup("EndOfBlock", &obj, recursion);
       if (obj.isBool()) {
 	endOfBlock = obj.getBool();
       }
       obj.free();
-      params->dictLookup("BlackIs1", &obj);
+      params->dictLookup("BlackIs1", &obj, recursion);
       if (obj.isBool()) {
 	black = obj.getBool();
       }
@@ -279,31 +305,31 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params) {
   } else if (!strcmp(name, "DCTDecode") || !strcmp(name, "DCT")) {
     colorXform = -1;
     if (params->isDict()) {
-      if (params->dictLookup("ColorTransform", &obj)->isInt()) {
+      if (params->dictLookup("ColorTransform", &obj, recursion)->isInt()) {
 	colorXform = obj.getInt();
       }
       obj.free();
     }
-    str = new DCTStream(str, colorXform);
+    str = new DCTStream(str, colorXform, dict, recursion);
   } else if (!strcmp(name, "FlateDecode") || !strcmp(name, "Fl")) {
     pred = 1;
     columns = 1;
     colors = 1;
     bits = 8;
     if (params->isDict()) {
-      params->dictLookup("Predictor", &obj);
+      params->dictLookup("Predictor", &obj, recursion);
       if (obj.isInt())
 	pred = obj.getInt();
       obj.free();
-      params->dictLookup("Columns", &obj);
+      params->dictLookup("Columns", &obj, recursion);
       if (obj.isInt())
 	columns = obj.getInt();
       obj.free();
-      params->dictLookup("Colors", &obj);
+      params->dictLookup("Colors", &obj, recursion);
       if (obj.isInt())
 	colors = obj.getInt();
       obj.free();
-      params->dictLookup("BitsPerComponent", &obj);
+      params->dictLookup("BitsPerComponent", &obj, recursion);
       if (obj.isInt())
 	bits = obj.getInt();
       obj.free();
@@ -311,12 +337,18 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params) {
     str = new FlateStream(str, pred, columns, colors, bits);
   } else if (!strcmp(name, "JBIG2Decode")) {
     if (params->isDict()) {
-      params->dictLookup("JBIG2Globals", &globals);
+      params->dictLookup("JBIG2Globals", &globals, recursion);
     }
     str = new JBIG2Stream(str, &globals);
     globals.free();
   } else if (!strcmp(name, "JPXDecode")) {
     str = new JPXStream(str);
+  } else if (!strcmp(name, "Crypt")) {
+    if (str->getKind() == strCrypt) {
+      str = str->getBaseStream();
+    } else {
+      error(errSyntaxError, getPos(), "Can't revert non decrypt streams");
+    }
   } else {
     error(errSyntaxError, getPos(), "Unknown filter '{0:s}'", name);
     str = new EOFStream(str);
@@ -339,7 +371,7 @@ OutStream::~OutStream ()
 //------------------------------------------------------------------------
 // FileOutStream
 //------------------------------------------------------------------------
-FileOutStream::FileOutStream (FILE* fa, Guint startA)
+FileOutStream::FileOutStream (FILE* fa, Goffset startA)
 {
   f = fa;
   start = startA;
@@ -355,9 +387,9 @@ void FileOutStream::close ()
 
 }
 
-int FileOutStream::getPos ()
+Goffset FileOutStream::getPos ()
 {
-  return ftell(f);
+  return Gftell(f);
 }
 
 void FileOutStream::put (char c)
@@ -378,7 +410,7 @@ void FileOutStream::printf(const char *format, ...)
 // BaseStream
 //------------------------------------------------------------------------
 
-BaseStream::BaseStream(Object *dictA, Guint lengthA) {
+BaseStream::BaseStream(Object *dictA, Goffset lengthA) {
   dict = *dictA;
   length = lengthA;
 }
@@ -402,7 +434,7 @@ void FilterStream::close() {
   str->close();
 }
 
-void FilterStream::setPos(Guint pos, int dir) {
+void FilterStream::setPos(Goffset pos, int dir) {
   error(errInternal, -1, "Internal: called setPos() on FilterStream");
 }
 
@@ -421,7 +453,6 @@ ImageStream::ImageStream(Stream *strA, int widthA, int nCompsA, int nBitsA) {
   nVals = width * nComps;
   inputLineSize = (nVals * nBits + 7) >> 3;
   if (nBits <= 0 || nVals > INT_MAX / nBits - 7) {
-    // force a call to gmallocn(-1,...), which will throw an exception
     inputLineSize = -1;
   }
   inputLine = (Guchar *)gmallocn_checkoverflow(inputLineSize, sizeof(char));
@@ -478,6 +509,10 @@ Guchar *ImageStream::getLine() {
   int c;
   int i;
   Guchar *p;
+  
+  if (unlikely(inputLine == NULL)) {
+      return NULL;
+  }
  
   int readChars = str->doGetChars(inputLineSize, inputLine);
   for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = EOF;
@@ -729,11 +764,11 @@ GBool StreamPredictor::getNextLine() {
 // FileStream
 //------------------------------------------------------------------------
 
-FileStream::FileStream(FILE *fA, Guint startA, GBool limitedA,
-		       Guint lengthA, Object *dictA):
+FileStream::FileStream(GooFile* fileA, Goffset startA, GBool limitedA,
+		       Goffset lengthA, Object *dictA):
     BaseStream(dictA, lengthA) {
-  f = fA;
-  start = startA;
+  file = fileA;
+  offset = start = startA;
   limited = limitedA;
   length = lengthA;
   bufPtr = bufEnd = buf;
@@ -746,22 +781,18 @@ FileStream::~FileStream() {
   close();
 }
 
-Stream *FileStream::makeSubStream(Guint startA, GBool limitedA,
-				  Guint lengthA, Object *dictA) {
-  return new FileStream(f, startA, limitedA, lengthA, dictA);
+BaseStream *FileStream::copy() {
+  return new FileStream(file, start, limited, length, &dict);
+}
+
+Stream *FileStream::makeSubStream(Goffset startA, GBool limitedA,
+				  Goffset lengthA, Object *dictA) {
+  return new FileStream(file, startA, limitedA, lengthA, dictA);
 }
 
 void FileStream::reset() {
-#if HAVE_FSEEKO
-  savePos = (Guint)ftello(f);
-  fseeko(f, start, SEEK_SET);
-#elif HAVE_FSEEK64
-  savePos = (Guint)ftell64(f);
-  fseek64(f, start, SEEK_SET);
-#else
-  savePos = (Guint)ftell(f);
-  fseek(f, start, SEEK_SET);
-#endif
+  savePos = offset;
+  offset = start;
   saved = gTrue;
   bufPtr = bufEnd = buf;
   bufPos = start;
@@ -769,13 +800,7 @@ void FileStream::reset() {
 
 void FileStream::close() {
   if (saved) {
-#if HAVE_FSEEKO
-    fseeko(f, savePos, SEEK_SET);
-#elif HAVE_FSEEK64
-    fseek64(f, savePos, SEEK_SET);
-#else
-    fseek(f, savePos, SEEK_SET);
-#endif
+    offset = savePos;
     saved = gFalse;
   }
 }
@@ -793,7 +818,8 @@ GBool FileStream::fillBuf() {
   } else {
     n = fileStreamBufSize;
   }
-  n = fread(buf, 1, n, f);
+  n = file->read(buf, n, offset);
+  offset += n;
   bufEnd = buf + n;
   if (bufPtr >= bufEnd) {
     return gFalse;
@@ -801,46 +827,22 @@ GBool FileStream::fillBuf() {
   return gTrue;
 }
 
-void FileStream::setPos(Guint pos, int dir) {
-  Guint size;
+void FileStream::setPos(Goffset pos, int dir) {
+  Goffset size;
 
   if (dir >= 0) {
-#if HAVE_FSEEKO
-    fseeko(f, pos, SEEK_SET);
-#elif HAVE_FSEEK64
-    fseek64(f, pos, SEEK_SET);
-#else
-    fseek(f, pos, SEEK_SET);
-#endif
-    bufPos = pos;
+    offset = bufPos = pos;
   } else {
-#if HAVE_FSEEKO
-    fseeko(f, 0, SEEK_END);
-    size = (Guint)ftello(f);
-#elif HAVE_FSEEK64
-    fseek64(f, 0, SEEK_END);
-    size = (Guint)ftell64(f);
-#else
-    fseek(f, 0, SEEK_END);
-    size = (Guint)ftell(f);
-#endif
+    size = file->size();
     if (pos > size)
-      pos = (Guint)size;
-#if HAVE_FSEEKO
-    fseeko(f, -(int)pos, SEEK_END);
-    bufPos = (Guint)ftello(f);
-#elif HAVE_FSEEK64
-    fseek64(f, -(int)pos, SEEK_END);
-    bufPos = (Guint)ftell64(f);
-#else
-    fseek(f, -(int)pos, SEEK_END);
-    bufPos = (Guint)ftell(f);
-#endif
+      pos = size;
+    offset = size - pos;
+    bufPos = offset;
   }
   bufPtr = bufEnd = buf;
 }
 
-void FileStream::moveStart(int delta) {
+void FileStream::moveStart(Goffset delta) {
   start += delta;
   bufPtr = bufEnd = buf;
   bufPos = start;
@@ -850,8 +852,8 @@ void FileStream::moveStart(int delta) {
 // CachedFileStream
 //------------------------------------------------------------------------
 
-CachedFileStream::CachedFileStream(CachedFile *ccA, Guint startA,
-        GBool limitedA, Guint lengthA, Object *dictA)
+CachedFileStream::CachedFileStream(CachedFile *ccA, Goffset startA,
+        GBool limitedA, Goffset lengthA, Object *dictA)
   : BaseStream(dictA, lengthA)
 {
   cc = ccA;
@@ -870,8 +872,13 @@ CachedFileStream::~CachedFileStream()
   cc->decRefCnt();
 }
 
-Stream *CachedFileStream::makeSubStream(Guint startA, GBool limitedA,
-        Guint lengthA, Object *dictA)
+BaseStream *CachedFileStream::copy() {
+  cc->incRefCnt();
+  return new CachedFileStream(cc, start, limited, length, &dict);
+}
+
+Stream *CachedFileStream::makeSubStream(Goffset startA, GBool limitedA,
+        Goffset lengthA, Object *dictA)
 {
   cc->incRefCnt();
   return new CachedFileStream(cc, startA, limitedA, lengthA, dictA);
@@ -909,7 +916,7 @@ GBool CachedFileStream::fillBuf()
   } else {
     n = cachedStreamBufSize - (bufPos % cachedStreamBufSize);
   }
-  cc->read(buf, 1, n);
+  n = cc->read(buf, 1, n);
   bufEnd = buf + n;
   if (bufPtr >= bufEnd) {
     return gFalse;
@@ -917,7 +924,7 @@ GBool CachedFileStream::fillBuf()
   return gTrue;
 }
 
-void CachedFileStream::setPos(Guint pos, int dir)
+void CachedFileStream::setPos(Goffset pos, int dir)
 {
   Guint size;
 
@@ -938,7 +945,7 @@ void CachedFileStream::setPos(Guint pos, int dir)
   bufPtr = bufEnd = buf;
 }
 
-void CachedFileStream::moveStart(int delta)
+void CachedFileStream::moveStart(Goffset delta)
 {
   start += delta;
   bufPtr = bufEnd = buf;
@@ -949,7 +956,7 @@ void CachedFileStream::moveStart(int delta)
 // MemStream
 //------------------------------------------------------------------------
 
-MemStream::MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA):
+MemStream::MemStream(char *bufA, Goffset startA, Goffset lengthA, Object *dictA):
     BaseStream(dictA, lengthA) {
   buf = bufA;
   start = startA;
@@ -965,10 +972,14 @@ MemStream::~MemStream() {
   }
 }
 
-Stream *MemStream::makeSubStream(Guint startA, GBool limited,
-				 Guint lengthA, Object *dictA) {
+BaseStream *MemStream::copy() {
+  return new MemStream(buf, start, length, &dict);
+}
+
+Stream *MemStream::makeSubStream(Goffset startA, GBool limited,
+				 Goffset lengthA, Object *dictA) {
   MemStream *subStr;
-  Guint newLength;
+  Goffset newLength;
 
   if (!limited || startA + lengthA > start + length) {
     newLength = start + length - startA;
@@ -1002,7 +1013,7 @@ int MemStream::getChars(int nChars, Guchar *buffer) {
   return n;
 }
 
-void MemStream::setPos(Guint pos, int dir) {
+void MemStream::setPos(Goffset pos, int dir) {
   Guint i;
 
   if (dir >= 0) {
@@ -1018,7 +1029,7 @@ void MemStream::setPos(Guint pos, int dir) {
   bufPtr = buf + i;
 }
 
-void MemStream::moveStart(int delta) {
+void MemStream::moveStart(Goffset delta) {
   start += delta;
   length -= delta;
   bufPtr = buf + start;
@@ -1029,7 +1040,7 @@ void MemStream::moveStart(int delta) {
 //------------------------------------------------------------------------
 
 EmbedStream::EmbedStream(Stream *strA, Object *dictA,
-			 GBool limitedA, Guint lengthA):
+			 GBool limitedA, Goffset lengthA):
     BaseStream(dictA, lengthA) {
   str = strA;
   limited = limitedA;
@@ -1039,8 +1050,13 @@ EmbedStream::EmbedStream(Stream *strA, Object *dictA,
 EmbedStream::~EmbedStream() {
 }
 
-Stream *EmbedStream::makeSubStream(Guint start, GBool limitedA,
-				   Guint lengthA, Object *dictA) {
+BaseStream *EmbedStream::copy() {
+  error(errInternal, -1, "Called copy() on EmbedStream");
+  return NULL;
+}
+
+Stream *EmbedStream::makeSubStream(Goffset start, GBool limitedA,
+				   Goffset lengthA, Object *dictA) {
   error(errInternal, -1, "Called makeSubStream() on EmbedStream");
   return NULL;
 }
@@ -1064,22 +1080,22 @@ int EmbedStream::getChars(int nChars, Guchar *buffer) {
   if (nChars <= 0) {
     return 0;
   }
-  if (limited && length < (Guint)nChars) {
-    nChars = (int)length;
+  if (limited && length < nChars) {
+    nChars = length;
   }
   return str->doGetChars(nChars, buffer);
 }
 
-void EmbedStream::setPos(Guint pos, int dir) {
+void EmbedStream::setPos(Goffset pos, int dir) {
   error(errInternal, -1, "Internal: called setPos() on EmbedStream");
 }
 
-Guint EmbedStream::getStart() {
+Goffset EmbedStream::getStart() {
   error(errInternal, -1, "Internal: called getStart() on EmbedStream");
   return 0;
 }
 
-void EmbedStream::moveStart(int delta) {
+void EmbedStream::moveStart(Goffset delta) {
   error(errInternal, -1, "Internal: called moveStart() on EmbedStream");
 }
 
@@ -2410,7 +2426,7 @@ static const int dctZigZag[64] = {
   63
 };
 
-DCTStream::DCTStream(Stream *strA, int colorXformA):
+DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion):
     FilterStream(strA) {
   int i, j;
 
diff --git a/poppler/Stream.h b/poppler/Stream.h
index 20b5fd6d..9b40fd16 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -20,8 +20,12 @@
 // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com>
-// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
+// Copyright (C) 2013 Pino Toscano <pino@kde.org>
 //
 // 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
@@ -39,7 +43,9 @@
 #include <stdio.h>
 #include "goo/gtypes.h"
 #include "Object.h"
+#include "goo/GooMutex.h"
 
+class GooFile;
 class BaseStream;
 class CachedFile;
 
@@ -57,7 +63,8 @@ enum StreamKind {
   strFlate,
   strJBIG2,
   strJPX,
-  strWeird			// internal-use stream types
+  strWeird,			// internal-use stream types
+  strCrypt			// internal-use to detect decode streams
 };
 
 enum StreamColorSpaceMode {
@@ -98,8 +105,8 @@ public:
   virtual ~Stream();
 
   // Reference counting.
-  int incRef() { return ++ref; }
-  int decRef() { return --ref; }
+  int incRef();
+  int decRef();
 
   // Get kind of stream.
   virtual StreamKind getKind() = 0;
@@ -183,12 +190,12 @@ public:
   virtual char *getLine(char *buf, int size);
 
   // Get current position in file.
-  virtual int getPos() = 0;
+  virtual Goffset getPos() = 0;
 
   // Go to a position in the stream.  If <dir> is negative, the
   // position is from the end of the file; otherwise the position is
   // from the start of the file.
-  virtual void setPos(Guint pos, int dir = 0) = 0;
+  virtual void setPos(Goffset pos, int dir = 0) = 0;
 
   // Get PostScript command for the filter(s).
   virtual GooString *getPSFilter(int psLevel, const char *indent);
@@ -218,15 +225,18 @@ public:
 
   // Add filters to this stream according to the parameters in <dict>.
   // Returns the new stream.
-  Stream *addFilters(Object *dict);
+  Stream *addFilters(Object *dict, int recursion = 0);
 
 private:
   virtual GBool hasGetChars() { return false; }
   virtual int getChars(int nChars, Guchar *buffer);
 
-  Stream *makeFilter(char *name, Stream *str, Object *params);
+  Stream *makeFilter(char *name, Stream *str, Object *params, int recursion = 0, Object *dict = NULL);
 
   int ref;			// reference count
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 };
 
 
@@ -251,14 +261,12 @@ public:
   virtual void close() = 0;
 
   // Return position in stream
-  virtual int getPos() = 0;
+  virtual Goffset getPos() = 0;
 
   // Put a char in the stream
   virtual void put (char c) = 0;
 
-  //FIXME
-  // Printf-like function                         2,3 because the first arg is class instance ?
-  virtual void printf (const char *format, ...) = 0 ; //__attribute__((format(printf, 2,3))) = 0;
+  virtual void printf (const char *format, ...) GCC_PRINTF_FORMAT(2,3) = 0;
 
 private:
   int ref; // reference count
@@ -270,20 +278,20 @@ private:
 //------------------------------------------------------------------------
 class FileOutStream : public OutStream {
 public:
-  FileOutStream (FILE* fa, Guint startA);
+  FileOutStream (FILE* fa, Goffset startA);
 
   virtual ~FileOutStream ();
 
   virtual void close();
 
-  virtual int getPos();
+  virtual Goffset getPos();
 
   virtual void put (char c);
 
   virtual void printf (const char *format, ...);
 private:
   FILE *f;
-  Guint start;
+  Goffset start;
 
 };
 
@@ -297,28 +305,26 @@ private:
 class BaseStream: public Stream {
 public:
 
-  BaseStream(Object *dictA, Guint lengthA);
+  BaseStream(Object *dictA, Goffset lengthA);
   virtual ~BaseStream();
-  virtual Stream *makeSubStream(Guint start, GBool limited,
-				Guint length, Object *dict) = 0;
-  virtual void setPos(Guint pos, int dir = 0) = 0;
+  virtual BaseStream *copy() = 0;
+  virtual Stream *makeSubStream(Goffset start, GBool limited,
+				Goffset length, Object *dict) = 0;
+  virtual void setPos(Goffset pos, int dir = 0) = 0;
   virtual GBool isBinary(GBool last = gTrue) { return last; }
   virtual BaseStream *getBaseStream() { return this; }
   virtual Stream *getUndecodedStream() { return this; }
   virtual Dict *getDict() { return dict.getDict(); }
   virtual GooString *getFileName() { return NULL; }
-  virtual Guint getLength() { return length; }
+  virtual Goffset getLength() { return length; }
 
   // Get/set position of first byte of stream within the file.
-  virtual Guint getStart() = 0;
-  virtual void moveStart(int delta) = 0;
+  virtual Goffset getStart() = 0;
+  virtual void moveStart(Goffset delta) = 0;
 
 protected:
 
-  Guint length;
-
-private:
-
+  Goffset length;
   Object dict;
 };
 
@@ -334,8 +340,8 @@ public:
   FilterStream(Stream *strA);
   virtual ~FilterStream();
   virtual void close();
-  virtual int getPos() { return str->getPos(); }
-  virtual void setPos(Guint pos, int dir = 0);
+  virtual Goffset getPos() { return str->getPos(); }
+  virtual void setPos(Goffset pos, int dir = 0);
   virtual BaseStream *getBaseStream() { return str->getBaseStream(); }
   virtual Stream *getUndecodedStream() { return str->getUndecodedStream(); }
   virtual Dict *getDict() { return str->getDict(); }
@@ -439,11 +445,12 @@ private:
 class FileStream: public BaseStream {
 public:
 
-  FileStream(FILE *fA, Guint startA, GBool limitedA,
-	     Guint lengthA, Object *dictA);
+  FileStream(GooFile* fileA, Goffset startA, GBool limitedA,
+	     Goffset lengthA, Object *dictA);
   virtual ~FileStream();
-  virtual Stream *makeSubStream(Guint startA, GBool limitedA,
-				Guint lengthA, Object *dictA);
+  virtual BaseStream *copy();
+  virtual Stream *makeSubStream(Goffset startA, GBool limitedA,
+				Goffset lengthA, Object *dictA);
   virtual StreamKind getKind() { return strFile; }
   virtual void reset();
   virtual void close();
@@ -451,10 +458,10 @@ public:
     { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
   virtual int lookChar()
     { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
-  virtual int getPos() { return bufPos + (bufPtr - buf); }
-  virtual void setPos(Guint pos, int dir = 0);
-  virtual Guint getStart() { return start; }
-  virtual void moveStart(int delta);
+  virtual Goffset getPos() { return bufPos + (bufPtr - buf); }
+  virtual void setPos(Goffset pos, int dir = 0);
+  virtual Goffset getStart() { return start; }
+  virtual void moveStart(Goffset delta);
 
   virtual int getUnfilteredChar () { return getChar(); }
   virtual void unfilteredReset () { reset(); }
@@ -486,14 +493,16 @@ private:
       return n;
     }
 
-  FILE *f;
-  Guint start;
+private:
+  GooFile* file;
+  Goffset offset;
+  Goffset start;
   GBool limited;
   char buf[fileStreamBufSize];
   char *bufPtr;
   char *bufEnd;
-  Guint bufPos;
-  int savePos;
+  Goffset bufPos;
+  Goffset savePos;
   GBool saved;
 };
 
@@ -506,11 +515,12 @@ private:
 class CachedFileStream: public BaseStream {
 public:
 
-  CachedFileStream(CachedFile *ccA, Guint startA, GBool limitedA,
-	     Guint lengthA, Object *dictA);
+  CachedFileStream(CachedFile *ccA, Goffset startA, GBool limitedA,
+	     Goffset lengthA, Object *dictA);
   virtual ~CachedFileStream();
-  virtual Stream *makeSubStream(Guint startA, GBool limitedA,
-				Guint lengthA, Object *dictA);
+  virtual BaseStream *copy();
+  virtual Stream *makeSubStream(Goffset startA, GBool limitedA,
+				Goffset lengthA, Object *dictA);
   virtual StreamKind getKind() { return strCachedFile; }
   virtual void reset();
   virtual void close();
@@ -518,10 +528,10 @@ public:
     { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr++ & 0xff); }
   virtual int lookChar()
     { return (bufPtr >= bufEnd && !fillBuf()) ? EOF : (*bufPtr & 0xff); }
-  virtual int getPos() { return bufPos + (bufPtr - buf); }
-  virtual void setPos(Guint pos, int dir = 0);
-  virtual Guint getStart() { return start; }
-  virtual void moveStart(int delta);
+  virtual Goffset getPos() { return bufPos + (bufPtr - buf); }
+  virtual void setPos(Goffset pos, int dir = 0);
+  virtual Goffset getStart() { return start; }
+  virtual void moveStart(Goffset delta);
 
   virtual int getUnfilteredChar () { return getChar(); }
   virtual void unfilteredReset () { reset(); }
@@ -531,7 +541,7 @@ private:
   GBool fillBuf();
 
   CachedFile *cc;
-  Guint start;
+  Goffset start;
   GBool limited;
   char buf[cachedStreamBufSize];
   char *bufPtr;
@@ -549,10 +559,11 @@ private:
 class MemStream: public BaseStream {
 public:
 
-  MemStream(char *bufA, Guint startA, Guint lengthA, Object *dictA);
+  MemStream(char *bufA, Goffset startA, Goffset lengthA, Object *dictA);
   virtual ~MemStream();
-  virtual Stream *makeSubStream(Guint start, GBool limited,
-				Guint lengthA, Object *dictA);
+  virtual BaseStream *copy();
+  virtual Stream *makeSubStream(Goffset start, GBool limited,
+				Goffset lengthA, Object *dictA);
   virtual StreamKind getKind() { return strWeird; }
   virtual void reset();
   virtual void close();
@@ -560,10 +571,10 @@ public:
     { return (bufPtr < bufEnd) ? (*bufPtr++ & 0xff) : EOF; }
   virtual int lookChar()
     { return (bufPtr < bufEnd) ? (*bufPtr & 0xff) : EOF; }
-  virtual int getPos() { return (int)(bufPtr - buf); }
-  virtual void setPos(Guint pos, int dir = 0);
-  virtual Guint getStart() { return start; }
-  virtual void moveStart(int delta);
+  virtual Goffset getPos() { return (int)(bufPtr - buf); }
+  virtual void setPos(Goffset pos, int dir = 0);
+  virtual Goffset getStart() { return start; }
+  virtual void moveStart(Goffset delta);
 
   //if needFree = true, the stream will delete buf when it is destroyed
   //otherwise it will not touch it. Default value is false
@@ -578,7 +589,7 @@ private:
   virtual int getChars(int nChars, Guchar *buffer);
 
   char *buf;
-  Guint start;
+  Goffset start;
   char *bufEnd;
   char *bufPtr;
   GBool needFree;
@@ -597,18 +608,19 @@ private:
 class EmbedStream: public BaseStream {
 public:
 
-  EmbedStream(Stream *strA, Object *dictA, GBool limitedA, Guint lengthA);
+  EmbedStream(Stream *strA, Object *dictA, GBool limitedA, Goffset lengthA);
   virtual ~EmbedStream();
-  virtual Stream *makeSubStream(Guint start, GBool limitedA,
-				Guint lengthA, Object *dictA);
+  virtual BaseStream *copy();
+  virtual Stream *makeSubStream(Goffset start, GBool limitedA,
+				Goffset lengthA, Object *dictA);
   virtual StreamKind getKind() { return str->getKind(); }
   virtual void reset() {}
   virtual int getChar();
   virtual int lookChar();
-  virtual int getPos() { return str->getPos(); }
-  virtual void setPos(Guint pos, int dir = 0);
-  virtual Guint getStart();
-  virtual void moveStart(int delta);
+  virtual Goffset getPos() { return str->getPos(); }
+  virtual void setPos(Goffset pos, int dir = 0);
+  virtual Goffset getStart();
+  virtual void moveStart(Goffset delta);
 
   virtual int getUnfilteredChar () { return str->getUnfilteredChar(); }
   virtual void unfilteredReset () { str->unfilteredReset(); }
@@ -850,7 +862,7 @@ struct DCTHuffTable {
 class DCTStream: public FilterStream {
 public:
 
-  DCTStream(Stream *strA, int colorXformA);
+  DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion);
   virtual ~DCTStream();
   virtual StreamKind getKind() { return strDCT; }
   virtual void reset();
diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index b0b53fc5..4adb3c2b 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -15,8 +15,8 @@
 //
 // Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2008, 2011, 2012 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2006, 2007 Ed Catmur <ed@catmur.co.uk>
+// Copyright (C) 2006-2008, 2011-2013 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006, 2007, 2013 Ed Catmur <ed@catmur.co.uk>
 // Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2007, 2008, 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Koji Otani <sho@bbr.jp>
@@ -30,9 +30,11 @@
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2011 Sam Liao <phyomh@gmail.com>
 // Copyright (C) 2012 Horst Prote <prote@fmi.uni-stuttgart.de>
-// Copyright (C) 2012 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2012, 2013 Jason Crain <jason@aquaticape.us>
 // Copyright (C) 2012 Peter Breitenlohner <peb@mppmu.mpg.de>
 // Copyright (C) 2013 José Aliste <jaliste@src.gnome.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Ed Catmur <ed@catmur.co.uk>
 //
 // 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
@@ -246,6 +248,7 @@ TextWord::TextWord(GfxState *state, int rotA, double fontSizeA) {
   edge = NULL;
   charPos = NULL;
   font = NULL;
+  textMat = NULL;
   len = size = 0;
   spaceAfter = gFalse;
   next = NULL;
@@ -273,11 +276,12 @@ TextWord::~TextWord() {
   gfree(edge);
   gfree(charPos);
   gfree(font);
+  gfree(textMat);
 }
 
 void TextWord::addChar(GfxState *state, TextFontInfo *fontA, double x, double y,
 		       double dx, double dy, int charPosA, int charLen,
-		       CharCode c, Unicode u) {
+		       CharCode c, Unicode u, Matrix textMatA) {
   GfxFont *gfxFont;
   double ascent, descent;
   ascent = descent = 0; // make gcc happy
@@ -289,12 +293,14 @@ void TextWord::addChar(GfxState *state, TextFontInfo *fontA, double x, double y,
     edge = (double *)greallocn(edge, (size + 1), sizeof(double));
     charPos = (int *)greallocn(charPos, size + 1, sizeof(int));
     font = (TextFontInfo **)greallocn(font, size, sizeof(TextFontInfo *));
+    textMat = (Matrix *)greallocn(textMat, size, sizeof(Matrix));
   }
   text[len] = u;
   charcode[len] = c;
   charPos[len] = charPosA;
   charPos[len + 1] = charPosA + charLen;
   font[len] = fontA;
+  textMat[len] = textMatA;
 
   if (len == 0) {
     if ((gfxFont = fontA->gfxFont)) {
@@ -448,6 +454,7 @@ void TextWord::merge(TextWord *word) {
     edge = (double *)greallocn(edge, (size + 1), sizeof(double));
     charPos = (int *)greallocn(charPos, size + 1, sizeof(int));
     font = (TextFontInfo **)greallocn(font, size, sizeof(TextFontInfo *));
+    textMat = (Matrix *)greallocn(textMat, size, sizeof(Matrix));
   }
   for (i = 0; i < word->len; ++i) {
     text[len + i] = word->text[i];
@@ -455,6 +462,7 @@ void TextWord::merge(TextWord *word) {
     edge[len + i] = word->edge[i];
     charPos[len + i] = word->charPos[i];
     font[len + i] = word->font[i];
+    textMat[len + i] = word->textMat[i];
   }
   edge[len + word->len] = word->edge[word->len];
   charPos[len + word->len] = word->charPos[word->len];
@@ -2267,6 +2275,7 @@ void TextPage::addChar(GfxState *state, double x, double y,
   GBool overlap;
   int i;
   int wMode;
+  Matrix mat;
 
   // subtract char and word spacing from the dx,dy values
   sp = state->getCharSpace();
@@ -2361,6 +2370,10 @@ void TextPage::addChar(GfxState *state, double x, double y,
       beginWord(state);
     }
 
+    state->getFontTransMat(&mat.m[0], &mat.m[1], &mat.m[2], &mat.m[3]);
+    mat.m[4] = x1;
+    mat.m[5] = y1;
+
     // page rotation and/or transform matrices can cause text to be
     // drawn in reverse order -- in this case, swap the begin/end
     // coordinates and break text into individual chars
@@ -2380,7 +2393,7 @@ void TextPage::addChar(GfxState *state, double x, double y,
     w1 /= uLen;
     h1 /= uLen;
     for (i = 0; i < uLen; ++i) {
-      curWord->addChar(state, curFont, x1 + i*w1, y1 + i*h1, w1, h1, charPos, nBytes, c, u[i]);
+      curWord->addChar(state, curFont, x1 + i*w1, y1 + i*h1, w1, h1, charPos, nBytes, c, u[i], mat);
     }
   }
   charPos += nBytes;
@@ -3987,6 +4000,21 @@ public:
 			  PDFRectangle *selection) = 0;
 
 protected:
+
+  class TextWordSelection {
+  public:
+    TextWordSelection(TextWord *word, int begin, int end)
+      : word(word),
+        begin(begin),
+        end(end)
+    {
+    }
+
+    TextWord *word;
+    int begin;
+    int end;
+  };
+
   TextPage *page;
 };
 
@@ -4012,26 +4040,56 @@ public:
 			  int edge_end,
 			  PDFRectangle *selection);
   virtual void visitWord (TextWord *word, int begin, int end,
-			  PDFRectangle *selection) { };
+			  PDFRectangle *selection);
+  void endPage();
 
   GooString *getText(void);
+  GooList **getWordList(int *nLines);
 
 private:
-  TextLineFrag *frags;
-  int nFrags, fragsSize;
+
+  void startLine();
+  void finishLine();
+
+  GooList **lines;
+  int nLines, linesSize;
+  GooList *words;
+  int tableId;
+  TextBlock *currentBlock;
 };
 
 TextSelectionDumper::TextSelectionDumper(TextPage *page)
     : TextSelectionVisitor(page)
 {
-  fragsSize = 256;
-  frags = (TextLineFrag *)gmallocn(fragsSize, sizeof(TextLineFrag));
-  nFrags = 0;
+  linesSize = 256;
+  lines = (GooList **)gmallocn(linesSize, sizeof(GooList *));
+  nLines = 0;
+
+  tableId = -1;
+  currentBlock = NULL;
+  words = NULL;
 }
 
 TextSelectionDumper::~TextSelectionDumper()
 {
-  gfree(frags);
+  for (int i = 0; i < nLines; i++)
+    deleteGooList(lines[i], TextWordSelection);
+  gfree(lines);
+}
+
+void TextSelectionDumper::startLine()
+{
+  finishLine();
+  words = new GooList();
+}
+
+void TextSelectionDumper::finishLine()
+{
+  if (words && words->getLength() > 0)
+    lines[nLines++] = words;
+  else if (words)
+    delete words;
+  words = NULL;
 }
 
 void TextSelectionDumper::visitLine (TextLine *line,
@@ -4041,130 +4099,107 @@ void TextSelectionDumper::visitLine (TextLine *line,
 				     int edge_end,
 				     PDFRectangle *selection)
 {
-  if (nFrags == fragsSize) {
-    fragsSize *= 2;
-    frags = (TextLineFrag *) grealloc(frags, fragsSize * sizeof(TextLineFrag));
+  TextLineFrag frag;
+
+  if (nLines == linesSize) {
+    linesSize *= 2;
+    lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
   }
 
-  frags[nFrags].init(line, edge_begin, edge_end - edge_begin);
-  ++nFrags;
+  frag.init(line, edge_begin, edge_end - edge_begin);
 
+  if (tableId >= 0 && frag.line->blk->tableId < 0) {
+    finishLine();
+
+    tableId = -1;
+    currentBlock = NULL;
+  }
+
+  if (frag.line->blk->tableId >= 0) { // a table
+    if (tableId == -1) {
+      tableId = frag.line->blk->tableId;
+      currentBlock = frag.line->blk;
+    }
+
+    if (currentBlock == frag.line->blk) { // the same block
+      startLine();
+    } else { // another block
+      if (currentBlock->tableEnd) { // previous block ended its row
+        startLine();
+      }
+      currentBlock = frag.line->blk;
+    }
+  } else { // not a table
+    startLine();
+  }
+}
+
+void TextSelectionDumper::visitWord (TextWord *word, int begin, int end,
+                                     PDFRectangle *selection)
+{
+  words->append(new TextWordSelection(word, begin, end));
+}
+
+void TextSelectionDumper::endPage()
+{
+  finishLine();
 }
 
 GooString *TextSelectionDumper::getText (void)
 {
-  GooString *s;
-  TextLineFrag *frag;
+  GooString *text;
   int i, j;
   UnicodeMap *uMap;
   char space[8], eol[16];
   int spaceLen, eolLen;
-  GooList *strings = NULL;
-  int actual_table = -1;
-  int actual_line = -1;
-  int last_length = 0;
-  TextBlock *actual_block = NULL;
 
-  s = new GooString();
+  text = new GooString();
 
-  uMap = globalParams->getTextEncoding();
-
-  if (uMap == NULL)
-      return s;
+  if (!(uMap = globalParams->getTextEncoding()))
+    return text;
 
   spaceLen = uMap->mapUnicode(0x20, space, sizeof(space));
   eolLen = uMap->mapUnicode(0x0a, eol, sizeof(eol));
 
-  if (nFrags > 0) {
-    for (i = 0; i < nFrags; ++i) {
-      frag = &frags[i];
+  for (i = 0; i < nLines; i++) {
+    GooList *lineWords = lines[i];
+    for (j = 0; j < lineWords->getLength(); j++) {
+      TextWordSelection *sel = (TextWordSelection *)lineWords->get(j);
 
-      if (actual_table >= 0 && frag->line->blk->tableId < 0) {
-        for (j = 0; j < strings->getLength (); j++) {
-          s->append ((GooString*) strings->get (j));
-          s->append (eol, eolLen);
-          delete ((GooString*) strings->get (j));
-        }
-        delete strings;
-        strings = NULL;
-        actual_table = -1;
-        actual_line = -1;
-        actual_block = NULL;
-      }
+      page->dumpFragment (sel->word->text + sel->begin, sel->end - sel->begin, uMap, text);
+      if (j < lineWords->getLength() - 1)
+        text->append(space, spaceLen);
+    }
+    if (i < nLines - 1)
+      text->append(eol, eolLen);
+  }
 
-      // a table
-      if (frag->line->blk->tableId >= 0) {
-        if (actual_table == -1) {
-          strings = new GooList();
-          actual_table = frag->line->blk->tableId;
-          actual_block = frag->line->blk;
-          actual_line = -1;
-        }
+  uMap->decRefCnt();
 
-        // the same block
-        if (actual_block == frag->line->blk) {
-          actual_line++;
-          if (actual_line >= strings->getLength ()) {
-            GooString *t = new GooString ();
-            // add some spaces to have this block correctly aligned
-            if (actual_line > 0)
-              for (j = 0; j < ((GooString*) (strings->get (actual_line - 1)))->getLength() - last_length - 1; j++)
-                t->append (space, spaceLen);
-            strings->append (t);
-          }
-        }
-        // another block
-        else {
-          // previous block ended its row
-          if (actual_block->tableEnd) {
-            for (j = 0; j < strings->getLength (); j++) {
-              s->append ((GooString*) strings->get (j));
-              s->append (eol, eolLen);
-              delete ((GooString*) strings->get (j));
-            }
-            delete strings;
+  return text;
+}
 
-            strings = new GooList();
-            GooString *t = new GooString ();
-            strings->append (t);
-          }
-          actual_block = frag->line->blk;
-          actual_line = 0;
-        }
+GooList **TextSelectionDumper::getWordList(int *nLinesOut)
+{
+  int i, j;
 
-        page->dumpFragment(frag->line->text + frag->start, frag->len, uMap, ((GooString*) strings->get (actual_line)));
-        last_length = frag->len;
+  if (nLines == 0)
+    return NULL;
 
-        if (!frag->line->blk->tableEnd) {
-          ((GooString*) strings->get (actual_line))->append (space, spaceLen);
-        }
-      }
-      // not a table
-      else {
-        page->dumpFragment (frag->line->text + frag->start, frag->len, uMap, s);
-        if (i < nFrags - 1) {
-          s->append (eol, eolLen);
-        }
-      }
-    }
+  GooList **wordList = (GooList **)gmallocn(nLines, sizeof(GooList *));
 
-    if (strings != NULL) {
-      for (j = 0; j < strings->getLength (); j++) {
-        s->append((GooString*) strings->get (j));
-        s->append(eol, eolLen);
-        delete ((GooString*) strings->get (j));
-      }
-      delete strings;
-      strings = NULL;
-      actual_table = -1;
-      actual_line = -1;
-      actual_block = NULL;
+  for (i = 0; i < nLines; i++) {
+    GooList *lineWords = lines[i];
+    wordList[i] = new GooList();
+    for (j = 0; j < lineWords->getLength(); j++) {
+      TextWordSelection *sel = (TextWordSelection *)lineWords->get(j);
+      wordList[i]->append(sel->word);
     }
   }
 
-  uMap->decRefCnt();
+  *nLinesOut = nLines;
 
-  return s;
+  return wordList;
 }
 
 class TextSelectionSizer : public TextSelectionVisitor {
@@ -4245,11 +4280,14 @@ public:
 			  PDFRectangle *selection);
   virtual void visitWord (TextWord *word, int begin, int end,
 			  PDFRectangle *selection);
+  void endPage();
 
 private:
   OutputDev *out;
   GfxColor *box_color, *glyph_color;
   GfxState *state;
+  GooList *selectionList;
+  Matrix ctm, ictm;
 };
 
 TextSelectionPainter::TextSelectionPainter(TextPage *page,
@@ -4265,20 +4303,23 @@ TextSelectionPainter::TextSelectionPainter(TextPage *page,
 {
   PDFRectangle box(0, 0, page->pageWidth, page->pageHeight);
 
+  selectionList = new GooList();
   state = new GfxState(72 * scale, 72 * scale, &box, rotation, gFalse);
 
-  out->startPage (0, state);
+  state->getCTM(&ctm);
+  ctm.invertTo(&ictm);
+
+  out->startPage(0, state, NULL);
   out->setDefaultCTM (state->getCTM());
 
-  state->setTextMat(1, 0, 0, -1, 0, 0);
   state->setFillColorSpace(new GfxDeviceRGBColorSpace());
-
+  state->setFillColor(box_color);
+  out->updateFillColor(state);
 }
 
 TextSelectionPainter::~TextSelectionPainter()
 {
-  out->endPage ();
-
+  deleteGooList(selectionList, TextWordSelection);
   delete state;
 }
 
@@ -4290,10 +4331,6 @@ void TextSelectionPainter::visitLine (TextLine *line,
 				      PDFRectangle *selection)
 {
   double x1, y1, x2, y2, margin;
-  Matrix ctm, ictm;
-
-  state->setFillColor(box_color);
-  out->updateFillColor(state);
 
   margin = (line->yMax - line->yMin) / 8;
   x1 = floor (line->edge[edge_begin]);
@@ -4301,7 +4338,6 @@ void TextSelectionPainter::visitLine (TextLine *line,
   x2 = ceil (line->edge[edge_end]);
   y2 = ceil (line->yMax + margin);
 
-  state->getCTM (&ctm);
   ctm.transform(line->edge[edge_begin], line->yMin - margin, &x1, &y1);
   ctm.transform(line->edge[edge_end], line->yMax + margin, &x2, &y2);
 
@@ -4310,7 +4346,6 @@ void TextSelectionPainter::visitLine (TextLine *line,
   x2 = ceil (x2);
   y2 = ceil (y2);
 
-  ctm.invertTo (&ictm);
   ictm.transform(x1, y1, &x1, &y1);
   ictm.transform(x2, y2, &x2, &y2);
 
@@ -4319,40 +4354,67 @@ void TextSelectionPainter::visitLine (TextLine *line,
   state->lineTo(x2, y2);
   state->lineTo(x1, y2);
   state->closePath();
-
-  out->fill(state);
-  state->clearPath();
 }
 
 void TextSelectionPainter::visitWord (TextWord *word, int begin, int end,
 				      PDFRectangle *selection)
 {
-  state->setFillColor(glyph_color);
-  out->updateFillColor(state);
+  selectionList->append(new TextWordSelection(word, begin, end));
+}
+
+void TextSelectionPainter::endPage()
+{
+  out->fill(state);
 
-  while (begin < end) {
-    TextFontInfo *font = word->font[begin];
-    font->gfxFont->incRefCnt();
-    state->setFont(font->gfxFont, word->fontSize);
-    out->updateFont(state);
+  out->saveState(state);
+  out->clip(state);
 
-    int fEnd = begin + 1;
-    while (fEnd < end && font->matches(word->font[fEnd]))
-      fEnd++;
+  state->clearPath();
 
-    /* The only purpose of this string is to let the output device query
-     * it's length.  Might want to change this interface later. */
-    GooString *string = new GooString ((char *) word->charcode, fEnd - begin);
-    out->beginString(state, string);
+  state->setFillColor(glyph_color);
+  out->updateFillColor(state);
 
-    for (int i = begin; i < fEnd; i++) {
-      out->drawChar(state, word->edge[i], word->base, 0, 0, 0, 0,
-		    word->charcode[i], 1, NULL, 0);
+  for (int i = 0; i < selectionList->getLength(); i++) {
+    TextWordSelection *sel = (TextWordSelection *) selectionList->get(i);
+    int begin = sel->begin;
+
+    while (begin < sel->end) {
+      TextFontInfo *font = sel->word->font[begin];
+      font->gfxFont->incRefCnt();
+      Matrix *mat = &sel->word->textMat[begin];
+
+      state->setTextMat(mat->m[0], mat->m[1], mat->m[2], mat->m[3], 0, 0);
+      state->setFont(font->gfxFont, 1);
+      out->updateFont(state);
+
+      int fEnd = begin + 1;
+      while (fEnd < sel->end && font->matches(sel->word->font[fEnd]) &&
+	     mat->m[0] == sel->word->textMat[fEnd].m[0] &&
+	     mat->m[1] == sel->word->textMat[fEnd].m[1] &&
+	     mat->m[2] == sel->word->textMat[fEnd].m[2] &&
+	     mat->m[3] == sel->word->textMat[fEnd].m[3])
+	fEnd++;
+
+      /* The only purpose of this string is to let the output device query
+       * it's length.  Might want to change this interface later. */
+      GooString *string = new GooString ((char *) sel->word->charcode, fEnd - begin);
+      out->beginString(state, string);
+
+      for (int i = begin; i < fEnd; i++) {
+        if (i != begin && sel->word->charPos[i] == sel->word->charPos[i - 1])
+          continue;
+
+	out->drawChar(state, sel->word->textMat[i].m[4], sel->word->textMat[i].m[5], 0, 0, 0, 0,
+		      sel->word->charcode[i], 1, NULL, 0);
+      }
+      out->endString(state);
+      delete string;
+      begin = fEnd;
     }
-    out->endString(state);
-    delete string;
-    begin = fEnd;
   }
+
+  out->restoreState(state);
+  out->endPage ();
 }
 
 void TextWord::visitSelection(TextSelectionVisitor *visitor,
@@ -4698,6 +4760,7 @@ void TextPage::drawSelection(OutputDev *out,
 			       out, box_color, glyph_color);
 
   visitSelection(&painter, selection, style);
+  painter.endPage();
 }
 
 GooList *TextPage::getSelectionRegion(PDFRectangle *selection,
@@ -4716,10 +4779,23 @@ GooString *TextPage::getSelectionText(PDFRectangle *selection,
   TextSelectionDumper dumper(this);
 
   visitSelection(&dumper, selection, style);
+  dumper.endPage();
 
   return dumper.getText();
 }
 
+GooList **TextPage::getSelectionWords(PDFRectangle *selection,
+                                      SelectionStyle style,
+                                      int *nLines)
+{
+  TextSelectionDumper dumper(this);
+
+  visitSelection(&dumper, selection, style);
+  dumper.endPage();
+
+  return dumper.getWordList(nLines);
+}
+
 GBool TextPage::findCharRange(int pos, int length,
 			      double *xMin, double *yMin,
 			      double *xMax, double *yMax) {
@@ -5313,7 +5389,7 @@ TextOutputDev::~TextOutputDev() {
   delete actualText;
 }
 
-void TextOutputDev::startPage(int pageNum, GfxState *state) {
+void TextOutputDev::startPage(int pageNum, GfxState *state, XRef *xref) {
   text->startPage(state);
 }
 
diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h
index 100f23e0..56736b3f 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -15,11 +15,12 @@
 //
 // Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006 Ed Catmur <ed@catmur.co.uk>
-// Copyright (C) 2007, 2008, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com>
-// Copyright (C) 2012 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2012, 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -122,7 +123,7 @@ public:
   // Add a character to the word.
   void addChar(GfxState *state, TextFontInfo *fontA, double x, double y,
 	       double dx, double dy, int charPosA, int charLen,
-	       CharCode c, Unicode u);
+	       CharCode c, Unicode u, Matrix textMatA);
 
   // Merge <word> onto the end of <this>.
   void merge(TextWord *word);
@@ -187,6 +188,7 @@ private:
   int len;			// length of text/edge/charPos/font arrays
   int size;			// size of text/edge/charPos/font arrays
   TextFontInfo **font;		// font information for each char
+  Matrix *textMat;		// transformation matrix for each char
   double fontSize;		// font size
   GBool spaceAfter;		// set if there is a space between this
 				//   word and the next word on the line
@@ -561,6 +563,10 @@ public:
   GooString *getSelectionText(PDFRectangle *selection,
 			      SelectionStyle style);
 
+  GooList **getSelectionWords(PDFRectangle *selection,
+                              SelectionStyle style,
+                              int *nLines);
+
   // Find a string by character position and length.  If found, sets
   // the text bounding rectangle and returns true; otherwise returns
   // false.
@@ -718,7 +724,7 @@ public:
   //----- initialization and control
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
 
   // End a page.
   virtual void endPage();
diff --git a/poppler/UTF.cc b/poppler/UTF.cc
index 42c78363..46007b73 100644
--- a/poppler/UTF.cc
+++ b/poppler/UTF.cc
@@ -101,7 +101,7 @@ int TextStringToUCS4(GooString *textStr, Unicode **ucs4)
         utf16[i] = (s[2 + i*2] & 0xff) << 8 | (s[3 + i*2] & 0xff);
       }
       len = UTF16toUCS4(utf16, len, &u);
-      delete utf16;
+      delete[] utf16;
     } else {
       u = NULL;
     }
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 81e939ad..5495b62f 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -15,13 +15,15 @@
 //
 // Copyright (C) 2005 Dan Sheridan <dan.sheridan@postman.org.uk>
 // Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2006, 2008, 2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008, 2010, 2012, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009, 2010 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
-// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@kabelmail.de>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@kabelmail.de>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Pino Toscano <pino@kde.org>
 //
 // 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
@@ -37,8 +39,11 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
+#include <math.h>
 #include <ctype.h>
 #include <limits.h>
+#include <float.h>
+#include "goo/gfile.h"
 #include "goo/gmem.h"
 #include "Object.h"
 #include "Stream.h"
@@ -65,6 +70,14 @@
 #define permHighResPrint  (1<<11) // bit 12
 #define defPermFlags 0xfffc
 
+#if MULTITHREADED
+#  define xrefLocker()   MutexLocker locker(&mutex)
+#  define xrefCondLocker(X)  MutexLocker locker(&mutex, (X))
+#else
+#  define xrefLocker()
+#  define xrefCondLocker(X)
+#endif
+
 //------------------------------------------------------------------------
 // ObjectStream
 //------------------------------------------------------------------------
@@ -74,7 +87,7 @@ public:
 
   // Create an object stream, using object number <objStrNum>,
   // generation 0.
-  ObjectStream(XRef *xref, int objStrNumA);
+  ObjectStream(XRef *xref, int objStrNumA, int recursion = 0);
 
   GBool isOk() { return ok; }
 
@@ -127,12 +140,13 @@ class ObjectStreamItem : public PopplerCacheItem
     ObjectStream *objStream;
 };
 
-ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
+ObjectStream::ObjectStream(XRef *xref, int objStrNumA, int recursion) {
   Stream *str;
   Parser *parser;
-  int *offsets;
+  Goffset *offsets;
   Object objStr, obj1, obj2;
-  int first, i;
+  Goffset first;
+  int i;
 
   objStrNum = objStrNumA;
   nObjects = 0;
@@ -140,11 +154,11 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
   objNums = NULL;
   ok = gFalse;
 
-  if (!xref->fetch(objStrNum, 0, &objStr)->isStream()) {
+  if (!xref->fetch(objStrNum, 0, &objStr, recursion)->isStream()) {
     goto err1;
   }
 
-  if (!objStr.streamGetDict()->lookup("N", &obj1)->isInt()) {
+  if (!objStr.streamGetDict()->lookup("N", &obj1, recursion)->isInt()) {
     obj1.free();
     goto err1;
   }
@@ -154,11 +168,15 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
     goto err1;
   }
 
-  if (!objStr.streamGetDict()->lookup("First", &obj1)->isInt()) {
+  objStr.streamGetDict()->lookup("First", &obj1, recursion);
+  if (!obj1.isInt() && !obj1.isInt64()) {
     obj1.free();
     goto err1;
   }
-  first = obj1.getInt();
+  if (obj1.isInt())
+    first = obj1.getInt();
+  else
+    first = obj1.getInt64();
   obj1.free();
   if (first < 0) {
     goto err1;
@@ -173,7 +191,7 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
   }
   objs = new Object[nObjects];
   objNums = (int *)gmallocn(nObjects, sizeof(int));
-  offsets = (int *)gmallocn(nObjects, sizeof(int));
+  offsets = (Goffset *)gmallocn(nObjects, sizeof(Goffset));
 
   // parse the header: object numbers and offsets
   objStr.streamReset();
@@ -183,7 +201,7 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
   for (i = 0; i < nObjects; ++i) {
     parser->getObj(&obj1);
     parser->getObj(&obj2);
-    if (!obj1.isInt() || !obj2.isInt()) {
+    if (!obj1.isInt() || !(obj2.isInt() || obj2.isInt64())) {
       obj1.free();
       obj2.free();
       delete parser;
@@ -191,7 +209,10 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
       goto err1;
     }
     objNums[i] = obj1.getInt();
-    offsets[i] = obj2.getInt();
+    if (obj2.isInt())
+      offsets[i] = obj2.getInt();
+    else
+      offsets[i] = obj2.getInt64();
     obj1.free();
     obj2.free();
     if (objNums[i] < 0 || offsets[i] < 0 ||
@@ -207,7 +228,7 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) {
   // skip to the first object - this shouldn't be necessary because
   // the First key is supposed to be equal to offsets[0], but just in
   // case...
-  for (i = first; i < offsets[0]; ++i) {
+  for (Goffset pos = first; pos < offsets[0]; ++pos) {
     objStr.getStream()->getChar();
   }
 
@@ -257,6 +278,9 @@ Object *ObjectStream::getObject(int objIdx, int objNum, Object *obj) {
 //------------------------------------------------------------------------
 
 void XRef::init() {
+#if MULTITHREADED
+  gInitMutex(&mutex);
+#endif
   ok = gTrue;
   errCode = errNone;
   entries = NULL;
@@ -272,6 +296,7 @@ void XRef::init() {
   permFlags = defPermFlags;
   ownerPasswordOk = gFalse;
   rootNum = -1;
+  strOwner = gFalse;
 }
 
 XRef::XRef() {
@@ -285,7 +310,7 @@ XRef::XRef(Object *trailerDictA) {
     trailerDict.initDict(trailerDictA->getDict());
 }
 
-XRef::XRef(BaseStream *strA, Guint pos, Guint mainXRefEntriesOffsetA, GBool *wasReconstructed, GBool reconstruct) {
+XRef::XRef(BaseStream *strA, Goffset pos, Goffset mainXRefEntriesOffsetA, GBool *wasReconstructed, GBool reconstruct) {
   Object obj;
 
   init();
@@ -313,7 +338,7 @@ XRef::XRef(BaseStream *strA, Guint pos, Guint mainXRefEntriesOffsetA, GBool *was
 
     // read the xref table
     } else {
-      std::vector<Guint> followedXRefStm;
+      std::vector<Goffset> followedXRefStm;
       readXRef(&prevXRefOffset, &followedXRefStm, NULL);
 
       // if there was a problem with the xref table,
@@ -375,6 +400,59 @@ XRef::~XRef() {
   if (objStrs) {
     delete objStrs;
   }
+  if (strOwner) {
+    delete str;
+  }
+#if MULTITHREADED
+  gDestroyMutex(&mutex);
+#endif
+}
+
+XRef *XRef::copy() {
+  XRef *xref = new XRef();
+  xref->str = str->copy();
+  xref->strOwner = gTrue;
+  xref->encrypted = encrypted;
+  xref->permFlags = permFlags;
+  xref->ownerPasswordOk = ownerPasswordOk;
+  xref->rootGen = rootGen;
+  xref->rootNum = rootNum;
+
+  xref->start = start;
+  xref->prevXRefOffset = prevXRefOffset;
+  xref->mainXRefEntriesOffset = mainXRefEntriesOffset;
+  xref->xRefStream = xRefStream;
+  trailerDict.copy(&xref->trailerDict);
+  xref->encAlgorithm = encAlgorithm;
+  xref->encRevision = encRevision;
+  xref->encVersion = encVersion;
+  xref->permFlags = permFlags;
+  xref->keyLength = keyLength;
+  xref->permFlags = permFlags;
+  for (int i = 0; i < 32; i++) {
+    xref->fileKey[i] = fileKey[i];
+  }
+
+  if (xref->reserve(size) == 0) {
+    error(errSyntaxError, -1, "unable to allocate {0:d} entries", size);
+    return NULL;
+  }
+  xref->size = size;
+  for (int i = 0; i < size; ++i) {
+    xref->entries[i].offset = entries[i].offset;
+    xref->entries[i].type = entries[i].type;
+    xref->entries[i].obj.initNull ();
+    xref->entries[i].flags = entries[i].flags;
+    xref->entries[i].gen = entries[i].gen;
+  }
+  xref->streamEndsLen = streamEndsLen;
+  if (streamEndsLen  != 0) {
+    xref->streamEnds = (Goffset *)gmalloc(streamEndsLen * sizeof(Goffset));
+    for (int i = 0; i < streamEndsLen; i++) {
+      xref->streamEnds[i] = streamEnds[i];
+    }
+  }
+  return xref;
 }
 
 int XRef::reserve(int newSize)
@@ -410,7 +488,7 @@ int XRef::resize(int newSize)
     if (reserve(newSize) < newSize) return size;
 
     for (int i = size; i < newSize; ++i) {
-      entries[i].offset = 0xffffffff;
+      entries[i].offset = -1;
       entries[i].type = xrefEntryNone;
       entries[i].obj.initNull ();
       entries[i].flags = 0;
@@ -430,7 +508,7 @@ int XRef::resize(int newSize)
 /* Read one xref table section.  Also reads the associated trailer
  * dictionary, and returns the prev pointer (if any).
  * Arguments:
- *   pos                Points to a Guint containing the offset of the XRef
+ *   pos                Points to a Goffset containing the offset of the XRef
  *                      section to be read. If a prev pointer is found, *pos is
  *                      updated with its value
  *   followedXRefStm    Used in case of nested readXRef calls to spot circular
@@ -440,7 +518,7 @@ int XRef::resize(int newSize)
  * Return value:
  *   gTrue if a prev pointer is found, otherwise gFalse
  */
-GBool XRef::readXRef(Guint *pos, std::vector<Guint> *followedXRefStm, std::vector<int> *xrefStreamObjsNum) {
+GBool XRef::readXRef(Goffset *pos, std::vector<Goffset> *followedXRefStm, std::vector<int> *xrefStreamObjsNum) {
   Parser *parser;
   Object obj;
   GBool more;
@@ -496,11 +574,11 @@ GBool XRef::readXRef(Guint *pos, std::vector<Guint> *followedXRefStm, std::vecto
   return gFalse;
 }
 
-GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *followedXRefStm, std::vector<int> *xrefStreamObjsNum) {
+GBool XRef::readXRefTable(Parser *parser, Goffset *pos, std::vector<Goffset> *followedXRefStm, std::vector<int> *xrefStreamObjsNum) {
   XRefEntry entry;
   GBool more;
   Object obj, obj2;
-  Guint pos2;
+  Goffset pos2;
   int first, n, i;
 
   while (1) {
@@ -529,10 +607,14 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *follow
       }
     }
     for (i = first; i < first + n; ++i) {
-      if (!parser->getObj(&obj, gTrue)->isInt()) {
+      parser->getObj(&obj, gTrue);
+      if (obj.isInt()) {
+	entry.offset = obj.getInt();
+      } else if (obj.isInt64()) {
+	entry.offset = obj.getInt64();
+      } else {
 	goto err1;
       }
-      entry.offset = (Guint)obj.getInt();
       obj.free();
       if (!parser->getObj(&obj, gTrue)->isInt()) {
 	goto err1;
@@ -550,7 +632,7 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *follow
 	goto err1;
       }
       obj.free();
-      if (entries[i].offset == 0xffffffff) {
+      if (entries[i].offset == -1) {
 	entries[i] = entry;
 	// PDF files of patents from the IBM Intellectual Property
 	// Network have a bug: the xref table claims to start at 1
@@ -560,7 +642,7 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *follow
 	    entries[1].type == xrefEntryFree) {
 	  i = first = 0;
 	  entries[0] = entries[1];
-	  entries[1].offset = 0xffffffff;
+	  entries[1].offset = -1;
 	}
       }
     }
@@ -573,8 +655,11 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *follow
 
   // get the 'Prev' pointer
   obj.getDict()->lookupNF("Prev", &obj2);
-  if (obj2.isInt()) {
-    pos2 = (Guint)obj2.getInt();
+  if (obj2.isInt() || obj2.isInt64()) {
+    if (obj2.isInt())
+      pos2 = obj2.getInt();
+    else
+      pos2 = obj2.getInt64();
     if (pos2 != *pos) {
       *pos = pos2;
       more = gTrue;
@@ -604,8 +689,12 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *follow
   }
 
   // check for an 'XRefStm' key
-  if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) {
-    pos2 = (Guint)obj2.getInt();
+  obj.getDict()->lookup("XRefStm", &obj2);
+  if (obj2.isInt() || obj2.isInt64()) {
+    if (obj2.isInt())
+      pos2 = obj2.getInt();
+    else
+      pos2 = obj2.getInt64();
     for (size_t i = 0; ok == gTrue && i < followedXRefStm->size(); ++i) {
       if (followedXRefStm->at(i) == pos2) {
         ok = gFalse;
@@ -632,7 +721,7 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *follow
   return gFalse;
 }
 
-GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) {
+GBool XRef::readXRefStream(Stream *xrefStr, Goffset *pos) {
   Dict *dict;
   int w[3];
   GBool more;
@@ -667,11 +756,14 @@ GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) {
     }
     w[i] = obj2.getInt();
     obj2.free();
-    if (w[i] < 0 || w[i] > 4) {
+    if (w[i] < 0) {
       goto err1;
     }
   }
   obj.free();
+  if (w[0] > (int)sizeof(int) || w[1] > (int)sizeof(long long) || w[2] > (int)sizeof(int)) {
+    goto err1;
+  }
 
   xrefStr->reset();
   dict->lookupNF("Index", &idx);
@@ -705,7 +797,10 @@ GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) {
 
   dict->lookupNF("Prev", &obj);
   if (obj.isInt()) {
-    *pos = (Guint)obj.getInt();
+    *pos = obj.getInt();
+    more = gTrue;
+  } else if (obj.isInt64()) {
+    *pos = obj.getInt64();
     more = gTrue;
   } else {
     more = gFalse;
@@ -725,7 +820,7 @@ GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) {
 }
 
 GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) {
-  Guint offset;
+  unsigned long long offset;
   int type, gen, c, i, j;
 
   if (first + n < 0) {
@@ -758,13 +853,17 @@ GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) {
       }
       offset = (offset << 8) + c;
     }
+    if (offset > (unsigned long long)GoffsetMax()) {
+      error(errSyntaxError, -1, "Offset inside xref table too large for fseek");
+      return gFalse;
+    }
     for (gen = 0, j = 0; j < w[2]; ++j) {
       if ((c = xrefStr->getChar()) == EOF) {
 	return gFalse;
       }
       gen = (gen << 8) + c;
     }
-    if (entries[i].offset == 0xffffffff) {
+    if (entries[i].offset == -1) {
       switch (type) {
       case 0:
 	entries[i].offset = offset;
@@ -795,7 +894,7 @@ GBool XRef::constructXRef(GBool *wasReconstructed, GBool needCatalogDict) {
   Parser *parser;
   Object newTrailerDict, obj;
   char buf[256];
-  Guint pos;
+  Goffset pos;
   int num, gen;
   int newSize;
   int streamEndsSize;
@@ -916,8 +1015,8 @@ GBool XRef::constructXRef(GBool *wasReconstructed, GBool needCatalogDict) {
             error(errSyntaxError, -1, "Invalid 'endstream' parameter.");
             return gFalse;
           }
-	  streamEnds = (Guint *)greallocn(streamEnds,
-					streamEndsSize, sizeof(Guint));
+	  streamEnds = (Goffset *)greallocn(streamEnds,
+					streamEndsSize, sizeof(Goffset));
         }
         streamEnds[streamEndsLen++] = pos;
       }
@@ -1036,6 +1135,7 @@ Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
   Parser *parser;
   Object obj1, obj2, obj3;
 
+  xrefLocker();
   // check for bogus ref - this can happen in corrupted PDF files
   if (num < 0 || num >= size) {
     goto err;
@@ -1124,7 +1224,7 @@ Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
     }
 
     if (!objStr) {
-      objStr = new ObjectStream(this, e->offset);
+      objStr = new ObjectStream(this, e->offset, recursion + 1);
       if (!objStr->isOk()) {
 	delete objStr;
 	objStr = NULL;
@@ -1151,6 +1251,18 @@ Object *XRef::fetch(int num, int gen, Object *obj, int recursion) {
   return obj->initNull();
 }
 
+void XRef::lock() {
+#if MULTITHREADED
+  gLockMutex(&mutex);
+#endif
+}
+
+void XRef::unlock() {
+#if MULTITHREADED
+  gUnlockMutex(&mutex);
+#endif
+}
+
 Object *XRef::getDocInfo(Object *obj) {
   return trailerDict.dictLookup("Info", obj);
 }
@@ -1160,7 +1272,7 @@ Object *XRef::getDocInfoNF(Object *obj) {
   return trailerDict.dictLookupNF("Info", obj);
 }
 
-GBool XRef::getStreamEnd(Guint streamStart, Guint *streamEnd) {
+GBool XRef::getStreamEnd(Goffset streamStart, Goffset *streamEnd) {
   int a, b, m;
 
   if (streamEndsLen == 0 ||
@@ -1183,12 +1295,12 @@ GBool XRef::getStreamEnd(Guint streamStart, Guint *streamEnd) {
   return gTrue;
 }
 
-int XRef::getNumEntry(Guint offset)
+int XRef::getNumEntry(Goffset offset)
 {
   if (size > 0)
   {
     int res = 0;
-    Guint resOffset = getEntry(0)->offset;
+    Goffset resOffset = getEntry(0)->offset;
     XRefEntry *e;
     for (int i = 1; i < size; ++i)
     {
@@ -1204,14 +1316,15 @@ int XRef::getNumEntry(Guint offset)
   else return -1;
 }
 
-void XRef::add(int num, int gen, Guint offs, GBool used) {
+void XRef::add(int num, int gen, Goffset offs, GBool used) {
+  xrefLocker();
   if (num >= size) {
     if (num >= capacity) {
       entries = (XRefEntry *)greallocn(entries, num + 1, sizeof(XRefEntry));
       capacity = num + 1;
     }
     for (int i = size; i < num + 1; ++i) {
-      entries[i].offset = 0xffffffff;
+      entries[i].offset = -1;
       entries[i].type = xrefEntryFree;
       entries[i].obj.initNull ();
       entries[i].flags = 0;
@@ -1233,6 +1346,7 @@ void XRef::add(int num, int gen, Guint offs, GBool used) {
 }
 
 void XRef::setModifiedObject (Object* o, Ref r) {
+  xrefLocker();
   if (r.num < 0 || r.num >= size) {
     error(errInternal, -1,"XRef::setModifiedObject on unknown ref: {0:d}, {1:d}\n", r.num, r.gen);
     return;
@@ -1274,13 +1388,15 @@ Ref XRef::addIndirectObject (Object* o) {
 }
 
 void XRef::removeIndirectObject(Ref r) {
+  xrefLocker();
   if (r.num < 0 || r.num >= size) {
     error(errInternal, -1,"XRef::removeIndirectObject on unknown ref: {0:d}, {1:d}\n", r.num, r.gen);
     return;
   }
   XRefEntry *e = getEntry(r.num);
-  if (e->type == xrefEntryFree)
+  if (e->type == xrefEntryFree) {
     return;
+  }
   e->obj.free();
   e->type = xrefEntryFree;
   e->gen++;
@@ -1339,8 +1455,8 @@ void XRef::XRefTableWriter::startSection(int first, int count) {
   outStr->printf("%i %i\r\n", first, count);
 }
 
-void XRef::XRefTableWriter::writeEntry(Guint offset, int gen, XRefEntryType type) {
-  outStr->printf("%010i %05i %c\r\n", offset, gen, (type==xrefEntryFree)?'f':'n');
+void XRef::XRefTableWriter::writeEntry(Goffset offset, int gen, XRefEntryType type) {
+  outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen, (type==xrefEntryFree)?'f':'n');
 }
 
 void XRef::writeTableToFile(OutStream* outStr, GBool writeAllEntries) {
@@ -1349,9 +1465,10 @@ void XRef::writeTableToFile(OutStream* outStr, GBool writeAllEntries) {
   writeXRef(&writer, writeAllEntries);
 }
 
-XRef::XRefStreamWriter::XRefStreamWriter(Object *indexA, GooString *stmBufA) {
+XRef::XRefStreamWriter::XRefStreamWriter(Object *indexA, GooString *stmBufA, int offsetSizeA) {
   index = indexA;
   stmBuf = stmBufA;
+  offsetSize = offsetSizeA;
 }
 
 void XRef::XRefStreamWriter::startSection(int first, int count) {
@@ -1360,16 +1477,29 @@ void XRef::XRefStreamWriter::startSection(int first, int count) {
   index->arrayAdd( obj.initInt(count) );
 }
 
-void XRef::XRefStreamWriter::writeEntry(Guint offset, int gen, XRefEntryType type) {
-  char data[7];
+void XRef::XRefStreamWriter::writeEntry(Goffset offset, int gen, XRefEntryType type) {
+  const int entryTotalSize = 1 + offsetSize + 2; /* type + offset + gen */
+  char data[16];
   data[0] = (type==xrefEntryFree) ? 0 : 1;
-  data[1] = (offset >> 24) & 0xff;
-  data[2] = (offset >> 16) & 0xff;
-  data[3] = (offset >> 8) & 0xff;
-  data[4] = offset & 0xff;
-  data[5] = (gen >> 8) & 0xff;
-  data[6] = gen & 0xff;
-  stmBuf->append(data, 7);
+  for (int i = offsetSize; i > 0; i--) {
+    data[i] = offset & 0xff;
+    offset >>= 8;
+  }
+  data[offsetSize + 1] = (gen >> 8) & 0xff;
+  data[offsetSize + 2] = gen & 0xff;
+  stmBuf->append(data, entryTotalSize);
+}
+
+XRef::XRefPreScanWriter::XRefPreScanWriter() {
+  hasOffsetsBeyond4GB = gFalse;
+}
+
+void XRef::XRefPreScanWriter::startSection(int first, int count) {
+}
+
+void XRef::XRefPreScanWriter::writeEntry(Goffset offset, int gen, XRefEntryType type) {
+  if (offset >= 0x100000000ll)
+    hasOffsetsBeyond4GB = gTrue;
 }
 
 void XRef::writeStreamToBuffer(GooString *stmBuf, Dict *xrefDict, XRef *xref) {
@@ -1377,7 +1507,13 @@ void XRef::writeStreamToBuffer(GooString *stmBuf, Dict *xrefDict, XRef *xref) {
   index.initArray(xref);
   stmBuf->clear();
 
-  XRefStreamWriter writer(&index, stmBuf);
+  // First pass: determine whether all offsets fit in 4 bytes or not
+  XRefPreScanWriter prescan;
+  writeXRef(&prescan, gFalse);
+  const int offsetSize = prescan.hasOffsetsBeyond4GB ? sizeof(Goffset) : 4;
+
+  // Second pass: actually write the xref stream
+  XRefStreamWriter writer(&index, stmBuf, offsetSize);
   writeXRef(&writer, gFalse);
 
   Object obj1, obj2;
@@ -1385,12 +1521,12 @@ void XRef::writeStreamToBuffer(GooString *stmBuf, Dict *xrefDict, XRef *xref) {
   xrefDict->set("Index", &index);
   obj2.initArray(xref);
   obj2.arrayAdd( obj1.initInt(1) );
-  obj2.arrayAdd( obj1.initInt(4) );
+  obj2.arrayAdd( obj1.initInt(offsetSize) );
   obj2.arrayAdd( obj1.initInt(2) );
   xrefDict->set("W", &obj2);
 }
 
-GBool XRef::parseEntry(Guint offset, XRefEntry *entry)
+GBool XRef::parseEntry(Goffset offset, XRefEntry *entry)
 {
   GBool r;
 
@@ -1400,10 +1536,14 @@ GBool XRef::parseEntry(Guint offset, XRefEntry *entry)
      str->makeSubStream(offset, gFalse, 20, &obj)), gTrue);
 
   Object obj1, obj2, obj3;
-  if ((parser.getObj(&obj1)->isInt()) &&
+  if (((parser.getObj(&obj1)->isInt()) ||
+       parser.getObj(&obj1)->isInt64()) &&
       (parser.getObj(&obj2)->isInt()) &&
       (parser.getObj(&obj3)->isCmd("n") || obj3.isCmd("f"))) {
-    entry->offset = (Guint) obj1.getInt();
+    if (obj1.isInt64())
+      entry->offset = obj1.getInt64();
+    else
+      entry->offset = obj1.getInt();
     entry->gen = obj2.getInt();
     entry->type = obj3.isCmd("n") ? xrefEntryUncompressed : xrefEntryFree;
     entry->obj.initNull ();
@@ -1426,7 +1566,7 @@ GBool XRef::parseEntry(Guint offset, XRefEntry *entry)
  * numbers of the XRef streams that have been traversed */
 void XRef::readXRefUntil(int untilEntryNum, std::vector<int> *xrefStreamObjsNum)
 {
-  std::vector<Guint> followedPrev;
+  std::vector<Goffset> followedPrev;
   while (prevXRefOffset && (untilEntryNum == -1 || entries[untilEntryNum].type == xrefEntryNone)) {
     bool followed = false;
     for (size_t j = 0; j < followedPrev.size(); j++) {
@@ -1445,7 +1585,7 @@ void XRef::readXRefUntil(int untilEntryNum, std::vector<int> *xrefStreamObjsNum)
 
     followedPrev.push_back (prevXRefOffset);
 
-    std::vector<Guint> followedXRefStm;
+    std::vector<Goffset> followedXRefStm;
     if (!readXRef(&prevXRefOffset, &followedXRefStm, xrefStreamObjsNum)) {
         prevXRefOffset = 0;
     }
@@ -1556,7 +1696,9 @@ void XRef::scanSpecialFlags() {
   prevXRefOffset = mainXRefOffset;
 
   std::vector<int> xrefStreamObjNums;
-  readXRefUntil(-1 /* read all xref sections */, &xrefStreamObjNums);
+  if (!streamEndsLen) { // don't do it for already reconstructed xref
+    readXRefUntil(-1 /* read all xref sections */, &xrefStreamObjNums);
+  }
 
   // Mark object streams as DontRewrite, because we write each object
   // individually in full rewrite mode.
diff --git a/poppler/XRef.h b/poppler/XRef.h
index 9af4a139..70065d89 100644
--- a/poppler/XRef.h
+++ b/poppler/XRef.h
@@ -14,13 +14,14 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2006, 2008, 2010-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008, 2010-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2010 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
-// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@kabelmail.de>
-// Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@kabelmail.de>
+// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
 // 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
@@ -34,7 +35,9 @@
 #pragma interface
 #endif
 
+#include "poppler-config.h"
 #include "goo/gtypes.h"
+#include "goo/GooMutex.h"
 #include "Object.h"
 #include "Stream.h"
 
@@ -57,7 +60,7 @@ enum XRefEntryType {
 };
 
 struct XRefEntry {
-  Guint offset;
+  Goffset offset;
   int gen;
   XRefEntryType type;
   int flags;
@@ -95,11 +98,14 @@ public:
   // Constructor, create an empty XRef but with info dict, used for PDF writing
   XRef(Object *trailerDictA);
   // Constructor.  Read xref table from stream.
-  XRef(BaseStream *strA, Guint pos, Guint mainXRefEntriesOffsetA = 0, GBool *wasReconstructed = NULL, GBool reconstruct = false);
+  XRef(BaseStream *strA, Goffset pos, Goffset mainXRefEntriesOffsetA = 0, GBool *wasReconstructed = NULL, GBool reconstruct = false);
 
   // Destructor.
   ~XRef();
 
+  // Copy xref but with new base stream!
+  XRef *copy();
+
   // Is xref table valid?
   GBool isOk() { return ok; }
 
@@ -152,10 +158,10 @@ public:
 
   // Get end position for a stream in a damaged file.
   // Returns false if unknown or file is not damaged.
-  GBool getStreamEnd(Guint streamStart, Guint *streamEnd);
+  GBool getStreamEnd(Goffset streamStart, Goffset *streamEnd);
 
   // Retuns the entry that belongs to the offset
-  int getNumEntry(Guint offset);
+  int getNumEntry(Goffset offset);
 
   // Scans the document and sets special flags in all xref entries. One of those
   // flags is Unencrypted, which affects how the object is fetched. Therefore,
@@ -173,17 +179,21 @@ public:
   void setModifiedObject(Object* o, Ref r);
   Ref addIndirectObject (Object* o);
   void removeIndirectObject(Ref r);
-  void add(int num, int gen,  Guint offs, GBool used);
+  void add(int num, int gen,  Goffset offs, GBool used);
 
   // Output XRef table to stream
   void writeTableToFile(OutStream* outStr, GBool writeAllEntries);
   // Output XRef stream contents to GooString and fill trailerDict fields accordingly
   void writeStreamToBuffer(GooString *stmBuf, Dict *xrefDict, XRef *xref);
 
+  // to be thread safe during write where changes are not allowed
+  void lock();
+  void unlock();
+
 private:
 
   BaseStream *str;		// input stream
-  Guint start;			// offset in file (to allow for garbage
+  Goffset start;		// offset in file (to allow for garbage
 				//   at beginning of file)
   XRefEntry *entries;		// xref entries
   int capacity;			// size of <entries> array
@@ -192,7 +202,7 @@ private:
   GBool ok;			// true if xref table is valid
   int errCode;			// error code (if <ok> is false)
   Object trailerDict;		// trailer dictionary
-  Guint *streamEnds;		// 'endstream' positions - only used in
+  Goffset *streamEnds;		// 'endstream' positions - only used in
 				//   damaged files
   int streamEndsLen;		// number of valid entries in streamEnds
   PopplerCache *objStrs;	// cached object streams
@@ -204,48 +214,65 @@ private:
   int permFlags;		// permission bits
   Guchar fileKey[32];		// file decryption key
   GBool ownerPasswordOk;	// true if owner password is correct
-  Guint prevXRefOffset;		// position of prev XRef section (= next to read)
-  Guint mainXRefEntriesOffset;	// offset of entries in main XRef table
+  Goffset prevXRefOffset;		// position of prev XRef section (= next to read)
+  Goffset mainXRefEntriesOffset; // offset of entries in main XRef table
   GBool xRefStream;		// true if last XRef section is a stream
-  Guint mainXRefOffset;		// position of the main XRef table/stream
+  Goffset mainXRefOffset;	// position of the main XRef table/stream
   GBool scannedSpecialFlags;	// true if scanSpecialFlags has been called
+  GBool strOwner;     // true if str is owned by the instance
+#if MULTITHREADED
+  GooMutex mutex;
+#endif
 
   void init();
   int reserve(int newSize);
   int resize(int newSize);
-  GBool readXRef(Guint *pos, std::vector<Guint> *followedXRefStm, std::vector<int> *xrefStreamObjsNum);
-  GBool readXRefTable(Parser *parser, Guint *pos, std::vector<Guint> *followedXRefStm, std::vector<int> *xrefStreamObjsNum);
+  GBool readXRef(Goffset *pos, std::vector<Goffset> *followedXRefStm, std::vector<int> *xrefStreamObjsNum);
+  GBool readXRefTable(Parser *parser, Goffset *pos, std::vector<Goffset> *followedXRefStm, std::vector<int> *xrefStreamObjsNum);
   GBool readXRefStreamSection(Stream *xrefStr, int *w, int first, int n);
-  GBool readXRefStream(Stream *xrefStr, Guint *pos);
+  GBool readXRefStream(Stream *xrefStr, Goffset *pos);
   GBool constructXRef(GBool *wasReconstructed, GBool needCatalogDict = gFalse);
-  GBool parseEntry(Guint offset, XRefEntry *entry);
+  GBool parseEntry(Goffset offset, XRefEntry *entry);
   void readXRefUntil(int untilEntryNum, std::vector<int> *xrefStreamObjsNum = NULL);
   void markUnencrypted(Object *obj);
 
   class XRefWriter {
   public:
     virtual void startSection(int first, int count) = 0;
-    virtual void writeEntry(Guint offset, int gen, XRefEntryType type) = 0;
+    virtual void writeEntry(Goffset offset, int gen, XRefEntryType type) = 0;
     virtual ~XRefWriter() {};
   };
 
+  // XRefWriter subclass that writes a XRef table
   class XRefTableWriter: public XRefWriter {
   public:
     XRefTableWriter(OutStream* outStrA);
     void startSection(int first, int count);
-    void writeEntry(Guint offset, int gen, XRefEntryType type);
+    void writeEntry(Goffset offset, int gen, XRefEntryType type);
   private:
     OutStream* outStr;
   };
 
+  // XRefWriter subclass that writes a XRef stream
   class XRefStreamWriter: public XRefWriter {
   public:
-    XRefStreamWriter(Object *index, GooString *stmBuf);
+    XRefStreamWriter(Object *index, GooString *stmBuf, int offsetSize);
     void startSection(int first, int count);
-    void writeEntry(Guint offset, int gen, XRefEntryType type);
+    void writeEntry(Goffset offset, int gen, XRefEntryType type);
   private:
     Object *index;
     GooString *stmBuf;
+    int offsetSize;
+  };
+
+  // Dummy XRefWriter subclass that only checks if all offsets fit in 4 bytes
+  class XRefPreScanWriter: public XRefWriter {
+  public:
+    XRefPreScanWriter();
+    void startSection(int first, int count);
+    void writeEntry(Goffset offset, int gen, XRefEntryType type);
+
+    GBool hasOffsetsBeyond4GB;
   };
 
   void writeXRef(XRefWriter *writer, GBool writeAllEntries);
diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake
index 13a92fe5..71a3278f 100644
--- a/poppler/poppler-config.h.cmake
+++ b/poppler/poppler-config.h.cmake
@@ -158,8 +158,13 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
 //------------------------------------------------------------------------
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#ifdef __MINGW_PRINTF_FORMAT
+#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
+       __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
+#else
 #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
 	__attribute__((__format__(__printf__, fmt_index, va_index)))
+#endif
 #else
 #define GCC_PRINTF_FORMAT(fmt_index, va_index)
 #endif
diff --git a/poppler/poppler-config.h.in b/poppler/poppler-config.h.in
index 11b5691c..c5e181c4 100644
--- a/poppler/poppler-config.h.in
+++ b/poppler/poppler-config.h.in
@@ -158,8 +158,13 @@ char * strtok_r (char *s, const char *delim, char **save_ptr);
 //------------------------------------------------------------------------
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#ifdef __MINGW_PRINTF_FORMAT
+#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
+	__attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
+#else
 #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
 	__attribute__((__format__(__printf__, fmt_index, va_index)))
+#endif
 #else
 #define GCC_PRINTF_FORMAT(fmt_index, va_index)
 #endif
diff --git a/qt4/Makefile.in b/qt4/Makefile.in
index 4c119e5d..5b0c0c89 100644
--- a/qt4/Makefile.in
+++ b/qt4/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,9 +78,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = qt4
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -67,21 +94,28 @@ CONFIG_HEADER = $(top_builddir)/config.h \
 	$(top_builddir)/poppler/poppler-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -89,9 +123,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -213,6 +267,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -247,10 +304,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -272,13 +335,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -363,22 +426,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -393,57 +459,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -459,12 +480,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -476,15 +492,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -493,6 +505,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -653,22 +680,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/qt4/demos/Makefile.in b/qt4/demos/Makefile.in
index 82f0199c..3954dc30 100644
--- a/qt4/demos/Makefile.in
+++ b/qt4/demos/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,9 +80,10 @@ build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = poppler_qt4viewer$(EXEEXT)
 subdir = qt4/demos
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -85,6 +113,19 @@ poppler_qt4viewer_DEPENDENCIES = $(am__DEPENDENCIES_2)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -97,17 +138,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -116,17 +156,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(poppler_qt4viewer_SOURCES)
 DIST_SOURCES = $(poppler_qt4viewer_SOURCES)
 am__can_run_installinfo = \
@@ -134,6 +173,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -229,6 +285,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -263,10 +322,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -288,13 +353,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -422,6 +487,7 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 poppler_qt4viewer$(EXEEXT): $(poppler_qt4viewer_OBJECTS) $(poppler_qt4viewer_DEPENDENCIES) $(EXTRA_poppler_qt4viewer_DEPENDENCIES) 
 	@rm -f poppler_qt4viewer$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(poppler_qt4viewer_OBJECTS) $(poppler_qt4viewer_LDADD) $(LIBS)
@@ -474,26 +540,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -505,15 +560,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -522,6 +573,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -661,18 +727,19 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 SUFFIXES: .moc
diff --git a/qt4/demos/navigationtoolbar.cpp b/qt4/demos/navigationtoolbar.cpp
index e9ebafab..79dd418a 100644
--- a/qt4/demos/navigationtoolbar.cpp
+++ b/qt4/demos/navigationtoolbar.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
  *
  * 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
@@ -54,6 +55,15 @@ NavigationToolBar::NavigationToolBar(QWidget *parent)
     connect(m_zoomCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotZoomComboChanged(QString)));
     addWidget(m_zoomCombo);
 
+    m_rotationCombo = new QComboBox(this);
+    // NOTE: \302\260 = degree symbol
+    m_rotationCombo->addItem(trUtf8("0\302\260"));
+    m_rotationCombo->addItem(trUtf8("90\302\260"));
+    m_rotationCombo->addItem(trUtf8("180\302\260"));
+    m_rotationCombo->addItem(trUtf8("270\302\260"));
+    connect(m_rotationCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(slotRotationComboChanged(int)));
+    addWidget(m_rotationCombo);
+
     documentClosed();
 }
 
@@ -126,4 +136,9 @@ void NavigationToolBar::slotZoomComboChanged(const QString &_text)
     }
 }
 
+void NavigationToolBar::slotRotationComboChanged(int idx)
+{
+    emit rotationChanged(idx * 90);
+}
+
 #include "navigationtoolbar.moc"
diff --git a/qt4/demos/navigationtoolbar.h b/qt4/demos/navigationtoolbar.h
index 3469f01b..d7dbd5dd 100644
--- a/qt4/demos/navigationtoolbar.h
+++ b/qt4/demos/navigationtoolbar.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
  *
  * 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
@@ -40,6 +41,7 @@ public:
 
 Q_SIGNALS:
     void zoomChanged(qreal value);
+    void rotationChanged(int rotation);
 
 private Q_SLOTS:
     void slotGoFirst();
@@ -48,6 +50,7 @@ private Q_SLOTS:
     void slotGoLast();
     void slotComboActivated(int index);
     void slotZoomComboChanged(const QString &text);
+    void slotRotationComboChanged(int idx);
 
 private:
     QAction *m_firstAct;
@@ -56,6 +59,7 @@ private:
     QAction *m_nextAct;
     QAction *m_lastAct;
     QComboBox *m_zoomCombo;
+    QComboBox *m_rotationCombo;
 };
 
 #endif
diff --git a/qt4/demos/pageview.cpp b/qt4/demos/pageview.cpp
index 734dacb1..0dfa5e9e 100644
--- a/qt4/demos/pageview.cpp
+++ b/qt4/demos/pageview.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
  *
  * 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
@@ -29,6 +30,7 @@
 PageView::PageView(QWidget *parent)
     : QScrollArea(parent)
     , m_zoom(1.0)
+    , m_rotation(0)
     , m_dpiX(QApplication::desktop()->physicalDpiX())
     , m_dpiY(QApplication::desktop()->physicalDpiY())
 {
@@ -56,7 +58,18 @@ void PageView::pageChanged(int page)
     Poppler::Page *popplerPage = document()->page(page);
     const double resX = m_dpiX * m_zoom;
     const double resY = m_dpiY * m_zoom;
-    QImage image = popplerPage->renderToImage(resX, resY);
+
+    Poppler::Page::Rotation rot;
+    if (m_rotation == 0)
+        rot = Poppler::Page::Rotate0;
+    else if (m_rotation == 90)
+        rot = Poppler::Page::Rotate90;
+    else if (m_rotation == 180)
+        rot = Poppler::Page::Rotate180;
+    else // m_rotation == 270
+        rot = Poppler::Page::Rotate270;
+
+    QImage image = popplerPage->renderToImage(resX, resY, -1, -1, -1, -1, rot);
     if (!image.isNull()) {
         m_imageLabel->resize(image.size());
         m_imageLabel->setPixmap(QPixmap::fromImage(image));
@@ -76,4 +89,13 @@ void PageView::slotZoomChanged(qreal value)
     reloadPage();
 }
 
+void PageView::slotRotationChanged(int value)
+{
+    m_rotation = value;
+    if (!document()) {
+        return;
+    }
+    reloadPage();
+}
+
 #include "pageview.moc"
diff --git a/qt4/demos/pageview.h b/qt4/demos/pageview.h
index 2f7ad61b..24065028 100644
--- a/qt4/demos/pageview.h
+++ b/qt4/demos/pageview.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
  *
  * 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
@@ -39,10 +40,12 @@ public:
 
 private Q_SLOTS:
     void slotZoomChanged(qreal value);
+    void slotRotationChanged(int value);
 
 private:
     QLabel *m_imageLabel;
     qreal m_zoom;
+    int m_rotation;
     int m_dpiX;
     int m_dpiY;
 };
diff --git a/qt4/demos/viewer.cpp b/qt4/demos/viewer.cpp
index 0201eea3..c34af23f 100644
--- a/qt4/demos/viewer.cpp
+++ b/qt4/demos/viewer.cpp
@@ -2,6 +2,7 @@
  * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
  * Copyright (C) 2008, Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2009, Shawn Rutledge <shawn.t.rutledge@gmail.com>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
  *
  * 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
@@ -148,6 +149,7 @@ PdfViewer::PdfViewer()
     }
 
     connect(navbar, SIGNAL(zoomChanged(qreal)), view, SLOT(slotZoomChanged(qreal)));
+    connect(navbar, SIGNAL(rotationChanged(int)), view, SLOT(slotRotationChanged(int)));
 
     // activate AA by default
     m_settingsTextAAAct->setChecked(true);
diff --git a/poppler/ArthurOutputDev.cc b/qt4/src/ArthurOutputDev.cc
index a1cb89db..5d57e933 100644
--- a/poppler/ArthurOutputDev.cc
+++ b/qt4/src/ArthurOutputDev.cc
@@ -20,6 +20,7 @@
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
 // Copyright (C) 2010 Matthias Fauconneau <matthias.fauconneau@gmail.com>
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -122,7 +123,7 @@ void ArthurOutputDev::startDoc(XRef *xrefA) {
 #endif
 }
 
-void ArthurOutputDev::startPage(int pageNum, GfxState *state)
+void ArthurOutputDev::startPage(int pageNum, GfxState *state, XRef *xref)
 {
   // fill page with white background.
   int w = static_cast<int>(state->getPageWidth());
diff --git a/poppler/ArthurOutputDev.h b/qt4/src/ArthurOutputDev.h
index ed631a05..9d5e8679 100644
--- a/poppler/ArthurOutputDev.h
+++ b/qt4/src/ArthurOutputDev.h
@@ -18,6 +18,7 @@
 // Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2010 Pino Toscano <pino@kde.org>
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -86,7 +87,7 @@ public:
   //----- initialization and control
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
 
   // End a page.
   virtual void endPage();
diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index b5469542..59953edd 100644
--- a/qt4/src/CMakeLists.txt
+++ b/qt4/src/CMakeLists.txt
@@ -26,11 +26,11 @@ set(poppler_qt4_SRCS
   poppler-textbox.cc
   poppler-page-transition.cc
   poppler-media.cc
-  ${CMAKE_SOURCE_DIR}/poppler/ArthurOutputDev.cc
+  ArthurOutputDev.cc
 )
 qt4_automoc(${poppler_qt4_SRCS})
 add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
-set_target_properties(poppler-qt4 PROPERTIES VERSION 4.2.0 SOVERSION 4)
+set_target_properties(poppler-qt4 PROPERTIES VERSION 4.3.0 SOVERSION 4)
 target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
 if(MSVC)
 target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 77426470..13ab7ff0 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -51,17 +51,18 @@ libpoppler_qt4_la_SOURCES =			\
 	poppler-export.h			\
 	poppler-private.h			\
 	poppler-page-transition-private.h	\
-	poppler-embeddedfile-private.h
+	poppler-embeddedfile-private.h		\
+	ArthurOutputDev.h			\
+	ArthurOutputDev.cc
 
 libpoppler_qt4_la_CXXFLAGS = 			\
 	-Dpoppler_qt4_EXPORTS
 
 libpoppler_qt4_la_LIBADD = 			\
 	$(top_builddir)/poppler/libpoppler.la	\
-	$(top_builddir)/poppler/libpoppler-arthur.la	\
 	$(POPPLER_QT4_LIBS)
 
-libpoppler_qt4_la_LDFLAGS = -version-info 6:0:2 @create_shared_lib@ @auto_import_flags@
+libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
 
 # This rule lets GNU make create any *.moc from the equivalent *.h
 .h.moc:
diff --git a/qt4/src/Makefile.in b/qt4/src/Makefile.in
index eb6aba33..10e178ca 100644
--- a/qt4/src/Makefile.in
+++ b/qt4/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,10 +80,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = qt4/src
-DIST_COMMON = $(poppler_include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(poppler_include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -102,9 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libpoppler_qt4_la_DEPENDENCIES =  \
-	$(top_builddir)/poppler/libpoppler.la \
-	$(top_builddir)/poppler/libpoppler-arthur.la \
-	$(am__DEPENDENCIES_1)
+	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
 am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
 	libpoppler_qt4_la-poppler-page.lo \
 	libpoppler_qt4_la-poppler-fontinfo.lo \
@@ -123,15 +148,29 @@ am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
 	libpoppler_qt4_la-poppler-qiodeviceoutstream.lo \
 	libpoppler_qt4_la-poppler-private.lo \
 	libpoppler_qt4_la-poppler-movie.lo \
-	libpoppler_qt4_la-poppler-media.lo
+	libpoppler_qt4_la-poppler-media.lo \
+	libpoppler_qt4_la-ArthurOutputDev.lo
 libpoppler_qt4_la_OBJECTS = $(am_libpoppler_qt4_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libpoppler_qt4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(libpoppler_qt4_la_CXXFLAGS) $(CXXFLAGS) \
 	$(libpoppler_qt4_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -144,17 +183,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -163,17 +201,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libpoppler_qt4_la_SOURCES)
 DIST_SOURCES = $(libpoppler_qt4_la_SOURCES)
 am__can_run_installinfo = \
@@ -182,6 +219,23 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(poppler_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -277,6 +331,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -311,10 +368,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -336,13 +399,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -434,17 +497,18 @@ libpoppler_qt4_la_SOURCES = \
 	poppler-export.h			\
 	poppler-private.h			\
 	poppler-page-transition-private.h	\
-	poppler-embeddedfile-private.h
+	poppler-embeddedfile-private.h		\
+	ArthurOutputDev.h			\
+	ArthurOutputDev.cc
 
 libpoppler_qt4_la_CXXFLAGS = \
 	-Dpoppler_qt4_EXPORTS
 
 libpoppler_qt4_la_LIBADD = \
 	$(top_builddir)/poppler/libpoppler.la	\
-	$(top_builddir)/poppler/libpoppler-arthur.la	\
 	$(POPPLER_QT4_LIBS)
 
-libpoppler_qt4_la_LDFLAGS = -version-info 6:0:2 @create_shared_lib@ @auto_import_flags@
+libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
 BUILT_SOURCES = poppler-optcontent.moc
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -481,6 +545,7 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -507,12 +572,15 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libpoppler-qt4.la: $(libpoppler_qt4_la_OBJECTS) $(libpoppler_qt4_la_DEPENDENCIES) $(EXTRA_libpoppler_qt4_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(libpoppler_qt4_la_LINK) -rpath $(libdir) $(libpoppler_qt4_la_OBJECTS) $(libpoppler_qt4_la_LIBADD) $(LIBS)
 
@@ -522,6 +590,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt4_la-ArthurOutputDev.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt4_la-poppler-annotation.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt4_la-poppler-base-converter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt4_la-poppler-document.Plo@am__quote@
@@ -696,6 +765,13 @@ libpoppler_qt4_la-poppler-media.lo: poppler-media.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt4_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt4_la-poppler-media.lo `test -f 'poppler-media.cc' || echo '$(srcdir)/'`poppler-media.cc
 
+libpoppler_qt4_la-ArthurOutputDev.lo: ArthurOutputDev.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt4_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt4_la-ArthurOutputDev.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt4_la-ArthurOutputDev.Tpo -c -o libpoppler_qt4_la-ArthurOutputDev.lo `test -f 'ArthurOutputDev.cc' || echo '$(srcdir)/'`ArthurOutputDev.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt4_la-ArthurOutputDev.Tpo $(DEPDIR)/libpoppler_qt4_la-ArthurOutputDev.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ArthurOutputDev.cc' object='libpoppler_qt4_la-ArthurOutputDev.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt4_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt4_la-ArthurOutputDev.lo `test -f 'ArthurOutputDev.cc' || echo '$(srcdir)/'`ArthurOutputDev.cc
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -723,26 +799,15 @@ uninstall-poppler_includeHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(poppler_includedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -754,15 +819,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -771,6 +832,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -917,20 +993,21 @@ uninstall-am: uninstall-libLTLIBRARIES \
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
-	install-poppler_includeHEADERS install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-libLTLIBRARIES uninstall-poppler_includeHEADERS
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-poppler_includeHEADERS install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-poppler_includeHEADERS
 
 
 SUFFIXES: .moc
diff --git a/qt4/src/poppler-annotation-private.h b/qt4/src/poppler-annotation-private.h
index 3bfb5daf..c755eb35 100644
--- a/qt4/src/poppler-annotation-private.h
+++ b/qt4/src/poppler-annotation-private.h
@@ -1,7 +1,7 @@
 /* poppler-annotation-private.h: qt interface to poppler
  * Copyright (C) 2007, Pino Toscano <pino@kde.org>
  * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
- * Copyright (C) 2012, Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
  * Copyright (C) 2012, Albert Astals Cid <aacid@kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -87,9 +87,10 @@ class AnnotationPrivate : public QSharedData
 
         /* The following helpers only work if pdfPage is set */
         void flushBaseAnnotationProperties();
-        void fillMTX(double MTX[6]) const;
+        void fillNormalizationMTX(double MTX[6], int pageRotation) const;
+        void fillTransformationMTX(double MTX[6]) const;
         QRectF fromPdfRectangle(const PDFRectangle &r) const;
-        PDFRectangle toPdfRectangle(const QRectF &r) const;
+        PDFRectangle boundaryToPdfRectangle(const QRectF &r, int flags) const;
         AnnotPath * toAnnotPath(const QLinkedList<QPointF> &l) const;
 
         /* Scan page for annotations, parentId=0 searches for root annotations */
diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc
index 5ecea80e..08044c08 100644
--- a/qt4/src/poppler-annotation.cc
+++ b/qt4/src/poppler-annotation.cc
@@ -2,7 +2,7 @@
  * Copyright (C) 2006, 2009, 2012 Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2006, 2008, 2010 Pino Toscano <pino@kde.org>
  * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
- * Copyright (C) 2012, Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
  * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
  * Adapting code from
  *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
@@ -27,6 +27,7 @@
 #include <QtCore/QtAlgorithms>
 #include <QtXml/QDomElement>
 #include <QtGui/QColor>
+#include <QtGui/QTransform>
 
 // local includes
 #include "poppler-annotation.h"
@@ -198,19 +199,21 @@ void AnnotationPrivate::flushBaseAnnotationProperties()
     revisions.clear();
 }
 
-void AnnotationPrivate::fillMTX(double MTX[6]) const
+// Returns matrix to convert from user space coords (oriented according to the
+// specified rotation) to normalized coords
+void AnnotationPrivate::fillNormalizationMTX(double MTX[6], int pageRotation) const
 {
     Q_ASSERT ( pdfPage );
 
     // build a normalized transform matrix for this page at 100% scale
-    GfxState * gfxState = new GfxState( 72.0, 72.0, pdfPage->getCropBox(), pdfPage->getRotate(), gTrue );
+    GfxState * gfxState = new GfxState( 72.0, 72.0, pdfPage->getCropBox(), pageRotation, gTrue );
     double * gfxCTM = gfxState->getCTM();
 
     double w = pdfPage->getCropWidth();
     double h = pdfPage->getCropHeight();
 
     // Swap width and height if the page is rotated landscape or seascape
-    if ( pdfPage->getRotate() == 90 || pdfPage->getRotate() == 270 )
+    if ( pageRotation == 90 || pageRotation == 270 )
     {
         double t = w;
         w = h;
@@ -225,10 +228,51 @@ void AnnotationPrivate::fillMTX(double MTX[6]) const
     delete gfxState;
 }
 
+// Returns matrix to convert from user space coords (i.e. those that are stored
+// in the PDF file) to normalized coords (i.e. those that we expose to clients).
+// This method also applies a rotation around the top-left corner if the
+// FixedRotation flag is set.
+void AnnotationPrivate::fillTransformationMTX(double MTX[6]) const
+{
+    Q_ASSERT ( pdfPage );
+    Q_ASSERT ( pdfAnnot );
+
+    const int pageRotate = pdfPage->getRotate();
+
+    if ( pageRotate == 0 || ( pdfAnnot->getFlags() & Annot::flagNoRotate ) == 0 )
+    {
+        // Use the normalization matrix for this page's rotation
+        fillNormalizationMTX( MTX, pageRotate );
+    }
+    else
+    {
+        // Clients expect coordinates relative to this page's rotation, but
+        // FixedRotation annotations internally use unrotated coordinates:
+        // construct matrix to both normalize and rotate coordinates using the
+        // top-left corner as rotation pivot
+
+        double MTXnorm[6];
+        fillNormalizationMTX( MTXnorm, pageRotate );
+
+        QTransform transform( MTXnorm[0], MTXnorm[1], MTXnorm[2],
+                              MTXnorm[3], MTXnorm[4], MTXnorm[5] );
+        transform.translate( +pdfAnnot->getXMin(), +pdfAnnot->getYMax() );
+        transform.rotate( pageRotate );
+        transform.translate( -pdfAnnot->getXMin(), -pdfAnnot->getYMax() );
+
+        MTX[0] = transform.m11();
+        MTX[1] = transform.m12();
+        MTX[2] = transform.m21();
+        MTX[3] = transform.m22();
+        MTX[4] = transform.dx();
+        MTX[5] = transform.dy();
+    }
+}
+
 QRectF AnnotationPrivate::fromPdfRectangle(const PDFRectangle &r) const
 {
     double swp, MTX[6];
-    fillMTX(MTX);
+    fillTransformationMTX(MTX);
 
     QPointF p1, p2;
     XPDFReader::transform( MTX, r.x1, r.y1, p1 );
@@ -256,10 +300,20 @@ QRectF AnnotationPrivate::fromPdfRectangle(const PDFRectangle &r) const
     return QRectF( QPointF(tl_x,tl_y) , QPointF(br_x,br_y) );
 }
 
-PDFRectangle AnnotationPrivate::toPdfRectangle(const QRectF &r) const
+// This function converts a boundary QRectF in normalized coords to a
+// PDFRectangle in user coords. If the FixedRotation flag is set, this function
+// also applies a rotation around the top-left corner: it's the inverse of
+// the transformation produced by fillTransformationMTX, but we can't use
+// fillTransformationMTX here because it relies on the native annotation
+// object's boundary rect to be already set up.
+PDFRectangle AnnotationPrivate::boundaryToPdfRectangle(const QRectF &r, int flags) const
 {
+    Q_ASSERT ( pdfPage );
+
+    const int pageRotate = pdfPage->getRotate();
+
     double MTX[6];
-    fillMTX(MTX);
+    fillNormalizationMTX( MTX, pageRotate );
 
     double tl_x, tl_y, br_x, br_y, swp;
     XPDFReader::invTransform( MTX, r.topLeft(), tl_x, tl_y );
@@ -279,7 +333,18 @@ PDFRectangle AnnotationPrivate::toPdfRectangle(const QRectF &r) const
         br_y = swp;
     }
 
-    return PDFRectangle(tl_x, tl_y, br_x, br_y);
+    const int rotationFixUp = ( flags & Annotation::FixedRotation ) ? pageRotate : 0;
+    const double width = br_x - tl_x;
+    const double height = br_y - tl_y;
+
+    if ( rotationFixUp == 0 )
+        return PDFRectangle(tl_x, tl_y, br_x, br_y);
+    else if ( rotationFixUp == 90 )
+        return PDFRectangle(tl_x, tl_y - width, tl_x + height, tl_y);
+    else if ( rotationFixUp == 180 )
+        return PDFRectangle(br_x, tl_y - height, br_x + width, tl_y);
+    else // rotationFixUp == 270
+        return PDFRectangle(br_x, br_y - width, br_x + height, br_y);
 }
 
 AnnotPath * AnnotationPrivate::toAnnotPath(const QLinkedList<QPointF> &list) const
@@ -288,7 +353,7 @@ AnnotPath * AnnotationPrivate::toAnnotPath(const QLinkedList<QPointF> &list) con
     AnnotCoord **ac = (AnnotCoord **) gmallocn(count, sizeof(AnnotCoord*));
 
     double MTX[6];
-    fillMTX(MTX);
+    fillTransformationMTX(MTX);
 
     int pos = 0;
     foreach (const QPointF &p, list)
@@ -1117,7 +1182,6 @@ void Annotation::setContents( const QString &contents )
     GooString *s = QStringToUnicodeGooString(contents);
     d->pdfAnnot->setContents(s);
     delete s;
-    d->pdfAnnot->invalidateAppearance();
 }
 
 QString Annotation::uniqueName() const
@@ -1281,7 +1345,6 @@ void Annotation::setFlags( int flags )
     }
 
     d->pdfAnnot->setFlags(toPdfFlags( flags ));
-    d->pdfAnnot->invalidateAppearance();
 }
 
 QRectF Annotation::boundary() const
@@ -1305,9 +1368,8 @@ void Annotation::setBoundary( const QRectF &boundary )
         return;
     }
 
-    PDFRectangle rect = d->toPdfRectangle(boundary);
+    PDFRectangle rect = d->boundaryToPdfRectangle( boundary, flags() );
     d->pdfAnnot->setRect(&rect);
-    d->pdfAnnot->invalidateAppearance();
 }
 
 Annotation::Style Annotation::style() const
@@ -1388,7 +1450,6 @@ void Annotation::setStyle( const Annotation::Style& style )
     border->setHorizontalCorner( style.xCorners() );
     border->setVerticalCorner( style.yCorners() );
     d->pdfAnnot->setBorder(border);
-    d->pdfAnnot->invalidateAppearance();
 }
 
 Annotation::Popup Annotation::popup() const
@@ -1601,7 +1662,7 @@ Annot* TextAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *
     parentDoc = doc;
 
     // Set pdfAnnot
-    PDFRectangle rect = toPdfRectangle(boundary);
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
     if (textType == TextAnnotation::Linked)
     {
         pdfAnnot = new AnnotText(destPage->getDoc(), &rect);
@@ -1622,6 +1683,8 @@ Annot* TextAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *
 
     delete q;
 
+    inplaceCallout.clear(); // Free up memory
+
     return pdfAnnot;
 }
 
@@ -1801,7 +1864,6 @@ void TextAnnotation::setTextIcon( const QString &icon )
         QByteArray encoded = icon.toLatin1();
         GooString s(encoded.constData());
         textann->setIcon(&s);
-        d->pdfAnnot->invalidateAppearance();
     }
 }
 
@@ -1849,7 +1911,6 @@ void TextAnnotation::setTextFont( const QFont &font )
     GooString * da = TextAnnotationPrivate::toAppearanceString(font);
     ftextann->setAppearanceString(da);
     delete da;
-    d->pdfAnnot->invalidateAppearance();
 }
 
 int TextAnnotation::inplaceAlign() const
@@ -1882,7 +1943,6 @@ void TextAnnotation::setInplaceAlign( int align )
     {
         AnnotFreeText * ftextann = static_cast<AnnotFreeText*>(d->pdfAnnot);
         ftextann->setQuadding((AnnotFreeText::AnnotFreeTextQuadding)align);
-        d->pdfAnnot->invalidateAppearance();
     }
 }
 
@@ -1922,7 +1982,7 @@ QVector<QPointF> TextAnnotation::calloutPoints() const
         return QVector<QPointF>();
 
     double MTX[6];
-    d->fillMTX(MTX);
+    d->fillTransformationMTX(MTX);
 
     const AnnotCalloutMultiLine * callout_v6 = dynamic_cast<const AnnotCalloutMultiLine*>(callout);
     QVector<QPointF> res(callout_v6 ? 3 : 2);
@@ -1951,7 +2011,6 @@ void TextAnnotation::setCalloutPoints( const QVector<QPointF> &points )
     if (count == 0)
     {
         ftextann->setCalloutLine(0);
-        d->pdfAnnot->invalidateAppearance();
         return;
     }
 
@@ -1964,7 +2023,7 @@ void TextAnnotation::setCalloutPoints( const QVector<QPointF> &points )
     AnnotCalloutLine *callout;
     double x1, y1, x2, y2;
     double MTX[6];
-    d->fillMTX(MTX);
+    d->fillTransformationMTX(MTX);
 
     XPDFReader::invTransform( MTX, points[0], x1, y1 );
     XPDFReader::invTransform( MTX, points[1], x2, y2 );
@@ -1981,7 +2040,6 @@ void TextAnnotation::setCalloutPoints( const QVector<QPointF> &points )
 
     ftextann->setCalloutLine(callout);
     delete callout;
-    d->pdfAnnot->invalidateAppearance();
 }
 
 TextAnnotation::InplaceIntent TextAnnotation::inplaceIntent() const
@@ -2014,7 +2072,6 @@ void TextAnnotation::setInplaceIntent( TextAnnotation::InplaceIntent intent )
     {
         AnnotFreeText * ftextann = static_cast<AnnotFreeText*>(d->pdfAnnot);
         ftextann->setIntent((AnnotFreeText::AnnotFreeTextIntent)intent);
-        d->pdfAnnot->invalidateAppearance();
     }
 }
 
@@ -2063,22 +2120,20 @@ Annot* LineAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *
     parentDoc = doc;
 
     // Set pdfAnnot
-    AnnotPath * path = toAnnotPath(linePoints);
-    PDFRectangle rect = toPdfRectangle(boundary);
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
     if (lineType == LineAnnotation::StraightLine)
     {
-        PDFRectangle lrect(path->getX(0), path->getY(0), path->getX(1), path->getY(1));
-        pdfAnnot = new AnnotLine(doc->doc, &rect, &lrect);
+        pdfAnnot = new AnnotLine(doc->doc, &rect);
     }
     else
     {
         pdfAnnot = new AnnotPolygon(doc->doc, &rect,
-                lineClosed ? Annot::typePolygon : Annot::typePolyLine, path );
+                lineClosed ? Annot::typePolygon : Annot::typePolyLine );
     }
-    delete path;
 
     // Set properties
     flushBaseAnnotationProperties();
+    q->setLinePoints(linePoints);
     q->setLineStartStyle(lineStartStyle);
     q->setLineEndStyle(lineEndStyle);
     q->setLineInnerColor(lineInnerColor);
@@ -2241,7 +2296,7 @@ QLinkedList<QPointF> LineAnnotation::linePoints() const
         return d->linePoints;
 
     double MTX[6];
-    d->fillMTX(MTX);
+    d->fillTransformationMTX(MTX);
 
     QLinkedList<QPointF> res;
     if (d->pdfAnnot->getType() == Annot::typeLine)
@@ -2289,7 +2344,7 @@ void LineAnnotation::setLinePoints( const QLinkedList<QPointF> &points )
         }
         double x1, y1, x2, y2;
         double MTX[6];
-        d->fillMTX(MTX);
+        d->fillTransformationMTX(MTX);
         XPDFReader::invTransform( MTX, points.first(), x1, y1 );
         XPDFReader::invTransform( MTX, points.last(), x2, y2 );
         lineann->setVertices(x1, y1, x2, y2);
@@ -2301,8 +2356,6 @@ void LineAnnotation::setLinePoints( const QLinkedList<QPointF> &points )
         polyann->setVertices(p);
         delete p;
     }
-
-    d->pdfAnnot->invalidateAppearance();
 }
 
 LineAnnotation::TermStyle LineAnnotation::lineStartStyle() const
@@ -2344,8 +2397,6 @@ void LineAnnotation::setLineStartStyle( LineAnnotation::TermStyle style )
         AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
         polyann->setStartEndStyle((AnnotLineEndingStyle)style, polyann->getEndStyle());
     }
-
-    d->pdfAnnot->invalidateAppearance();
 }
 
 LineAnnotation::TermStyle LineAnnotation::lineEndStyle() const
@@ -2387,8 +2438,6 @@ void LineAnnotation::setLineEndStyle( LineAnnotation::TermStyle style )
         AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
         polyann->setStartEndStyle(polyann->getStartStyle(), (AnnotLineEndingStyle)style);
     }
-
-    d->pdfAnnot->invalidateAppearance();
 }
 
 bool LineAnnotation::isLineClosed() const
@@ -2428,8 +2477,6 @@ void LineAnnotation::setLineClosed( bool closed )
             if (polyann->getIntent() == AnnotPolygon::polygonDimension)
                 polyann->setIntent( AnnotPolygon::polylineDimension );
         }
-
-        d->pdfAnnot->invalidateAppearance();
     }
 }
 
@@ -2478,8 +2525,6 @@ void LineAnnotation::setLineInnerColor( const QColor &color )
         AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
         polyann->setInteriorColor(c);
     }
-
-    d->pdfAnnot->invalidateAppearance();
 }
 
 double LineAnnotation::lineLeadingForwardPoint() const
@@ -2512,7 +2557,6 @@ void LineAnnotation::setLineLeadingForwardPoint( double point )
     {
         AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
         lineann->setLeaderLineLength(point);
-        d->pdfAnnot->invalidateAppearance();
     }
 }
 
@@ -2546,7 +2590,6 @@ void LineAnnotation::setLineLeadingBackPoint( double point )
     {
         AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
         lineann->setLeaderLineExtension(point);
-        d->pdfAnnot->invalidateAppearance();
     }
 }
 
@@ -2580,7 +2623,6 @@ void LineAnnotation::setLineShowCaption( bool show )
     {
         AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
         lineann->setCaption(show);
-        d->pdfAnnot->invalidateAppearance();
     }
 }
 
@@ -2637,8 +2679,6 @@ void LineAnnotation::setLineIntent( LineAnnotation::LineIntent intent )
                 polyann->setIntent( AnnotPolygon::polylineDimension );
         }
     }
-
-    d->pdfAnnot->invalidateAppearance();
 }
 
 
@@ -2681,7 +2721,7 @@ Annot* GeomAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *
         type = Annot::typeCircle;
 
     // Set pdfAnnot
-    PDFRectangle rect = toPdfRectangle(boundary);
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
     pdfAnnot = new AnnotGeometry(destPage->getDoc(), &rect, type);
 
     // Set properties
@@ -2776,8 +2816,6 @@ void GeomAnnotation::setGeomType( GeomAnnotation::GeomType type )
         geomann->setType(Annot::typeSquare);
     else // GeomAnnotation::InscribedCircle
         geomann->setType(Annot::typeCircle);
-
-    d->pdfAnnot->invalidateAppearance();
 }
 
 QColor GeomAnnotation::geomInnerColor() const
@@ -2803,7 +2841,6 @@ void GeomAnnotation::setGeomInnerColor( const QColor &color )
 
     AnnotGeometry * geomann = static_cast<AnnotGeometry*>(d->pdfAnnot);
     geomann->setInteriorColor(convertQColor( color ));
-    d->pdfAnnot->invalidateAppearance();
 }
 
 
@@ -2859,7 +2896,7 @@ QList< HighlightAnnotation::Quad > HighlightAnnotationPrivate::fromQuadrilateral
     const int quadsCount = hlquads->getQuadrilateralsLength();
 
     double MTX[6];
-    fillMTX(MTX);
+    fillTransformationMTX(MTX);
 
     for (int q = 0; q < quadsCount; ++q)
     {
@@ -2891,7 +2928,7 @@ AnnotQuadrilaterals * HighlightAnnotationPrivate::toQuadrilaterals(const QList<
             gmallocn( count, sizeof(AnnotQuadrilaterals::AnnotQuadrilateral*) );
 
     double MTX[6];
-    fillMTX(MTX);
+    fillTransformationMTX(MTX);
 
     int pos = 0;
     foreach (const HighlightAnnotation::Quad &q, quads)
@@ -2910,21 +2947,25 @@ AnnotQuadrilaterals * HighlightAnnotationPrivate::toQuadrilaterals(const QList<
 
 Annot* HighlightAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
 {
+    // Setters are defined in the public class
+    HighlightAnnotation *q = static_cast<HighlightAnnotation*>( makeAlias() );
+
     // Set page and document
     pdfPage = destPage;
     parentDoc = doc;
 
     // Set pdfAnnot
-    PDFRectangle rect = toPdfRectangle(boundary);
-    AnnotQuadrilaterals * quads = toQuadrilaterals(highlightQuads);
-    pdfAnnot = new AnnotTextMarkup(destPage->getDoc(), &rect, toAnnotSubType(highlightType), quads);
-    delete quads;
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    pdfAnnot = new AnnotTextMarkup(destPage->getDoc(), &rect, toAnnotSubType(highlightType));
 
     // Set properties
     flushBaseAnnotationProperties();
+    q->setHighlightQuads(highlightQuads);
 
     highlightQuads.clear(); // Free up memory
 
+    delete q;
+
     return pdfAnnot;
 }
 
@@ -3061,7 +3102,6 @@ void HighlightAnnotation::setHighlightType( HighlightAnnotation::HighlightType t
 
     AnnotTextMarkup * hlann = static_cast<AnnotTextMarkup*>(d->pdfAnnot);
     hlann->setType(HighlightAnnotationPrivate::toAnnotSubType( type ));
-    d->pdfAnnot->invalidateAppearance();
 }
 
 QList< HighlightAnnotation::Quad > HighlightAnnotation::highlightQuads() const
@@ -3089,7 +3129,6 @@ void HighlightAnnotation::setHighlightQuads( const QList< HighlightAnnotation::Q
     AnnotQuadrilaterals * quadrilaterals = d->toQuadrilaterals(quads);
     hlann->setQuadrilaterals(quadrilaterals);
     delete quadrilaterals;
-    d->pdfAnnot->invalidateAppearance();
 }
 
 
@@ -3124,7 +3163,7 @@ Annot* StampAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData
     parentDoc = doc;
 
     // Set pdfAnnot
-    PDFRectangle rect = toPdfRectangle(boundary);
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
     pdfAnnot = new AnnotStamp(destPage->getDoc(), &rect);
 
     // Set properties
@@ -3215,7 +3254,6 @@ void StampAnnotation::setStampIconName( const QString &name )
     QByteArray encoded = name.toLatin1();
     GooString s(encoded.constData());
     stampann->setIcon(&s);
-    d->pdfAnnot->invalidateAppearance();
 }
 
 /** InkAnnotation [Annotation] */
@@ -3255,25 +3293,25 @@ AnnotPath **InkAnnotationPrivate::toAnnotPaths(const QList< QLinkedList<QPointF>
 
 Annot* InkAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
 {
+    // Setters are defined in the public class
+    InkAnnotation *q = static_cast<InkAnnotation*>( makeAlias() );
+
     // Set page and document
     pdfPage = destPage;
     parentDoc = doc;
 
     // Set pdfAnnot
-    PDFRectangle rect = toPdfRectangle(boundary);
-    AnnotPath **paths = toAnnotPaths(inkPaths);
-    const int pathsNumber = inkPaths.size();
-    pdfAnnot = new AnnotInk(destPage->getDoc(), &rect, paths, pathsNumber);
-
-    for (int i = 0; i < pathsNumber; ++i)
-        delete paths[i];
-    delete[] paths;
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    pdfAnnot = new AnnotInk(destPage->getDoc(), &rect);
 
     // Set properties
     flushBaseAnnotationProperties();
+    q->setInkPaths(inkPaths);
 
     inkPaths.clear(); // Free up memory
 
+    delete q;
+
     return pdfAnnot;
 }
 
@@ -3388,7 +3426,7 @@ QList< QLinkedList<QPointF> > InkAnnotation::inkPaths() const
         return QList< QLinkedList<QPointF> >();
 
     double MTX[6];
-    d->fillMTX(MTX);
+    d->fillTransformationMTX(MTX);
 
     const int pathsNumber = inkann->getInkListLength();
     QList< QLinkedList<QPointF> > inkPaths;
@@ -3428,8 +3466,6 @@ void InkAnnotation::setInkPaths( const QList< QLinkedList<QPointF> > &paths )
     for (int i = 0; i < pathsNumber; ++i)
         delete annotpaths[i];
     delete[] annotpaths;
-
-    d->pdfAnnot->invalidateAppearance();
 }
 
 
@@ -3809,7 +3845,7 @@ Annot* CaretAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData
     parentDoc = doc;
 
     // Set pdfAnnot
-    PDFRectangle rect = toPdfRectangle(boundary);
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
     pdfAnnot = new AnnotCaret(destPage->getDoc(), &rect);
 
     // Set properties
@@ -3897,7 +3933,6 @@ void CaretAnnotation::setCaretSymbol( CaretAnnotation::CaretSymbol symbol )
 
     AnnotCaret * caretann = static_cast<AnnotCaret *>(d->pdfAnnot);
     caretann->setSymbol((AnnotCaret::AnnotCaretSymbol)symbol);
-    d->pdfAnnot->invalidateAppearance();
 }
 
 /** FileAttachmentAnnotation [Annotation] */
diff --git a/qt4/src/poppler-annotation.h b/qt4/src/poppler-annotation.h
index 9208ca7a..03f5e263 100644
--- a/qt4/src/poppler-annotation.h
+++ b/qt4/src/poppler-annotation.h
@@ -5,7 +5,7 @@
  * Copyright (C) 2010, Philip Lorenz <lorenzph+freedesktop@gmail.com>
  * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
  * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
- * Copyright (C) 2012, Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
  * Adapting code from
  *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
  *
@@ -101,7 +101,71 @@ class POPPLER_QT4_EXPORT AnnotationUtils
  * contained by a Page in the document.
  *
  * \warning Different Annotation objects might point to the same annotation.
- *          Use uniqueName to test for Annotation equality
+ *
+ * \section annotCreation How to add annotations
+ *
+ * Create an Annotation object of the desired subclass (for example
+ * TextAnnotation) and set its properties:
+ * @code
+ * Poppler::TextAnnotation* myann = new Poppler::TextAnnotation(Poppler::TextAnnotation::InPlace);
+ * myann->setBoundary(QRectF(0.1, 0.1, 0.2, 0.2)); // normalized coordinates: (0,0) is top-left, (1,1) is bottom-right
+ * myann->setContents("Hello, world!");
+ * @endcode
+ * \note Always set a boundary rectangle, or nothing will be shown!
+ *
+ * Obtain a pointer to the Page where you want to add the annotation (refer to
+ * \ref req for instructions) and add the annotation:
+ * @code
+ * Poppler::Page* mypage = ...;
+ * mypage->addAnnotation(myann);
+ * @endcode
+ *
+ * You can keep on editing the annotation after it has been added to the page:
+ * @code
+ * myann->setContents("World, hello!"); // Let's change text...
+ * myann->setAuthor("Your name here");  // ...and set an author too
+ * @endcode
+ *
+ * When you're done with editing the annotation, you must destroy the Annotation
+ * object:
+ * @code
+ * delete myann;
+ * @endcode
+ *
+ * Use the PDFConverter class to save the modified document.
+ *
+ * \section annotFixedRotation FixedRotation flag specifics
+ *
+ * According to the PDF specification, annotations whose
+ * Annotation::FixedRotation flag is set must always be shown in their original
+ * orientation, no matter what the current rendering rotation or the page's
+ * Page::orientation() values are. In comparison with regular annotations, such
+ * annotations should therefore be transformed by an extra rotation at rendering
+ * time to "undo" such context-related rotations, which is equal to
+ * <code>-(rendering_rotation + page_orientation)</code>. The rotation pivot
+ * is the top-left corner of the boundary rectangle.
+ *
+ * In practice, %Poppler's \ref Page::renderToImage only "unrotates" the
+ * page orientation, and does <b>not</b> unrotate the rendering rotation.
+ * This ensures consistent renderings at different Page::Rotation values:
+ * annotations are always positioned as if they were being positioned at the
+ * default page orientation.
+ *
+ * Just like regular annotations, %Poppler Qt4 exposes normalized coordinates
+ * relative to the page's default orientation. However, behind the scenes, the
+ * coordinate system is different and %Poppler transparently transforms each
+ * shape. If you never call either Annotation::setFlags or
+ * Annotation::setBoundary, you don't need to worry about this; but if you do
+ * call them, then you need to adhere to the following rules:
+ *  - Whenever you toggle the Annotation::FixedRotation flag, you <b>must</b>
+ *    set again the boundary rectangle first, and then you <b>must</b> set
+ *    again any other geometry-related property.
+ *  - Whenever you modify the boundary rectangle of an annotation whose
+ *    Annotation::FixedRotation flag is set, you <b>must</b> set again any other
+ *    geometry-related property.
+ *
+ * These two rules are necessary to make %Poppler's transparent coordinate
+ * conversion work properly.
  */
 class POPPLER_QT4_EXPORT Annotation
 {
@@ -111,12 +175,50 @@ class POPPLER_QT4_EXPORT Annotation
 
   public:
     // enum definitions
+    /**
+     * Annotation subclasses
+     *
+     * \sa subType()
+     */
     // WARNING!!! oKular uses that very same values so if you change them notify the author!
-    enum SubType { AText = 1, ALine = 2, AGeom = 3, AHighlight = 4, AStamp = 5,
-                   AInk = 6, ALink = 7, ACaret = 8, AFileAttachment = 9, ASound = 10,
-                   AMovie = 11, AScreen = 12 /** \since 0.20 */, AWidget = 13 /** \since 0.22 */, A_BASE = 0 };
-    enum Flag { Hidden = 1, FixedSize = 2, FixedRotation = 4, DenyPrint = 8,
-                DenyWrite = 16, DenyDelete = 32, ToggleHidingOnMouse = 64, External = 128 };
+    enum SubType
+    {
+        AText = 1,            ///< TextAnnotation
+        ALine = 2,            ///< LineAnnotation
+        AGeom = 3,            ///< GeomAnnotation
+        AHighlight = 4,       ///< HighlightAnnotation
+        AStamp = 5,           ///< StampAnnotation
+        AInk = 6,             ///< InkAnnotation
+        ALink = 7,            ///< LinkAnnotation
+        ACaret = 8,           ///< CaretAnnotation
+        AFileAttachment = 9,  ///< FileAttachmentAnnotation
+        ASound = 10,          ///< SoundAnnotation
+        AMovie = 11,          ///< MovieAnnotation
+        AScreen = 12,         ///< ScreenAnnotation \since 0.20
+        AWidget = 13,         ///< WidgetAnnotation \since 0.22
+        A_BASE = 0
+    };
+
+    /**
+     * Annotation flags
+     *
+     * They can be OR'd together (e.g. Annotation::FixedRotation | Annotation::DenyPrint).
+     *
+     * \sa flags(), setFlags(int)
+     */
+    // NOTE: Only flags that are known to work are documented
+    enum Flag
+    {
+        Hidden = 1,                ///< Do not display or print the annotation
+        FixedSize = 2,
+        FixedRotation = 4,         ///< Do not rotate the annotation according to page orientation and rendering rotation \warning Extra care is needed with this flag: see \ref annotFixedRotation
+        DenyPrint = 8,             ///< Do not print the annotation
+        DenyWrite = 16,
+        DenyDelete = 32,
+        ToggleHidingOnMouse = 64,
+        External = 128
+    };
+
     enum LineStyle { Solid = 1, Dashed = 2, Beveled = 4, Inset = 8, Underline = 16 };
     enum LineEffect { NoEffect = 1, Cloudy = 2};
     enum RevScope { Root = 0 /** \since 0.20 */, Reply = 1, Group = 2, Delete = 4 };
@@ -151,10 +253,35 @@ class POPPLER_QT4_EXPORT Annotation
     QDateTime creationDate() const;
     void setCreationDate( const QDateTime &date );
 
+    /**
+     * Returns this annotation's flags
+     *
+     * \sa Flag, setFlags(int)
+     */
     int flags() const;
+    /**
+     * Sets this annotation's flags
+     *
+     * \sa Flag, flags(), \ref annotFixedRotation
+     */
     void setFlags( int flags );
 
+    /**
+     * Returns this annotation's boundary rectangle in normalized coordinates
+     *
+     * \sa setBoundary(const QRectF&)
+     */
     QRectF boundary() const;
+    /**
+     * Sets this annotation's boundary rectangle
+     *
+     * The boundary rectangle is the smallest rectangle that contains the
+     * annotation.
+     *
+     * \warning This property is mandatory: you must always set this.
+     *
+     * \sa boundary(), \ref annotFixedRotation
+     */
     void setBoundary( const QRectF &boundary );
 
     /**
@@ -240,7 +367,7 @@ class POPPLER_QT4_EXPORT Annotation
 
     /// \since 0.20
     Popup popup() const;
-    /// \since 0.20
+    /// \warning Currently does nothing \since 0.20
     void setPopup( const Popup& popup );
 
     /// \cond PRIVATE
diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index ee56ed69..7d13656d 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -5,7 +5,7 @@
  * Copyright (C) 2006-2010, Pino Toscano <pino@kde.org>
  * Copyright (C) 2010, 2011 Hib Eris <hib@hiberis.nl>
  * Copyright (C) 2012 Koji Otani <sho@bbr.jp>
- * Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
  * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -239,8 +239,10 @@ namespace Poppler {
 	if (fi.isEmbedded())
 	{
 		Object refObj, strObj;
+		XRef *xref = m_doc->doc->getXRef()->copy();
+
 		refObj.initRef(fi.m_data->embRef.num, fi.m_data->embRef.gen);
-		refObj.fetch(m_doc->doc->getXRef(), &strObj);
+		refObj.fetch(xref, &strObj);
 		refObj.free();
 		if (strObj.isStream())
 		{
@@ -253,6 +255,7 @@ namespace Poppler {
 			strObj.streamClose();
 		}
 		strObj.free();
+		delete xref;
 	}
 	return result;
     }
@@ -265,7 +268,8 @@ namespace Poppler {
 	if ( m_doc->locked )
 	    return QString();
 
-	m_doc->doc->getDocInfo( &info );
+	QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy());
+	xref->getDocInfo(&info);
 	if ( !info.isDict() )
 	    return QString();
 
@@ -295,7 +299,8 @@ namespace Poppler {
 	if ( m_doc->locked )
 	    return QStringList();
 
-	m_doc->doc->getDocInfo( &info );
+	QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy());
+	xref->getDocInfo(&info);
 	if ( !info.isDict() )
 	    return QStringList();
 
@@ -317,7 +322,8 @@ namespace Poppler {
 	    return QDateTime();
 
 	Object info;
-	m_doc->doc->getDocInfo( &info );
+	QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy());
+	xref->getDocInfo(&info);
 	if ( !info.isDict() ) {
 	    info.free();
 	    return QDateTime();
@@ -521,7 +527,6 @@ namespace Poppler {
 
     void Document::setRenderHint( Document::RenderHint hint, bool on )
     {
-        const bool touchesAntialias = hint & ( Document::Antialiasing | Document::TextAntialiasing | Document::TextHinting );
         const bool touchesOverprinting = hint & Document::OverprintPreview;
         
         int hintForOperation = hint;
@@ -533,12 +538,6 @@ namespace Poppler {
         else
             m_doc->m_hints &= ~hintForOperation;
 
-        // the only way to set antialiasing for Splash is on creation
-        if ( m_doc->m_backend == Document::SplashBackend && (touchesAntialias || touchesOverprinting) )
-        {
-            delete m_doc->m_outputDev;
-            m_doc->m_outputDev = NULL;
-        }
     }
 
     Document::RenderHints Document::renderHints() const
diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc
index 5b3f7d3d..f70573ac 100644
--- a/qt4/src/poppler-embeddedfile.cc
+++ b/qt4/src/poppler-embeddedfile.cc
@@ -1,5 +1,5 @@
 /* poppler-document.cc: qt interface to poppler
- * Copyright (C) 2005, 2008, 2009, 2012, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005, 2008, 2009, 2012, 2013, Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
  * Copyright (C) 2008, 2011, Pino Toscano <pino@kde.org>
  *
@@ -69,7 +69,7 @@ EmbeddedFile::~EmbeddedFile()
 QString EmbeddedFile::name() const
 {
 	GooString *goo = m_embeddedFile->filespec->getFileName();
-	return goo ? QString(goo->getCString()) : QString();
+	return goo ? UnicodeParsedString(goo) : QString();
 }
 
 QString EmbeddedFile::description() const
diff --git a/qt4/src/poppler-media.cc b/qt4/src/poppler-media.cc
index c3181472..1757fdbb 100644
--- a/qt4/src/poppler-media.cc
+++ b/qt4/src/poppler-media.cc
@@ -1,5 +1,6 @@
 /* poppler-media.cc: qt interface to poppler
  * Copyright (C) 2012 Guillermo A. Amaral B. <gamaral@kde.org>
+ * Copyright (C) 2013 Albert Astals Cid <aacid@kde.org>
  *
  * 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
@@ -37,6 +38,11 @@ public:
   : rendition(rendition)
   {
   }
+  
+  ~MediaRenditionPrivate()
+  {
+    delete rendition;
+  }
 
   ::MediaRendition *rendition;
 };
diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index 54756146..f7c24273 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -1,7 +1,7 @@
 /* poppler-page.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
  * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
- * Copyright (C) 2005-2012, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005-2013, Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
  * Copyright (C) 2006-2011, Pino Toscano <pino@kde.org>
  * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -13,7 +13,7 @@
  * Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com>
  * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
  * Copyright (C) 2012 Adam Reichold <adamreichold@myopera.com>
- * Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
  *
  * 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
@@ -204,7 +204,7 @@ Link* PageData::convertLinkActionToLink(::LinkAction * a, DocumentData *parentDo
       if ( lrn->hasScreenAnnot() )
         reference = lrn->getScreenAnnot();
 
-      popplerLink = new LinkRendition( linkArea, lrn->getMedia(), lrn->getOperation(), UnicodeParsedString( lrn->getScript() ), reference );
+      popplerLink = new LinkRendition( linkArea, lrn->getMedia()->copy(), lrn->getOperation(), UnicodeParsedString( lrn->getScript() ), reference );
     }
     break;
 
@@ -229,7 +229,8 @@ TextPage *PageData::prepareTextSearch(const QString &text, Page::SearchMode case
 
   // fetch ourselves a textpage
   TextOutputDev td(NULL, gTrue, 0, gFalse, gFalse);
-  parentDoc->doc->displayPage( &td, index + 1, 72, 72, rotation, false, true, false );
+  parentDoc->doc->displayPage( &td, index + 1, 72, 72, rotation, false, true, false,
+    NULL, NULL, NULL, NULL, gTrue);
   TextPage *textPage=td.takeText();
   
   return textPage;
@@ -258,10 +259,62 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
     case Poppler::Document::SplashBackend:
     {
 #if defined(HAVE_SPLASH)
-      SplashOutputDev *splash_output = static_cast<SplashOutputDev *>(m_page->parentDoc->getOutputDev());
+      SplashColor bgColor;
+      GBool overprint = gFalse;
+#if defined(SPLASH_CMYK)
+      overprint = m_page->parentDoc->m_hints & Document::OverprintPreview ? gTrue : gFalse;
+      if (overprint)
+      {
+        Guchar c, m, y, k;
+
+        c = 255 - m_page->parentDoc->paperColor.blue();
+        m = 255 - m_page->parentDoc->paperColor.red();
+        y = 255 - m_page->parentDoc->paperColor.green();
+        k = c;
+        if (m < k) {
+          k = m;
+        }
+        if (y < k) {
+          k = y;
+        }
+        bgColor[0] = c - k;
+        bgColor[1] = m - k;
+        bgColor[2] = y - k;
+        bgColor[3] = k;
+        for (int i = 4; i < SPOT_NCOMPS + 4; i++) {
+          bgColor[i] = 0;
+        }
+      }
+      else
+#endif
+      {
+        bgColor[0] = m_page->parentDoc->paperColor.blue();
+        bgColor[1] = m_page->parentDoc->paperColor.green();
+        bgColor[2] = m_page->parentDoc->paperColor.red();
+      }
+ 
+      GBool AA = m_page->parentDoc->m_hints & Document::TextAntialiasing ? gTrue : gFalse;
+      SplashThinLineMode thinLineMode = splashThinLineDefault;
+      if (m_page->parentDoc->m_hints & Document::ThinLineShape) thinLineMode = splashThinLineShape;
+      if (m_page->parentDoc->m_hints & Document::ThinLineSolid) thinLineMode = splashThinLineSolid;
+
+      SplashOutputDev * splash_output = new SplashOutputDev(
+#if defined(SPLASH_CMYK)
+                      (overprint) ? splashModeDeviceN8 : splashModeXBGR8,
+#else
+                      splashModeXBGR8,
+#endif 
+                      4, gFalse, bgColor, gTrue, AA, thinLineMode, overprint);
+
+      splash_output->setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? gTrue : gFalse);
+      splash_output->setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? gTrue : gFalse, 
+                                        m_page->parentDoc->m_hints & Document::TextSlightHinting ? gTrue : gFalse);
+
+      splash_output->startDoc(m_page->parentDoc->doc);      
 
       m_page->parentDoc->doc->displayPageSlice(splash_output, m_page->index + 1, xres, yres,
-						 rotation, false, true, false, x, y, w, h);
+                                               rotation, false, true, false, x, y, w, h,
+                                               NULL, NULL, NULL, NULL, gTrue);
 
       SplashBitmap *bitmap = splash_output->getBitmap();
       int bw = bitmap->getWidth();
@@ -291,8 +344,7 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
         QImage tmpimg( dataPtr, bw, bh, QImage::Format_ARGB32 );
         img = tmpimg.copy();
       }
-      // unload underlying xpdf bitmap
-      splash_output->startPage( 0, NULL );
+      delete splash_output;
 #endif
       break;
     }
@@ -381,7 +433,8 @@ QString Page::text(const QRectF &r, TextLayout textLayout) const
   const GBool rawOrder = textLayout == RawOrderLayout;
   output_dev = new TextOutputDev(0, gFalse, 0, rawOrder, gFalse);
   m_page->parentDoc->doc->displayPageSlice(output_dev, m_page->index + 1, 72, 72,
-      0, false, true, false, -1, -1, -1, -1);
+      0, false, true, false, -1, -1, -1, -1,
+      NULL, NULL, NULL, NULL, gTrue);
   if (r.isNull())
   {
     rect = m_page->page->getCropBox();
@@ -482,7 +535,8 @@ QList<TextBox*> Page::textList(Rotation rotate) const
   int rotation = (int)rotate * 90;
 
   m_page->parentDoc->doc->displayPageSlice(output_dev, m_page->index + 1, 72, 72,
-      rotation, false, false, false, -1, -1, -1, -1);
+      rotation, false, false, false, -1, -1, -1, -1,
+      NULL, NULL, NULL, NULL, gTrue);
 
   TextWordList *word_list = output_dev->makeWordList();
   
diff --git a/qt4/src/poppler-private.cc b/qt4/src/poppler-private.cc
index ffb5b92b..308a9662 100644
--- a/qt4/src/poppler-private.cc
+++ b/qt4/src/poppler-private.cc
@@ -2,6 +2,8 @@
  * Copyright (C) 2005, Net Integration Technologies, Inc.
  * Copyright (C) 2006, 2011 by Albert Astals Cid <aacid@kde.org>
  * Copyright (C) 2008, 2010, 2011 by Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 by Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
  * Inspired on code by
  * Copyright (C) 2004 by Albert Astals Cid <tsdgeos@terra.es>
  * Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
@@ -53,7 +55,7 @@ namespace Debug {
         Debug::debugClosure = closure;
     }
 
-    void qt4ErrorFunction(void * /*data*/, ErrorCategory /*category*/, int pos, char *msg)
+    void qt4ErrorFunction(void * /*data*/, ErrorCategory /*category*/, Goffset pos, char *msg)
     {
         QString emsg;
 
@@ -226,7 +228,6 @@ namespace Debug {
         qDeleteAll(m_embeddedFiles);
         delete (OptContentModel *)m_optContentModel;
         delete doc;
-        delete m_outputDev;
         delete m_fontInfoIterator;
     
         count --;
@@ -241,7 +242,6 @@ namespace Debug {
     {
         m_fontInfoIterator = 0;
         m_backend = Document::SplashBackend;
-        m_outputDev = 0;
         paperColor = Qt::white;
         m_hints = 0;
         m_optContentModel = 0;
diff --git a/qt4/src/poppler-private.h b/qt4/src/poppler-private.h
index 5a9e1b85..0d11e836 100644
--- a/qt4/src/poppler-private.h
+++ b/qt4/src/poppler-private.h
@@ -5,7 +5,8 @@
  * Copyright (C) 2007-2009, 2011 by Pino Toscano <pino@kde.org>
  * Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
  * Copyright (C) 2011 Hib Eris <hib@hiberis.nl>
- * Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr>
  * Inspired on code by
  * Copyright (C) 2004 by Albert Astals Cid <tsdgeos@terra.es>
  * Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
@@ -87,7 +88,7 @@ namespace Poppler {
 		wchar_t *fileName = new WCHAR[filePath.length()];
 		int length = filePath.toWCharArray(fileName); 
 		doc = new PDFDoc(fileName, length, ownerPassword, userPassword);
-		delete fileName;
+		delete[] fileName;
 #else
 		GooString *fileName = new GooString(QFile::encodeName(filePath));
 		doc = new PDFDoc(fileName, ownerPassword, userPassword);
@@ -113,82 +114,11 @@ namespace Poppler {
 	
 	~DocumentData();
 	
-	OutputDev *getOutputDev()
-	{
-		if (!m_outputDev)
-		{
-			switch (m_backend)
-			{
-			case Document::ArthurBackend:
-			// create a splash backend even in case of the Arthur Backend
-			case Document::SplashBackend:
-			{
-#if defined(HAVE_SPLASH)
-			SplashColor bgColor;
-			GBool overprint = m_hints & Document::OverprintPreview ? gTrue : gFalse;
-			globalParams->setOverprintPreview(overprint);
-#if defined(SPLASH_CMYK)
-			if (overprint)
-			{
-				Guchar c, m, y, k;
-
-				c = 255 - paperColor.blue();
-				m = 255 - paperColor.red();
-				y = 255 - paperColor.green();
-				k = c;
-				if (m < k) {
-					k = m;
-				}
-				if (y < k) {
-					k = y;
-				}
-				bgColor[0] = c - k;
-				bgColor[1] = m - k;
-				bgColor[2] = y - k;
-				bgColor[3] = k;
-				for (int i = 4; i < SPOT_NCOMPS + 4; i++) {
-					bgColor[i] = 0;
-				}
-			}
-			else
-#endif
-			{
-				bgColor[0] = paperColor.blue();
-				bgColor[1] = paperColor.green();
-				bgColor[2] = paperColor.red();
-			}
-			GBool AA = m_hints & Document::TextAntialiasing ? gTrue : gFalse;
-			SplashOutputDev * splashOutputDev = new SplashOutputDev(
-#if defined(SPLASH_CMYK)
-				(overprint) ? splashModeDeviceN8 : splashModeXBGR8,
-#else
-				splashModeXBGR8,
-#endif 
-				4, gFalse, bgColor, gTrue, AA);
-			splashOutputDev->setVectorAntialias(m_hints & Document::Antialiasing ? gTrue : gFalse);
-			splashOutputDev->setFreeTypeHinting(m_hints & Document::TextHinting ? gTrue : gFalse, m_hints & Document::TextSlightHinting ? gTrue : gFalse);
-			splashOutputDev->startDoc(doc);
-			m_outputDev = splashOutputDev;
-#endif
-			break;
-			}
-			}
-		}
-		return m_outputDev;
-	}
-	
 	void addTocChildren( QDomDocument * docSyn, QDomNode * parent, GooList * items );
 	
 	void setPaperColor(const QColor &color)
 	{
-		if (color == paperColor)
-			return;
-
 		paperColor = color;
-		
-		// Make sure the new paper color will be picked up for the next rendering
-		delete m_outputDev;
-		m_outputDev = NULL;
 	}
 	
 	void fillMembers()
@@ -212,7 +142,6 @@ namespace Poppler {
 	bool locked;
 	FontIterator *m_fontInfoIterator;
 	Document::RenderBackend m_backend;
-	OutputDev *m_outputDev;
 	QList<EmbeddedFile*> m_embeddedFiles;
 	QPointer<OptContentModel> m_optContentModel;
 	QColor paperColor;
diff --git a/qt4/src/poppler-ps-converter.cc b/qt4/src/poppler-ps-converter.cc
index 63fb7b46..ff8af65d 100644
--- a/qt4/src/poppler-ps-converter.cc
+++ b/qt4/src/poppler-ps-converter.cc
@@ -4,6 +4,7 @@
  * Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
  * Copyright (C) 2011 Glad Deschrijver <glad.deschrijver@gmail.com>
  * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
  *
  * 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
@@ -253,7 +254,7 @@ bool PSConverter::convert()
 			                              NULL,
 			                              NULL,
 			                              annotDisplayDecideCbk,
-			                              &showAnnotations);
+			                              &showAnnotations, gTrue);
 			if (d->pageConvertedCallback)
 				(*d->pageConvertedCallback)(page, d->pageConvertedPayload);
 		}
diff --git a/qt4/src/poppler-qiodeviceoutstream-private.h b/qt4/src/poppler-qiodeviceoutstream-private.h
index e7faa294..d0d20073 100644
--- a/qt4/src/poppler-qiodeviceoutstream-private.h
+++ b/qt4/src/poppler-qiodeviceoutstream-private.h
@@ -1,5 +1,6 @@
 /* poppler-qiodevicestream-private.h: Qt4 interface to poppler
  * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
  *
  * 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
@@ -33,7 +34,7 @@ class QIODeviceOutStream : public OutStream
     virtual ~QIODeviceOutStream();
 
     virtual void close();
-    virtual int getPos();
+    virtual Goffset getPos();
     virtual void put(char c);
     virtual void printf(const char *format, ...);
 
diff --git a/qt4/src/poppler-qiodeviceoutstream.cc b/qt4/src/poppler-qiodeviceoutstream.cc
index b0054af3..e3e9f895 100644
--- a/qt4/src/poppler-qiodeviceoutstream.cc
+++ b/qt4/src/poppler-qiodeviceoutstream.cc
@@ -1,5 +1,6 @@
 /* poppler-qiodevicestream.cc: Qt4 interface to poppler
  * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
  *
  * 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
@@ -39,9 +40,9 @@ void QIODeviceOutStream::close()
 {
 }
 
-int QIODeviceOutStream::getPos()
+Goffset QIODeviceOutStream::getPos()
 {
-  return (int)m_device->pos();
+  return m_device->pos();
 }
 
 void QIODeviceOutStream::put(char c)
diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index f4f6fc65..72874ec3 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -13,7 +13,7 @@
  * Copyright (C) 2012, Fabio D'Urso <fabiodurso@hotmail.it>
  * Copyright (C) 2012, Tobias Koenig <tobias.koenig@kdab.com>
  * Copyright (C) 2012 Adam Reichold <adamreichold@myopera.com>
- * Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
  *
  * 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
@@ -103,7 +103,7 @@ namespace Poppler {
     public:
       /**
 	 The default constructor sets the \p text and the rectangle that
-	 contains the text. Coordinated for the \p bBox are in points =
+	 contains the text. Coordinates for the \p bBox are in points =
 	 1/72 of an inch.
       */
       TextBox(const QString& text, const QRectF &bBox);
@@ -848,7 +848,9 @@ delete it;
 	    TextAntialiasing = 0x00000002,  ///< Antialiasing for text
 	    TextHinting = 0x00000004,       ///< Hinting for text \since 0.12.1
 	    TextSlightHinting = 0x00000008, ///< Lighter hinting for text when combined with TextHinting \since 0.18
-	    OverprintPreview = 0x00000010   ///< Overprint preview \since 0.22
+	    OverprintPreview = 0x00000010,  ///< Overprint preview \since 0.22
+	    ThinLineSolid = 0x00000020,     ///< Enhance thin lines solid \since 0.24
+	    ThinLineShape = 0x00000040      ///< Enhance thin lines shape. Wins over ThinLineSolid \since 0.24
 	};
 	Q_DECLARE_FLAGS( RenderHints, RenderHint )
 
diff --git a/qt4/tests/CMakeLists.txt b/qt4/tests/CMakeLists.txt
index 187870ff..69e9c49b 100644
--- a/qt4/tests/CMakeLists.txt
+++ b/qt4/tests/CMakeLists.txt
@@ -38,10 +38,12 @@ endmacro(QT4_ADD_QTEST)
 
 qt4_add_simpletest(test-poppler-qt4 test-poppler-qt4.cpp)
 qt4_add_simpletest(test-password-qt4 test-password-qt4.cpp)
+qt4_add_simpletest(poppler-forms poppler-forms.cpp)
 qt4_add_simpletest(poppler-fonts poppler-fonts.cpp)
 qt4_add_simpletest(poppler_attachments poppler-attachments.cpp)
 qt4_add_simpletest(stress-poppler-qt4 stress-poppler-qt4.cpp)
 qt4_add_simpletest(stress-poppler-dir stress-poppler-dir.cpp)
+qt4_add_simpletest(stress-threads-qt4 stress-threads-qt4.cpp)
 qt4_add_simpletest(poppler-texts poppler-texts.cpp)
 
 qt4_add_qtest(check_attachments check_attachments.cpp)
@@ -57,6 +59,7 @@ qt4_add_qtest(check_permissions check_permissions.cpp)
 qt4_add_qtest(check_search check_search.cpp)
 qt4_add_qtest(check_actualtext check_actualtext.cpp)
 qt4_add_qtest(check_lexer check_lexer.cpp)
+qt4_add_qtest(check_pagelabelinfo check_pagelabelinfo.cpp)
 qt4_add_qtest(check_goostring check_goostring.cpp)
 if (NOT WIN32)
   qt4_add_qtest(check_strings check_strings.cpp)
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
index 3dc6e132..8efe124c 100644
--- a/qt4/tests/Makefile.am
+++ b/qt4/tests/Makefile.am
@@ -19,7 +19,8 @@ SUFFIXES: .moc
 
 noinst_PROGRAMS = test-poppler-qt4 stress-poppler-qt4 \
 	poppler-fonts test-password-qt4 stress-poppler-dir \
-	poppler-attachments poppler-texts
+	poppler-attachments poppler-texts poppler-forms \
+	stress-threads-qt4
 
 
 test_poppler_qt4_SOURCES =			\
@@ -49,6 +50,11 @@ poppler_texts_SOURCES =			\
 
 poppler_texts_LDADD = $(LDADDS)
 
+poppler_forms_SOURCES =			\
+       poppler-forms.cpp
+
+poppler_forms_LDADD = $(LDADDS)
+
 
 stress_poppler_qt4_SOURCES =			\
        stress-poppler-qt4.cpp
@@ -60,6 +66,12 @@ stress_poppler_dir_SOURCES =			\
 
 stress_poppler_dir_LDADD = $(LDADDS)
 
+stress_threads_qt4_SOURCES =			\
+       stress-threads-qt4.cpp
+
+stress_threads_qt4_LDADD = $(LDADDS)
+
+
 clean-generic:
 	rm -f *.moc
 
@@ -73,6 +85,7 @@ TESTS = \
 	check_metadata         	\
 	check_optcontent	\
 	check_permissions      	\
+	check_pagelabelinfo    	\
 	check_pagemode    	\
 	check_password    	\
 	check_pagelayout	\
@@ -139,6 +152,10 @@ check_lexer_SOURCES = check_lexer.cpp
 check_lexer.$(OBJEXT): check_lexer.moc
 check_lexer_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 
+check_pagelabelinfo_SOURCES = check_pagelabelinfo.cpp
+check_pagelabelinfo.$(OBJEXT): check_pagelabelinfo.moc
+check_pagelabelinfo_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
+
 check_goostring_SOURCES = check_goostring.cpp
 check_goostring.$(OBJEXT): check_goostring.moc
 check_goostring_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
diff --git a/qt4/tests/Makefile.in b/qt4/tests/Makefile.in
index 256c54f0..97af50bc 100644
--- a/qt4/tests/Makefile.in
+++ b/qt4/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,7 +81,8 @@ host_triplet = @host@
 noinst_PROGRAMS = test-poppler-qt4$(EXEEXT) \
 	stress-poppler-qt4$(EXEEXT) poppler-fonts$(EXEEXT) \
 	test-password-qt4$(EXEEXT) stress-poppler-dir$(EXEEXT) \
-	poppler-attachments$(EXEEXT) poppler-texts$(EXEEXT)
+	poppler-attachments$(EXEEXT) poppler-texts$(EXEEXT) \
+	poppler-forms$(EXEEXT) stress-threads-qt4$(EXEEXT)
 @BUILD_POPPLER_QT4_TRUE@TESTS = check_attachments$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_actualtext$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_dateConversion$(EXEEXT) \
@@ -63,6 +91,7 @@ noinst_PROGRAMS = test-poppler-qt4$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_metadata$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_optcontent$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_permissions$(EXEEXT) \
+@BUILD_POPPLER_QT4_TRUE@	check_pagelabelinfo$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_pagemode$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_password$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_pagelayout$(EXEEXT) \
@@ -72,9 +101,10 @@ noinst_PROGRAMS = test-poppler-qt4$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_goostring$(EXEEXT)
 @BUILD_POPPLER_QT4_TRUE@check_PROGRAMS = $(am__EXEEXT_1)
 subdir = qt4/tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(top_srcdir)/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -96,6 +126,7 @@ CONFIG_CLEAN_VPATH_FILES =
 @BUILD_POPPLER_QT4_TRUE@	check_metadata$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_optcontent$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_permissions$(EXEEXT) \
+@BUILD_POPPLER_QT4_TRUE@	check_pagelabelinfo$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_pagemode$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_password$(EXEEXT) \
 @BUILD_POPPLER_QT4_TRUE@	check_pagelayout$(EXEEXT) \
@@ -118,6 +149,7 @@ am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am__check_attachments_SOURCES_DIST = check_attachments.cpp
 @BUILD_POPPLER_QT4_TRUE@am_check_attachments_OBJECTS =  \
 @BUILD_POPPLER_QT4_TRUE@	check_attachments.$(OBJEXT)
@@ -174,6 +206,13 @@ check_optcontent_OBJECTS = $(am_check_optcontent_OBJECTS)
 @BUILD_POPPLER_QT4_TRUE@check_optcontent_DEPENDENCIES =  \
 @BUILD_POPPLER_QT4_TRUE@	$(am__DEPENDENCIES_2) \
 @BUILD_POPPLER_QT4_TRUE@	$(am__DEPENDENCIES_1)
+am__check_pagelabelinfo_SOURCES_DIST = check_pagelabelinfo.cpp
+@BUILD_POPPLER_QT4_TRUE@am_check_pagelabelinfo_OBJECTS =  \
+@BUILD_POPPLER_QT4_TRUE@	check_pagelabelinfo.$(OBJEXT)
+check_pagelabelinfo_OBJECTS = $(am_check_pagelabelinfo_OBJECTS)
+@BUILD_POPPLER_QT4_TRUE@check_pagelabelinfo_DEPENDENCIES =  \
+@BUILD_POPPLER_QT4_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT4_TRUE@	$(am__DEPENDENCIES_1)
 am__check_pagelayout_SOURCES_DIST = check_pagelayout.cpp
 @BUILD_POPPLER_QT4_TRUE@am_check_pagelayout_OBJECTS =  \
 @BUILD_POPPLER_QT4_TRUE@	check_pagelayout.$(OBJEXT)
@@ -222,6 +261,9 @@ poppler_attachments_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_poppler_fonts_OBJECTS = poppler-fonts.$(OBJEXT)
 poppler_fonts_OBJECTS = $(am_poppler_fonts_OBJECTS)
 poppler_fonts_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_poppler_forms_OBJECTS = poppler-forms.$(OBJEXT)
+poppler_forms_OBJECTS = $(am_poppler_forms_OBJECTS)
+poppler_forms_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_poppler_texts_OBJECTS = poppler-texts.$(OBJEXT)
 poppler_texts_OBJECTS = $(am_poppler_texts_OBJECTS)
 poppler_texts_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -231,12 +273,27 @@ stress_poppler_dir_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_stress_poppler_qt4_OBJECTS = stress-poppler-qt4.$(OBJEXT)
 stress_poppler_qt4_OBJECTS = $(am_stress_poppler_qt4_OBJECTS)
 stress_poppler_qt4_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_stress_threads_qt4_OBJECTS = stress-threads-qt4.$(OBJEXT)
+stress_threads_qt4_OBJECTS = $(am_stress_threads_qt4_OBJECTS)
+stress_threads_qt4_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_password_qt4_OBJECTS = test-password-qt4.$(OBJEXT)
 test_password_qt4_OBJECTS = $(am_test_password_qt4_OBJECTS)
 test_password_qt4_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_test_poppler_qt4_OBJECTS = test-poppler-qt4.$(OBJEXT)
 test_poppler_qt4_OBJECTS = $(am_test_poppler_qt4_OBJECTS)
 test_poppler_qt4_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -249,31 +306,29 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(check_actualtext_SOURCES) $(check_attachments_SOURCES) \
 	$(check_dateConversion_SOURCES) $(check_fonts_SOURCES) \
 	$(check_goostring_SOURCES) $(check_lexer_SOURCES) \
 	$(check_links_SOURCES) $(check_metadata_SOURCES) \
-	$(check_optcontent_SOURCES) $(check_pagelayout_SOURCES) \
-	$(check_pagemode_SOURCES) $(check_password_SOURCES) \
-	$(check_permissions_SOURCES) $(check_search_SOURCES) \
-	$(check_strings_SOURCES) $(poppler_attachments_SOURCES) \
-	$(poppler_fonts_SOURCES) $(poppler_texts_SOURCES) \
+	$(check_optcontent_SOURCES) $(check_pagelabelinfo_SOURCES) \
+	$(check_pagelayout_SOURCES) $(check_pagemode_SOURCES) \
+	$(check_password_SOURCES) $(check_permissions_SOURCES) \
+	$(check_search_SOURCES) $(check_strings_SOURCES) \
+	$(poppler_attachments_SOURCES) $(poppler_fonts_SOURCES) \
+	$(poppler_forms_SOURCES) $(poppler_texts_SOURCES) \
 	$(stress_poppler_dir_SOURCES) $(stress_poppler_qt4_SOURCES) \
-	$(test_password_qt4_SOURCES) $(test_poppler_qt4_SOURCES)
+	$(stress_threads_qt4_SOURCES) $(test_password_qt4_SOURCES) \
+	$(test_poppler_qt4_SOURCES)
 DIST_SOURCES = $(am__check_actualtext_SOURCES_DIST) \
 	$(am__check_attachments_SOURCES_DIST) \
 	$(am__check_dateConversion_SOURCES_DIST) \
@@ -283,6 +338,7 @@ DIST_SOURCES = $(am__check_actualtext_SOURCES_DIST) \
 	$(am__check_links_SOURCES_DIST) \
 	$(am__check_metadata_SOURCES_DIST) \
 	$(am__check_optcontent_SOURCES_DIST) \
+	$(am__check_pagelabelinfo_SOURCES_DIST) \
 	$(am__check_pagelayout_SOURCES_DIST) \
 	$(am__check_pagemode_SOURCES_DIST) \
 	$(am__check_password_SOURCES_DIST) \
@@ -290,18 +346,238 @@ DIST_SOURCES = $(am__check_actualtext_SOURCES_DIST) \
 	$(am__check_search_SOURCES_DIST) \
 	$(am__check_strings_SOURCES_DIST) \
 	$(poppler_attachments_SOURCES) $(poppler_fonts_SOURCES) \
-	$(poppler_texts_SOURCES) $(stress_poppler_dir_SOURCES) \
-	$(stress_poppler_qt4_SOURCES) $(test_password_qt4_SOURCES) \
+	$(poppler_forms_SOURCES) $(poppler_texts_SOURCES) \
+	$(stress_poppler_dir_SOURCES) $(stress_poppler_qt4_SOURCES) \
+	$(stress_threads_qt4_SOURCES) $(test_password_qt4_SOURCES) \
 	$(test_poppler_qt4_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -395,6 +671,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -429,10 +708,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -454,13 +739,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -536,6 +821,10 @@ poppler_texts_SOURCES = \
        poppler-texts.cpp
 
 poppler_texts_LDADD = $(LDADDS)
+poppler_forms_SOURCES = \
+       poppler-forms.cpp
+
+poppler_forms_LDADD = $(LDADDS)
 stress_poppler_qt4_SOURCES = \
        stress-poppler-qt4.cpp
 
@@ -544,6 +833,10 @@ stress_poppler_dir_SOURCES = \
        stress-poppler-dir.cpp
 
 stress_poppler_dir_LDADD = $(LDADDS)
+stress_threads_qt4_SOURCES = \
+       stress-threads-qt4.cpp
+
+stress_threads_qt4_LDADD = $(LDADDS)
 @BUILD_POPPLER_QT4_TRUE@check_attachments_SOURCES = check_attachments.cpp
 @BUILD_POPPLER_QT4_TRUE@check_attachments_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 @BUILD_POPPLER_QT4_TRUE@check_actualtext_SOURCES = check_actualtext.cpp
@@ -572,12 +865,14 @@ stress_poppler_dir_LDADD = $(LDADDS)
 @BUILD_POPPLER_QT4_TRUE@check_strings_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 @BUILD_POPPLER_QT4_TRUE@check_lexer_SOURCES = check_lexer.cpp
 @BUILD_POPPLER_QT4_TRUE@check_lexer_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
+@BUILD_POPPLER_QT4_TRUE@check_pagelabelinfo_SOURCES = check_pagelabelinfo.cpp
+@BUILD_POPPLER_QT4_TRUE@check_pagelabelinfo_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 @BUILD_POPPLER_QT4_TRUE@check_goostring_SOURCES = check_goostring.cpp
 @BUILD_POPPLER_QT4_TRUE@check_goostring_LDADD = $(LDADDS) $(POPPLER_QT4_TEST_LIBS)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .moc .o .obj
+.SUFFIXES: .cpp .lo .log .moc .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -626,69 +921,103 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 check_actualtext$(EXEEXT): $(check_actualtext_OBJECTS) $(check_actualtext_DEPENDENCIES) $(EXTRA_check_actualtext_DEPENDENCIES) 
 	@rm -f check_actualtext$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_actualtext_OBJECTS) $(check_actualtext_LDADD) $(LIBS)
+
 check_attachments$(EXEEXT): $(check_attachments_OBJECTS) $(check_attachments_DEPENDENCIES) $(EXTRA_check_attachments_DEPENDENCIES) 
 	@rm -f check_attachments$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_attachments_OBJECTS) $(check_attachments_LDADD) $(LIBS)
+
 check_dateConversion$(EXEEXT): $(check_dateConversion_OBJECTS) $(check_dateConversion_DEPENDENCIES) $(EXTRA_check_dateConversion_DEPENDENCIES) 
 	@rm -f check_dateConversion$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_dateConversion_OBJECTS) $(check_dateConversion_LDADD) $(LIBS)
+
 check_fonts$(EXEEXT): $(check_fonts_OBJECTS) $(check_fonts_DEPENDENCIES) $(EXTRA_check_fonts_DEPENDENCIES) 
 	@rm -f check_fonts$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_fonts_OBJECTS) $(check_fonts_LDADD) $(LIBS)
+
 check_goostring$(EXEEXT): $(check_goostring_OBJECTS) $(check_goostring_DEPENDENCIES) $(EXTRA_check_goostring_DEPENDENCIES) 
 	@rm -f check_goostring$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_goostring_OBJECTS) $(check_goostring_LDADD) $(LIBS)
+
 check_lexer$(EXEEXT): $(check_lexer_OBJECTS) $(check_lexer_DEPENDENCIES) $(EXTRA_check_lexer_DEPENDENCIES) 
 	@rm -f check_lexer$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_lexer_OBJECTS) $(check_lexer_LDADD) $(LIBS)
+
 check_links$(EXEEXT): $(check_links_OBJECTS) $(check_links_DEPENDENCIES) $(EXTRA_check_links_DEPENDENCIES) 
 	@rm -f check_links$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_links_OBJECTS) $(check_links_LDADD) $(LIBS)
+
 check_metadata$(EXEEXT): $(check_metadata_OBJECTS) $(check_metadata_DEPENDENCIES) $(EXTRA_check_metadata_DEPENDENCIES) 
 	@rm -f check_metadata$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_metadata_OBJECTS) $(check_metadata_LDADD) $(LIBS)
+
 check_optcontent$(EXEEXT): $(check_optcontent_OBJECTS) $(check_optcontent_DEPENDENCIES) $(EXTRA_check_optcontent_DEPENDENCIES) 
 	@rm -f check_optcontent$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_optcontent_OBJECTS) $(check_optcontent_LDADD) $(LIBS)
+
+check_pagelabelinfo$(EXEEXT): $(check_pagelabelinfo_OBJECTS) $(check_pagelabelinfo_DEPENDENCIES) $(EXTRA_check_pagelabelinfo_DEPENDENCIES) 
+	@rm -f check_pagelabelinfo$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_pagelabelinfo_OBJECTS) $(check_pagelabelinfo_LDADD) $(LIBS)
+
 check_pagelayout$(EXEEXT): $(check_pagelayout_OBJECTS) $(check_pagelayout_DEPENDENCIES) $(EXTRA_check_pagelayout_DEPENDENCIES) 
 	@rm -f check_pagelayout$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_pagelayout_OBJECTS) $(check_pagelayout_LDADD) $(LIBS)
+
 check_pagemode$(EXEEXT): $(check_pagemode_OBJECTS) $(check_pagemode_DEPENDENCIES) $(EXTRA_check_pagemode_DEPENDENCIES) 
 	@rm -f check_pagemode$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_pagemode_OBJECTS) $(check_pagemode_LDADD) $(LIBS)
+
 check_password$(EXEEXT): $(check_password_OBJECTS) $(check_password_DEPENDENCIES) $(EXTRA_check_password_DEPENDENCIES) 
 	@rm -f check_password$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_password_OBJECTS) $(check_password_LDADD) $(LIBS)
+
 check_permissions$(EXEEXT): $(check_permissions_OBJECTS) $(check_permissions_DEPENDENCIES) $(EXTRA_check_permissions_DEPENDENCIES) 
 	@rm -f check_permissions$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_permissions_OBJECTS) $(check_permissions_LDADD) $(LIBS)
+
 check_search$(EXEEXT): $(check_search_OBJECTS) $(check_search_DEPENDENCIES) $(EXTRA_check_search_DEPENDENCIES) 
 	@rm -f check_search$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_search_OBJECTS) $(check_search_LDADD) $(LIBS)
+
 check_strings$(EXEEXT): $(check_strings_OBJECTS) $(check_strings_DEPENDENCIES) $(EXTRA_check_strings_DEPENDENCIES) 
 	@rm -f check_strings$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(check_strings_OBJECTS) $(check_strings_LDADD) $(LIBS)
+
 poppler-attachments$(EXEEXT): $(poppler_attachments_OBJECTS) $(poppler_attachments_DEPENDENCIES) $(EXTRA_poppler_attachments_DEPENDENCIES) 
 	@rm -f poppler-attachments$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(poppler_attachments_OBJECTS) $(poppler_attachments_LDADD) $(LIBS)
+
 poppler-fonts$(EXEEXT): $(poppler_fonts_OBJECTS) $(poppler_fonts_DEPENDENCIES) $(EXTRA_poppler_fonts_DEPENDENCIES) 
 	@rm -f poppler-fonts$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(poppler_fonts_OBJECTS) $(poppler_fonts_LDADD) $(LIBS)
+
+poppler-forms$(EXEEXT): $(poppler_forms_OBJECTS) $(poppler_forms_DEPENDENCIES) $(EXTRA_poppler_forms_DEPENDENCIES) 
+	@rm -f poppler-forms$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(poppler_forms_OBJECTS) $(poppler_forms_LDADD) $(LIBS)
+
 poppler-texts$(EXEEXT): $(poppler_texts_OBJECTS) $(poppler_texts_DEPENDENCIES) $(EXTRA_poppler_texts_DEPENDENCIES) 
 	@rm -f poppler-texts$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(poppler_texts_OBJECTS) $(poppler_texts_LDADD) $(LIBS)
+
 stress-poppler-dir$(EXEEXT): $(stress_poppler_dir_OBJECTS) $(stress_poppler_dir_DEPENDENCIES) $(EXTRA_stress_poppler_dir_DEPENDENCIES) 
 	@rm -f stress-poppler-dir$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(stress_poppler_dir_OBJECTS) $(stress_poppler_dir_LDADD) $(LIBS)
+
 stress-poppler-qt4$(EXEEXT): $(stress_poppler_qt4_OBJECTS) $(stress_poppler_qt4_DEPENDENCIES) $(EXTRA_stress_poppler_qt4_DEPENDENCIES) 
 	@rm -f stress-poppler-qt4$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(stress_poppler_qt4_OBJECTS) $(stress_poppler_qt4_LDADD) $(LIBS)
+
+stress-threads-qt4$(EXEEXT): $(stress_threads_qt4_OBJECTS) $(stress_threads_qt4_DEPENDENCIES) $(EXTRA_stress_threads_qt4_DEPENDENCIES) 
+	@rm -f stress-threads-qt4$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(stress_threads_qt4_OBJECTS) $(stress_threads_qt4_LDADD) $(LIBS)
+
 test-password-qt4$(EXEEXT): $(test_password_qt4_OBJECTS) $(test_password_qt4_DEPENDENCIES) $(EXTRA_test_password_qt4_DEPENDENCIES) 
 	@rm -f test-password-qt4$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_password_qt4_OBJECTS) $(test_password_qt4_LDADD) $(LIBS)
+
 test-poppler-qt4$(EXEEXT): $(test_poppler_qt4_OBJECTS) $(test_poppler_qt4_DEPENDENCIES) $(EXTRA_test_poppler_qt4_DEPENDENCIES) 
 	@rm -f test-poppler-qt4$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_poppler_qt4_OBJECTS) $(test_poppler_qt4_LDADD) $(LIBS)
@@ -708,6 +1037,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_links.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_metadata.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_optcontent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pagelabelinfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pagelayout.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pagemode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_password.Po@am__quote@
@@ -716,9 +1046,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_strings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-attachments.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-fonts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-forms.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-texts.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-poppler-dir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-poppler-qt4.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-threads-qt4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-password-qt4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-poppler-qt4.Po@am__quote@
 
@@ -749,26 +1081,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -780,15 +1101,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -797,102 +1114,292 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+check_attachments.log: check_attachments$(EXEEXT)
+	@p='check_attachments$(EXEEXT)'; \
+	b='check_attachments'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_actualtext.log: check_actualtext$(EXEEXT)
+	@p='check_actualtext$(EXEEXT)'; \
+	b='check_actualtext'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_dateConversion.log: check_dateConversion$(EXEEXT)
+	@p='check_dateConversion$(EXEEXT)'; \
+	b='check_dateConversion'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_fonts.log: check_fonts$(EXEEXT)
+	@p='check_fonts$(EXEEXT)'; \
+	b='check_fonts'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_links.log: check_links$(EXEEXT)
+	@p='check_links$(EXEEXT)'; \
+	b='check_links'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_metadata.log: check_metadata$(EXEEXT)
+	@p='check_metadata$(EXEEXT)'; \
+	b='check_metadata'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_optcontent.log: check_optcontent$(EXEEXT)
+	@p='check_optcontent$(EXEEXT)'; \
+	b='check_optcontent'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_permissions.log: check_permissions$(EXEEXT)
+	@p='check_permissions$(EXEEXT)'; \
+	b='check_permissions'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_pagelabelinfo.log: check_pagelabelinfo$(EXEEXT)
+	@p='check_pagelabelinfo$(EXEEXT)'; \
+	b='check_pagelabelinfo'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_pagemode.log: check_pagemode$(EXEEXT)
+	@p='check_pagemode$(EXEEXT)'; \
+	b='check_pagemode'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_password.log: check_password$(EXEEXT)
+	@p='check_password$(EXEEXT)'; \
+	b='check_password'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_pagelayout.log: check_pagelayout$(EXEEXT)
+	@p='check_pagelayout$(EXEEXT)'; \
+	b='check_pagelayout'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_search.log: check_search$(EXEEXT)
+	@p='check_search$(EXEEXT)'; \
+	b='check_search'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_strings.log: check_strings$(EXEEXT)
+	@p='check_strings$(EXEEXT)'; \
+	b='check_strings'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_lexer.log: check_lexer$(EXEEXT)
+	@p='check_lexer$(EXEEXT)'; \
+	b='check_lexer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_goostring.log: check_goostring$(EXEEXT)
+	@p='check_goostring$(EXEEXT)'; \
+	b='check_goostring'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -950,6 +1457,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -1031,19 +1541,20 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
 	clean-checkPROGRAMS clean-generic clean-libtool \
-	clean-noinstPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+	uninstall-am
 
 
 SUFFIXES: .moc
@@ -1067,6 +1578,7 @@ clean-generic:
 @BUILD_POPPLER_QT4_TRUE@check_search.$(OBJEXT): check_search.moc
 @BUILD_POPPLER_QT4_TRUE@check_strings.$(OBJEXT): check_strings.moc
 @BUILD_POPPLER_QT4_TRUE@check_lexer.$(OBJEXT): check_lexer.moc
+@BUILD_POPPLER_QT4_TRUE@check_pagelabelinfo.$(OBJEXT): check_pagelabelinfo.moc
 @BUILD_POPPLER_QT4_TRUE@check_goostring.$(OBJEXT): check_goostring.moc
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/qt4/tests/check_lexer.cpp b/qt4/tests/check_lexer.cpp
index 1ae849f2..ea834c83 100644
--- a/qt4/tests/check_lexer.cpp
+++ b/qt4/tests/check_lexer.cpp
@@ -12,7 +12,7 @@ private slots:
 
 void TestLexer::testNumbers()
 {
-    char *data = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1";
+    char *data = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615";
     Object dummy;
     MemStream *stream = new MemStream(data, 0, strlen(data), &dummy);
     Lexer *lexer = new Lexer(NULL, stream);
@@ -46,8 +46,8 @@ void TestLexer::testNumbers()
     obj.free();
     
     lexer->getObj(&obj);
-    QCOMPARE(obj.getType(), objUint);
-    QCOMPARE(obj.getUint(), 2147483648u);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), 2147483648ll);
     obj.free();
       
     lexer->getObj(&obj);
@@ -56,13 +56,13 @@ void TestLexer::testNumbers()
     obj.free();
     
     lexer->getObj(&obj);
-    QCOMPARE(obj.getType(), objReal);
-    QCOMPARE(obj.getReal(), 4294967297.);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), 4294967297ll);
     obj.free();
     
     lexer->getObj(&obj);
-    QCOMPARE(obj.getType(), objReal);
-    QCOMPARE(obj.getReal(), -2147483649.);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), -2147483649ll);
     obj.free();
 
     lexer->getObj(&obj);
@@ -110,6 +110,16 @@ void TestLexer::testNumbers()
     QCOMPARE(obj.getReal(), -2147483649.1);
     obj.free();
 
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), 9223372036854775807ll);
+    obj.free();
+
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), 18446744073709551616.);
+    obj.free();
+
     delete lexer;
 }
 
diff --git a/qt4/tests/check_pagelabelinfo.cpp b/qt4/tests/check_pagelabelinfo.cpp
new file mode 100644
index 00000000..4eb1ec36
--- /dev/null
+++ b/qt4/tests/check_pagelabelinfo.cpp
@@ -0,0 +1,43 @@
+#include <QtTest/QtTest>
+
+#include "PageLabelInfo_p.h"
+
+class TestPageLabelInfo : public QObject
+{
+    Q_OBJECT
+private slots:
+    void testToRoman();
+    void testFromRoman();
+    void testToLatin();
+    void testFromLatin();
+};
+
+void TestPageLabelInfo::testToRoman()
+{
+    GooString str;
+    toRoman(177, &str, gFalse);
+    QCOMPARE (str.getCString(), "clxxvii");
+}
+
+void TestPageLabelInfo::testFromRoman()
+{
+    GooString roman("clxxvii");
+    QCOMPARE(fromRoman(roman.getCString()), 177);
+}
+
+void TestPageLabelInfo::testToLatin()
+{
+    GooString str;
+    toLatin(54, &str, gFalse);
+    QCOMPARE(str.getCString(), "bbb");
+}
+
+void TestPageLabelInfo::testFromLatin()
+{
+    GooString latin("ddd");
+    QCOMPARE(fromLatin(latin.getCString()), 56);
+}
+
+QTEST_MAIN(TestPageLabelInfo)
+#include "check_pagelabelinfo.moc"
+
diff --git a/qt4/tests/poppler-forms.cpp b/qt4/tests/poppler-forms.cpp
new file mode 100644
index 00000000..66aa11c3
--- /dev/null
+++ b/qt4/tests/poppler-forms.cpp
@@ -0,0 +1,166 @@
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+
+#include <iostream>
+
+#include <poppler-qt4.h>
+#include <poppler-form.h>
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormField::FormType type)
+{
+    switch (type) {
+        case Poppler::FormField::FormButton:    out << "Button";    break;
+        case Poppler::FormField::FormText:      out << "Text";      break;
+        case Poppler::FormField::FormChoice:    out << "Choice";    break;
+        case Poppler::FormField::FormSignature: out << "Signature"; break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormFieldButton::ButtonType type)
+{
+    switch (type) {
+        case Poppler::FormFieldButton::Push:        out << "Push";      break;
+        case Poppler::FormFieldButton::CheckBox:    out << "CheckBox";  break;
+        case Poppler::FormFieldButton::Radio:       out << "Radio";     break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormFieldText::TextType type)
+{
+    switch (type) {
+        case Poppler::FormFieldText::Normal:        out << "Normal";        break;
+        case Poppler::FormFieldText::Multiline:     out << "Multiline";     break;
+        case Poppler::FormFieldText::FileSelect:    out << "FileSelect";    break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormFieldChoice::ChoiceType type)
+{
+    switch (type) {
+        case Poppler::FormFieldChoice::ComboBox:      out << "ComboBox";    break;
+        case Poppler::FormFieldChoice::ListBox:       out << "ListBox";     break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Qt::Alignment alignment)
+{
+    switch (alignment) {
+        case Qt::AlignLeft:     out << "Left";      break;
+        case Qt::AlignRight:    out << "Right";     break;
+        case Qt::AlignHCenter:  out << "HCenter";   break;
+        case Qt::AlignJustify:  out << "Justify";   break;
+        case Qt::AlignTop:      out << "Top";       break;
+        case Qt::AlignBottom:   out << "Bottom";    break;
+        case Qt::AlignVCenter:  out << "VCenter";   break;
+        case Qt::AlignCenter:   out << "Center";    break;
+        case Qt::AlignAbsolute: out << "Absolute";  break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, const QString &string)
+{
+    out << string.toUtf8().constData();
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, const QRectF &rect)
+{
+    out << QString("top: %1 left: %2 width: %3 height: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height());
+    return out;
+}
+
+template<typename T>
+std::ostream& operator<< (std::ostream &out, const QList<T> &elems)
+{
+    bool isFirst = true;
+    for (int i = 0; i < elems.count(); ++i) {
+        if (!isFirst)
+            out << " ";
+        out << elems[i];
+        isFirst = false;
+    }
+    return out;
+}
+
+int main( int argc, char **argv )
+{
+    QCoreApplication a( argc, argv );
+
+    if (!( argc == 2 ))
+    {
+        qWarning() << "usage: poppler-forms filename";
+        exit(1);
+    }
+
+    Poppler::Document *doc = Poppler::Document::load(argv[1]);
+    if (!doc)
+    {
+        qWarning() << "doc not loaded";
+        exit(1);
+    }
+
+    std::cout << "Forms for file " << argv[1] << std::endl;
+    for (int i = 0; i < doc->numPages(); ++i) {
+        Poppler::Page *page = doc->page(i);
+        if (page) {
+            QList<Poppler::FormField*> forms = page->formFields();
+            std::cout << "\tPage " << i + 1 << std::endl;
+            foreach( const Poppler::FormField *form, forms ) {
+                std::cout << "\t\tForm" << std::endl;
+                std::cout << "\t\t\tType: " << form->type() << std::endl;
+                std::cout << "\t\t\tRect: " << form->rect() << std::endl;
+                std::cout << "\t\t\tID: " << form->id() << std::endl;
+                std::cout << "\t\t\tName: " << form->name() << std::endl;
+                std::cout << "\t\t\tFullyQualifiedName: " << form->fullyQualifiedName() << std::endl;
+                std::cout << "\t\t\tUIName: " << form->uiName() << std::endl;
+                std::cout << "\t\t\tReadOnly: " << form->isReadOnly() << std::endl;
+                std::cout << "\t\t\tVisible: " << form->isVisible() << std::endl;
+                switch (form->type()) {
+                    case Poppler::FormField::FormButton: {
+                        const Poppler::FormFieldButton *buttonForm = static_cast<const Poppler::FormFieldButton *>(form);
+                        std::cout << "\t\t\tButtonType: " << buttonForm->buttonType() << std::endl;
+                        std::cout << "\t\t\tCaption: " << buttonForm->caption() << std::endl;
+                        std::cout << "\t\t\tState: " << buttonForm->state() << std::endl;
+                        std::cout << "\t\t\tSiblings: " << buttonForm->siblings() << std::endl;
+                    }
+                    break;
+                    
+                    case Poppler::FormField::FormText: {
+                        const Poppler::FormFieldText *textForm = static_cast<const Poppler::FormFieldText *>(form);
+                        std::cout << "\t\t\tTextType: " << textForm->textType() << std::endl;
+                        std::cout << "\t\t\tText: " << textForm->text() << std::endl;
+                        std::cout << "\t\t\tIsPassword: " << textForm->isPassword() << std::endl;
+                        std::cout << "\t\t\tIsRichText: " << textForm->isRichText() << std::endl;
+                        std::cout << "\t\t\tMaximumLength: " << textForm->maximumLength() << std::endl;
+                        std::cout << "\t\t\tTextAlignment: " << textForm->textAlignment() << std::endl;
+                        std::cout << "\t\t\tCanBeSpellChecked: " << textForm->canBeSpellChecked() << std::endl;
+                    }
+                    break;
+
+                    case Poppler::FormField::FormChoice: {
+                        const Poppler::FormFieldChoice *choiceForm = static_cast<const Poppler::FormFieldChoice *>(form);
+                        std::cout << "\t\t\tChoiceType: " << choiceForm->choiceType() << std::endl;
+                        std::cout << "\t\t\tChoices: " << choiceForm->choices() << std::endl;
+                        std::cout << "\t\t\tIsEditable: " << choiceForm->isEditable() << std::endl;
+                        std::cout << "\t\t\tIsMultiSelect: " << choiceForm->multiSelect() << std::endl;
+                        std::cout << "\t\t\tCurrentChoices: " << choiceForm->currentChoices() << std::endl;
+                        std::cout << "\t\t\tEditChoice: " << choiceForm->editChoice() << std::endl;
+                        std::cout << "\t\t\tTextAlignment: " << choiceForm->textAlignment() << std::endl;
+                        std::cout << "\t\t\tCanBeSpellChecked: " << choiceForm->canBeSpellChecked() << std::endl;
+                    }
+                    break;
+
+                    case Poppler::FormField::FormSignature:
+                    break;
+                }
+            }
+            qDeleteAll(forms);
+        }
+    }
+    delete doc;
+}
diff --git a/qt4/tests/stress-threads-qt4.cpp b/qt4/tests/stress-threads-qt4.cpp
new file mode 100644
index 00000000..d4d5fa05
--- /dev/null
+++ b/qt4/tests/stress-threads-qt4.cpp
@@ -0,0 +1,304 @@
+
+#include <unistd.h>
+#include <time.h>
+
+#include <poppler-qt4.h>
+#include <poppler-form.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+#include <QtGui/QImage>
+
+class SillyThread : public QThread
+{
+public:
+    SillyThread(Poppler::Document* document, QObject* parent = 0);
+
+    void run();
+
+private:
+    Poppler::Document* m_document;
+    QVector< Poppler::Page* > m_pages;
+
+};
+
+class CrazyThread : public QThread
+{
+public:
+    CrazyThread(uint seed, Poppler::Document* document, QMutex* annotationMutex, QObject* parent = 0);
+
+    void run();
+
+private:
+    uint m_seed;
+    Poppler::Document* m_document;
+    QMutex* m_annotationMutex;
+
+};
+
+static Poppler::Page* loadPage(Poppler::Document* document, int index)
+{
+    Poppler::Page* page = document->page(index);
+
+    if(page == 0)
+    {
+        qDebug() << "!Document::page";
+        
+        exit(EXIT_FAILURE);
+    }
+
+    return page;
+}
+
+static Poppler::Page* loadRandomPage(Poppler::Document* document)
+{
+    return loadPage(document, qrand() % document->numPages());
+}
+
+SillyThread::SillyThread(Poppler::Document* document, QObject* parent) : QThread(parent),
+    m_document(document),
+    m_pages()
+{
+    m_pages.reserve(m_document->numPages());
+
+    for(int index = 0; index < m_document->numPages(); ++index)
+    {
+        m_pages.append(loadPage(m_document, index));
+    }
+}
+
+
+void SillyThread::run()
+{
+    forever
+    {
+        foreach(Poppler::Page* page, m_pages)
+        {
+            QImage image = page->renderToImage();
+
+            if(image.isNull())
+            {
+                qDebug() << "!Page::renderToImage";
+                
+                ::exit(EXIT_FAILURE);
+            }
+        }
+    }
+}
+
+CrazyThread::CrazyThread(uint seed, Poppler::Document* document, QMutex* annotationMutex, QObject* parent) : QThread(parent),
+    m_seed(seed),
+    m_document(document),
+    m_annotationMutex(annotationMutex)
+{
+}
+
+void CrazyThread::run()
+{
+    typedef QScopedPointer< Poppler::Page > PagePointer;
+
+    qsrand(m_seed);
+
+    forever
+    {
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "search...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            page->search("c", Poppler::Page::CaseInsensitive);
+            page->search("r", Poppler::Page::CaseSensitive);
+            page->search("a", Poppler::Page::CaseInsensitive);
+            page->search("z", Poppler::Page::CaseSensitive);
+            page->search("y", Poppler::Page::CaseInsensitive);
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "links...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            QList< Poppler::Link* > links = page->links();
+
+            qDeleteAll(links);
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "form fields...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            QList< Poppler::FormField* > formFields = page->formFields();
+
+            qDeleteAll(formFields);
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "thumbnail...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            page->thumbnail();
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "text...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            page->text(QRectF(QPointF(), page->pageSizeF()));
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            QMutexLocker mutexLocker(m_annotationMutex);
+            
+            qDebug() << "add annotation...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            Poppler::Annotation* annotation = 0;
+
+            switch(qrand() % 3)
+            {
+            default:
+            case 0:
+                annotation = new Poppler::TextAnnotation(qrand() % 2 == 0 ? Poppler::TextAnnotation::Linked : Poppler::TextAnnotation::InPlace);
+                break;
+            case 1:
+                annotation = new Poppler::HighlightAnnotation();
+                break;
+            case 2:
+                annotation = new Poppler::InkAnnotation();
+                break;
+            }
+
+            annotation->setBoundary(QRectF(0.0, 0.0, 0.5, 0.5));
+            annotation->setContents("crazy");
+
+            page->addAnnotation(annotation);
+
+            delete annotation;
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            QMutexLocker mutexLocker(m_annotationMutex);
+            
+            for(int index = 0; index < m_document->numPages(); ++index)
+            {
+                PagePointer page(loadPage(m_document, index));
+
+                QList< Poppler::Annotation* > annotations = page->annotations();
+
+                if(!annotations.isEmpty())
+                {
+                    qDebug() << "modify annotation...";
+
+                    annotations.at(qrand() % annotations.size())->setBoundary(QRectF(0.5, 0.5, 0.25, 0.25));
+                    annotations.at(qrand() % annotations.size())->setAuthor("foo");
+                    annotations.at(qrand() % annotations.size())->setContents("bar");
+                    annotations.at(qrand() % annotations.size())->setCreationDate(QDateTime::currentDateTime());
+                    annotations.at(qrand() % annotations.size())->setModificationDate(QDateTime::currentDateTime());
+                }
+
+                qDeleteAll(annotations);
+
+                if(!annotations.isEmpty())
+                {
+                    break;
+                }
+            }
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            QMutexLocker mutexLocker(m_annotationMutex);
+            
+            for(int index = 0; index < m_document->numPages(); ++index)
+            {
+                PagePointer page(loadPage(m_document, index));
+
+                QList< Poppler::Annotation* > annotations = page->annotations();
+
+                if(!annotations.isEmpty())
+                {
+                    qDebug() << "remove annotation...";
+
+                    page->removeAnnotation(annotations.takeAt(qrand() % annotations.size()));
+                }
+
+                qDeleteAll(annotations);
+
+                if(!annotations.isEmpty())
+                {
+                    break;
+                }
+            }
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "fonts...";
+
+            m_document->fonts();
+        }
+    }
+}
+
+int main(int argc, char** argv)
+{
+    if(argc < 5)
+    {
+        qDebug() << "usage: stress-threads-qt duration sillyCount crazyCount file(s)";
+        
+        return EXIT_FAILURE;
+    }
+
+    const int duration = atoi(argv[1]);
+    const int sillyCount = atoi(argv[2]);
+    const int crazyCount = atoi(argv[3]);
+    
+    qsrand(time(0));
+
+    for(int argi = 4; argi < argc; ++argi)
+    {
+        const QString file = QFile::decodeName(argv[argi]);
+        Poppler::Document* document = Poppler::Document::load(file);
+
+        if(document == 0)
+        {
+            qDebug() << "Could not load" << file;            
+            continue;
+        }
+        
+        if(document->isLocked())
+        {
+            qDebug() << file << "is locked";
+            continue;
+        }
+        
+        for(int i = 0; i < sillyCount; ++i)
+        {
+            (new SillyThread(document))->start();
+        }
+        
+        QMutex* annotationMutex = new QMutex();
+
+        for(int i = 0; i < crazyCount; ++i)
+        {
+            (new CrazyThread(qrand(), document, annotationMutex))->start();
+        }
+    }
+
+    sleep(duration);
+
+    return EXIT_SUCCESS;
+}
diff --git a/qt4/tests/test-poppler-qt4.cpp b/qt4/tests/test-poppler-qt4.cpp
index 46875efb..ae6b11f3 100644
--- a/qt4/tests/test-poppler-qt4.cpp
+++ b/qt4/tests/test-poppler-qt4.cpp
@@ -148,7 +148,7 @@ int main( int argc, char **argv )
         argc > 3)
     {
 	// use argument as file name
-	qWarning() << "usage: test-poppler-qt filename [-extract|-arthur|-textRects]";
+	qWarning() << "usage: test-poppler-qt4 filename [-extract|-arthur|-textRects]";
 	exit(1);
     }
   
diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
new file mode 100644
index 00000000..a364abf1
--- /dev/null
+++ b/qt5/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_subdirectory(src)
+add_subdirectory(tests)
+add_subdirectory(demos)
diff --git a/qt5/Makefile.am b/qt5/Makefile.am
new file mode 100644
index 00000000..69a10cb1
--- /dev/null
+++ b/qt5/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src tests demos
diff --git a/qt5/Makefile.in b/qt5/Makefile.in
new file mode 100644
index 00000000..0b57687c
--- /dev/null
+++ b/qt5/Makefile.in
@@ -0,0 +1,701 @@
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = qt5
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/poppler/poppler-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_FEATURE = @CAIRO_FEATURE@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_REQ = @CAIRO_REQ@
+CAIRO_VERSION = @CAIRO_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
+GTK_TEST_LIBS = @GTK_TEST_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
+LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBOPENJPEG_CFLAGS = @LIBOPENJPEG_CFLAGS@
+LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTIFF_CFLAGS = @LIBTIFF_CFLAGS@
+LIBTIFF_CFLAGSS = @LIBTIFF_CFLAGSS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PC_REQUIRES = @PC_REQUIRES@
+PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POPPLER_DATADIR = @POPPLER_DATADIR@
+POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
+POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
+POPPLER_GLIB_DISABLE_SINGLE_INCLUDES = @POPPLER_GLIB_DISABLE_SINGLE_INCLUDES@
+POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
+POPPLER_MAJOR_VERSION = @POPPLER_MAJOR_VERSION@
+POPPLER_MICRO_VERSION = @POPPLER_MICRO_VERSION@
+POPPLER_MINOR_VERSION = @POPPLER_MINOR_VERSION@
+POPPLER_QT4_CFLAGS = @POPPLER_QT4_CFLAGS@
+POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
+POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
+POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTDATADIR = @TESTDATADIR@
+VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+create_shared_lib = @create_shared_lib@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+win32_libs = @win32_libs@
+SUBDIRS = src tests demos
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qt5/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign qt5/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/qt5/demos/CMakeLists.txt b/qt5/demos/CMakeLists.txt
new file mode 100644
index 00000000..6861e1d2
--- /dev/null
+++ b/qt5/demos/CMakeLists.txt
@@ -0,0 +1,38 @@
+set(CMAKE_AUTOMOC ON)
+
+add_definitions(${QT5_DEFINITIONS})
+add_definitions(${Qt5Core_DEFINITIONS})
+add_definitions(${Qt5Gui_DEFINITIONS})
+add_definitions(${Qt5Widgets_DEFINITIONS})
+add_definitions(${Qt5Xml_DEFINITIONS})
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Widgets_INCLUDE_DIRS}
+  ${Qt5Gui_INCLUDE_DIRS}
+  ${Qt5Xml_INCLUDE_DIRS}
+)
+
+set(poppler_qt5viewer_SRCS
+  abstractinfodock.cpp
+  documentobserver.cpp
+  embeddedfiles.cpp
+  fonts.cpp
+  info.cpp
+  main_viewer.cpp
+  metadata.cpp
+  navigationtoolbar.cpp
+  optcontent.cpp
+  pageview.cpp
+  permissions.cpp
+  thumbnails.cpp
+  toc.cpp
+  viewer.cpp
+)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+poppler_add_test(poppler_qt5viewer BUILD_QT5_TESTS ${poppler_qt5viewer_SRCS})
+target_link_libraries(poppler_qt5viewer poppler-qt5 ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Xml_LIBRARIES})
diff --git a/qt5/demos/Makefile.am b/qt5/demos/Makefile.am
new file mode 100644
index 00000000..15942f21
--- /dev/null
+++ b/qt5/demos/Makefile.am
@@ -0,0 +1,67 @@
+AM_LDFLAGS = @auto_import_flags@
+
+INCLUDES =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler			\
+	-I$(top_srcdir)/qt5/src			\
+	$(POPPLER_QT5_CFLAGS)
+
+LDADDS =					\
+	$(top_builddir)/poppler/libpoppler.la	\
+	$(top_builddir)/qt5/src/libpoppler-qt5.la	\
+	$(POPPLER_QT5_LIBS)
+
+SUFFIXES: .moc
+
+# This rule lets GNU make create any *.moc from the equivalent *.h
+.h.moc:
+	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
+
+noinst_PROGRAMS = poppler_qt5viewer
+
+poppler_qt5viewer_SOURCES =			\
+	abstractinfodock.cpp			\
+	abstractinfodock.h			\
+	documentobserver.cpp			\
+	documentobserver.h			\
+	embeddedfiles.cpp			\
+	embeddedfiles.h				\
+	fonts.cpp				\
+	fonts.h					\
+	info.cpp				\
+	info.h					\
+	main_viewer.cpp				\
+	metadata.cpp				\
+	metadata.h				\
+	navigationtoolbar.cpp			\
+	navigationtoolbar.h			\
+	optcontent.cpp				\
+	optcontent.h				\
+	pageview.cpp				\
+	pageview.h				\
+	permissions.cpp				\
+	permissions.h				\
+	thumbnails.cpp				\
+	thumbnails.h				\
+	toc.cpp					\
+	toc.h					\
+	viewer.cpp				\
+	viewer.h
+
+abstractinfodock.$(OBJEXT): abstractinfodock.moc
+embeddedfiles.$(OBJEXT): embeddedfiles.moc
+fonts.$(OBJEXT): fonts.moc
+info.$(OBJEXT): info.moc
+metadata.$(OBJEXT): metadata.moc
+navigationtoolbar.$(OBJEXT): navigationtoolbar.moc
+optcontent.$(OBJEXT): optcontent.moc
+pageview.$(OBJEXT): pageview.moc
+permissions.$(OBJEXT): permissions.moc
+thumbnails.$(OBJEXT): thumbnails.moc
+toc.$(OBJEXT): toc.moc
+viewer.$(OBJEXT): viewer.moc
+
+poppler_qt5viewer_LDADD = $(LDADDS)
+
+clean-generic:
+	rm -f *.moc
diff --git a/qt5/demos/Makefile.in b/qt5/demos/Makefile.in
new file mode 100644
index 00000000..94611248
--- /dev/null
+++ b/qt5/demos/Makefile.in
@@ -0,0 +1,769 @@
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = poppler_qt5viewer$(EXEEXT)
+subdir = qt5/demos
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/poppler/poppler-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_poppler_qt5viewer_OBJECTS = abstractinfodock.$(OBJEXT) \
+	documentobserver.$(OBJEXT) embeddedfiles.$(OBJEXT) \
+	fonts.$(OBJEXT) info.$(OBJEXT) main_viewer.$(OBJEXT) \
+	metadata.$(OBJEXT) navigationtoolbar.$(OBJEXT) \
+	optcontent.$(OBJEXT) pageview.$(OBJEXT) permissions.$(OBJEXT) \
+	thumbnails.$(OBJEXT) toc.$(OBJEXT) viewer.$(OBJEXT)
+poppler_qt5viewer_OBJECTS = $(am_poppler_qt5viewer_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
+	$(top_builddir)/qt5/src/libpoppler-qt5.la \
+	$(am__DEPENDENCIES_1)
+poppler_qt5viewer_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(poppler_qt5viewer_SOURCES)
+DIST_SOURCES = $(poppler_qt5viewer_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_FEATURE = @CAIRO_FEATURE@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_REQ = @CAIRO_REQ@
+CAIRO_VERSION = @CAIRO_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
+GTK_TEST_LIBS = @GTK_TEST_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
+LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBOPENJPEG_CFLAGS = @LIBOPENJPEG_CFLAGS@
+LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTIFF_CFLAGS = @LIBTIFF_CFLAGS@
+LIBTIFF_CFLAGSS = @LIBTIFF_CFLAGSS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PC_REQUIRES = @PC_REQUIRES@
+PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POPPLER_DATADIR = @POPPLER_DATADIR@
+POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
+POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
+POPPLER_GLIB_DISABLE_SINGLE_INCLUDES = @POPPLER_GLIB_DISABLE_SINGLE_INCLUDES@
+POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
+POPPLER_MAJOR_VERSION = @POPPLER_MAJOR_VERSION@
+POPPLER_MICRO_VERSION = @POPPLER_MICRO_VERSION@
+POPPLER_MINOR_VERSION = @POPPLER_MINOR_VERSION@
+POPPLER_QT4_CFLAGS = @POPPLER_QT4_CFLAGS@
+POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
+POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
+POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTDATADIR = @TESTDATADIR@
+VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+create_shared_lib = @create_shared_lib@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+win32_libs = @win32_libs@
+AM_LDFLAGS = @auto_import_flags@
+INCLUDES = \
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler			\
+	-I$(top_srcdir)/qt5/src			\
+	$(POPPLER_QT5_CFLAGS)
+
+LDADDS = \
+	$(top_builddir)/poppler/libpoppler.la	\
+	$(top_builddir)/qt5/src/libpoppler-qt5.la	\
+	$(POPPLER_QT5_LIBS)
+
+poppler_qt5viewer_SOURCES = \
+	abstractinfodock.cpp			\
+	abstractinfodock.h			\
+	documentobserver.cpp			\
+	documentobserver.h			\
+	embeddedfiles.cpp			\
+	embeddedfiles.h				\
+	fonts.cpp				\
+	fonts.h					\
+	info.cpp				\
+	info.h					\
+	main_viewer.cpp				\
+	metadata.cpp				\
+	metadata.h				\
+	navigationtoolbar.cpp			\
+	navigationtoolbar.h			\
+	optcontent.cpp				\
+	optcontent.h				\
+	pageview.cpp				\
+	pageview.h				\
+	permissions.cpp				\
+	permissions.h				\
+	thumbnails.cpp				\
+	thumbnails.h				\
+	toc.cpp					\
+	toc.h					\
+	viewer.cpp				\
+	viewer.h
+
+poppler_qt5viewer_LDADD = $(LDADDS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .h .lo .moc .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qt5/demos/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign qt5/demos/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+poppler_qt5viewer$(EXEEXT): $(poppler_qt5viewer_OBJECTS) $(poppler_qt5viewer_DEPENDENCIES) $(EXTRA_poppler_qt5viewer_DEPENDENCIES) 
+	@rm -f poppler_qt5viewer$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(poppler_qt5viewer_OBJECTS) $(poppler_qt5viewer_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/abstractinfodock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/documentobserver.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/embeddedfiles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main_viewer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navigationtoolbar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optcontent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pageview.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/permissions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thumbnails.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/viewer.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+SUFFIXES: .moc
+
+# This rule lets GNU make create any *.moc from the equivalent *.h
+.h.moc:
+	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
+
+abstractinfodock.$(OBJEXT): abstractinfodock.moc
+embeddedfiles.$(OBJEXT): embeddedfiles.moc
+fonts.$(OBJEXT): fonts.moc
+info.$(OBJEXT): info.moc
+metadata.$(OBJEXT): metadata.moc
+navigationtoolbar.$(OBJEXT): navigationtoolbar.moc
+optcontent.$(OBJEXT): optcontent.moc
+pageview.$(OBJEXT): pageview.moc
+permissions.$(OBJEXT): permissions.moc
+thumbnails.$(OBJEXT): thumbnails.moc
+toc.$(OBJEXT): toc.moc
+viewer.$(OBJEXT): viewer.moc
+
+clean-generic:
+	rm -f *.moc
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/qt5/demos/abstractinfodock.cpp b/qt5/demos/abstractinfodock.cpp
new file mode 100644
index 00000000..7b306d82
--- /dev/null
+++ b/qt5/demos/abstractinfodock.cpp
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "fonts.h"
+
+AbstractInfoDock::AbstractInfoDock(QWidget *parent)
+    : QDockWidget(parent), m_filled(false)
+{
+    connect(this, SIGNAL(visibilityChanged(bool)), SLOT(slotVisibilityChanged(bool)));
+}
+
+AbstractInfoDock::~AbstractInfoDock()
+{
+}
+
+void AbstractInfoDock::documentLoaded()
+{
+    if (!isHidden()) {
+        fillInfo();
+        m_filled = true;
+    }
+}
+
+void AbstractInfoDock::documentClosed()
+{
+    m_filled = false;
+}
+
+void AbstractInfoDock::pageChanged(int page)
+{
+    Q_UNUSED(page)
+}
+
+void AbstractInfoDock::slotVisibilityChanged(bool visible)
+{
+    if (visible && document() && !m_filled) {
+        fillInfo();
+        m_filled = true;
+    }
+}
+
+#include "abstractinfodock.moc"
diff --git a/qt5/demos/abstractinfodock.h b/qt5/demos/abstractinfodock.h
new file mode 100644
index 00000000..08b4a613
--- /dev/null
+++ b/qt5/demos/abstractinfodock.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ABSTRACTINFODOCK_H
+#define ABSTRACTINFODOCK_H
+
+#include <QtWidgets/QDockWidget>
+
+#include "documentobserver.h"
+
+class AbstractInfoDock : public QDockWidget, public DocumentObserver
+{
+    Q_OBJECT
+
+public:
+    AbstractInfoDock(QWidget *parent = 0);
+    ~AbstractInfoDock();
+
+    /*virtual*/ void documentLoaded();
+    /*virtual*/ void documentClosed();
+    /*virtual*/ void pageChanged(int page);
+
+protected:
+    virtual void fillInfo() = 0;
+
+private Q_SLOTS:
+    void slotVisibilityChanged(bool visible);
+
+private:
+    bool m_filled;
+};
+
+#endif
diff --git a/qt5/demos/documentobserver.cpp b/qt5/demos/documentobserver.cpp
new file mode 100644
index 00000000..e5c283db
--- /dev/null
+++ b/qt5/demos/documentobserver.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "documentobserver.h"
+
+#include "viewer.h"
+
+DocumentObserver::DocumentObserver()
+    : m_viewer(0)
+{
+}
+
+DocumentObserver::~DocumentObserver()
+{
+}
+
+Poppler::Document* DocumentObserver::document() const
+{
+    return m_viewer->m_doc;
+}
+
+void DocumentObserver::setPage(int page)
+{
+    m_viewer->setPage(page);
+}
+
+int DocumentObserver::page() const
+{
+    return m_viewer->page();
+}
+
+void DocumentObserver::reloadPage()
+{
+    m_viewer->setPage(m_viewer->page());
+}
diff --git a/qt5/demos/documentobserver.h b/qt5/demos/documentobserver.h
new file mode 100644
index 00000000..38fe2043
--- /dev/null
+++ b/qt5/demos/documentobserver.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef DOCUMENTOBSERVER_H
+#define DOCUMENTOBSERVER_H
+
+class PdfViewer;
+namespace Poppler {
+class Document;
+}
+
+class DocumentObserver
+{
+friend class PdfViewer;
+
+public:
+    virtual ~DocumentObserver();
+
+    virtual void documentLoaded() = 0;
+    virtual void documentClosed() = 0;
+    virtual void pageChanged(int page) = 0;
+
+protected:
+    DocumentObserver();
+
+    Poppler::Document* document() const;
+    void setPage(int page);
+    int page() const;
+    void reloadPage();
+
+private:
+    PdfViewer *m_viewer;
+};
+
+#endif
diff --git a/qt5/demos/embeddedfiles.cpp b/qt5/demos/embeddedfiles.cpp
new file mode 100644
index 00000000..36ffa36d
--- /dev/null
+++ b/qt5/demos/embeddedfiles.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "embeddedfiles.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QTableWidget>
+
+EmbeddedFilesDock::EmbeddedFilesDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_table = new QTableWidget(this);
+    setWidget(m_table);
+    setWindowTitle(tr("Embedded files"));
+    m_table->setColumnCount(6);
+    m_table->setHorizontalHeaderLabels(
+        QStringList() << tr("Name") << tr("Description") << tr("Size") << tr("Creation date")
+                      << tr("Modification date") << tr("Checksum"));
+    m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+}
+
+EmbeddedFilesDock::~EmbeddedFilesDock()
+{
+}
+
+void EmbeddedFilesDock::fillInfo()
+{
+    m_table->setHorizontalHeaderLabels(
+        QStringList() << tr("Name") << tr("Description") << tr("Size") << tr("Creation date")
+                      << tr("Modification date") << tr("Checksum"));
+    if (!document()->hasEmbeddedFiles()) {
+        m_table->setItem(0, 0, new QTableWidgetItem(tr("No files")));
+        return;
+    }
+
+    const QList<Poppler::EmbeddedFile*> files = document()->embeddedFiles();
+    m_table->setRowCount(files.count());
+    int i = 0;
+    Q_FOREACH(Poppler::EmbeddedFile *file, files) {
+        m_table->setItem(i, 0, new QTableWidgetItem(file->name()));
+        m_table->setItem(i, 1, new QTableWidgetItem(file->description()));
+        m_table->setItem(i, 2, new QTableWidgetItem(QString::number(file->size())));
+        m_table->setItem(i, 3, new QTableWidgetItem(file->createDate().toString(Qt::SystemLocaleDate)));
+        m_table->setItem(i, 4, new QTableWidgetItem(file->modDate().toString(Qt::SystemLocaleDate)));
+        const QByteArray checksum = file->checksum();
+        const QString checksumString = !checksum.isEmpty() ? QString::fromLatin1(checksum.toHex()) : QString::fromLatin1("n/a");
+        m_table->setItem(i, 5, new QTableWidgetItem(checksumString));
+        ++i;
+    }
+}
+
+void EmbeddedFilesDock::documentLoaded()
+{
+    if ( document()->pageMode() == Poppler::Document::UseAttach ) {
+        show();
+    }
+}
+
+void EmbeddedFilesDock::documentClosed()
+{
+    m_table->clear();
+    m_table->setRowCount(0);
+    AbstractInfoDock::documentClosed();
+}
+
+#include "embeddedfiles.moc"
diff --git a/qt5/demos/embeddedfiles.h b/qt5/demos/embeddedfiles.h
new file mode 100644
index 00000000..7cd60397
--- /dev/null
+++ b/qt5/demos/embeddedfiles.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ATTACHMENTS_H
+#define ATTACHMENTS_H
+
+#include "abstractinfodock.h"
+
+class QTableWidget;
+
+class EmbeddedFilesDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    EmbeddedFilesDock(QWidget *parent = 0);
+    ~EmbeddedFilesDock();
+
+    virtual void documentLoaded();
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private:
+    QTableWidget *m_table;
+};
+
+#endif
diff --git a/qt5/demos/fonts.cpp b/qt5/demos/fonts.cpp
new file mode 100644
index 00000000..b75bc49f
--- /dev/null
+++ b/qt5/demos/fonts.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "fonts.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QTableWidget>
+
+static QString yesNoStatement(bool value)
+{
+    return value ? QString::fromLatin1("yes") : QString::fromLatin1("no");
+}
+
+FontsDock::FontsDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_table = new QTableWidget(this);
+    setWidget(m_table);
+    setWindowTitle(tr("Fonts"));
+    m_table->setColumnCount(5);
+    m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Type") << tr("Embedded") << tr("Subset") << tr("File"));
+    m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+}
+
+FontsDock::~FontsDock()
+{
+}
+
+void FontsDock::fillInfo()
+{
+    const QList<Poppler::FontInfo> fonts = document()->fonts();
+    m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Type") << tr("Embedded") << tr("Subset") << tr("File"));
+    m_table->setRowCount(fonts.count());
+    int i = 0;
+    Q_FOREACH(const Poppler::FontInfo &font, fonts) {
+        if (font.name().isNull()) {
+            m_table->setItem(i, 0, new QTableWidgetItem(QString::fromLatin1("[none]")));
+        } else {
+            m_table->setItem(i, 0, new QTableWidgetItem(font.name()));
+        }
+        m_table->setItem(i, 1, new QTableWidgetItem(font.typeName()));
+        m_table->setItem(i, 2, new QTableWidgetItem(yesNoStatement(font.isEmbedded())));
+        m_table->setItem(i, 3, new QTableWidgetItem(yesNoStatement(font.isSubset())));
+        m_table->setItem(i, 4, new QTableWidgetItem(font.file()));
+        ++i;
+    }
+}
+
+void FontsDock::documentClosed()
+{
+    m_table->clear();
+    m_table->setRowCount(0);
+    AbstractInfoDock::documentClosed();
+}
+
+#include "fonts.moc"
diff --git a/qt5/demos/fonts.h b/qt5/demos/fonts.h
new file mode 100644
index 00000000..81afa579
--- /dev/null
+++ b/qt5/demos/fonts.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef FONTS_H
+#define FONTS_H
+
+#include "abstractinfodock.h"
+
+class QTableWidget;
+
+class FontsDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    FontsDock(QWidget *parent = 0);
+    ~FontsDock();
+
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private:
+    QTableWidget *m_table;
+};
+
+#endif
diff --git a/qt5/demos/info.cpp b/qt5/demos/info.cpp
new file mode 100644
index 00000000..0aa6d2c0
--- /dev/null
+++ b/qt5/demos/info.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "info.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QTableWidget>
+
+InfoDock::InfoDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_table = new QTableWidget(this);
+    setWidget(m_table);
+    setWindowTitle(tr("Information"));
+    m_table->setColumnCount(2);
+    m_table->setHorizontalHeaderLabels(QStringList() << tr("Key") << tr("Value"));
+    m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+}
+
+InfoDock::~InfoDock()
+{
+}
+
+void InfoDock::fillInfo()
+{
+    QStringList keys = document()->infoKeys();
+    m_table->setHorizontalHeaderLabels(QStringList() << tr("Key") << tr("Value"));
+    m_table->setRowCount(keys.count());
+    QStringList dateKeys;
+    dateKeys << QString::fromLatin1("CreationDate");
+    dateKeys << QString::fromLatin1("ModDate");
+    int i = 0;
+    Q_FOREACH(const QString &date, dateKeys) {
+        const int id = keys.indexOf(date);
+        if (id != -1) {
+            m_table->setItem(i, 0, new QTableWidgetItem(date));
+            m_table->setItem(i, 1, new QTableWidgetItem(document()->date(date).toString(Qt::SystemLocaleDate)));
+            ++i;
+            keys.removeAt(id);
+        }
+    }
+    Q_FOREACH(const QString &key, keys) {
+        m_table->setItem(i, 0, new QTableWidgetItem(key));
+        m_table->setItem(i, 1, new QTableWidgetItem(document()->info(key)));
+        ++i;
+    }
+}
+
+void InfoDock::documentClosed()
+{
+    m_table->clear();
+    m_table->setRowCount(0);
+    AbstractInfoDock::documentClosed();
+}
+
+#include "info.moc"
diff --git a/qt5/demos/info.h b/qt5/demos/info.h
new file mode 100644
index 00000000..d294b430
--- /dev/null
+++ b/qt5/demos/info.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INFO_H
+#define INFO_H
+
+#include "abstractinfodock.h"
+
+class QTableWidget;
+
+class InfoDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    InfoDock(QWidget *parent = 0);
+    ~InfoDock();
+
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private:
+    QTableWidget *m_table;
+};
+
+#endif
diff --git a/qt5/demos/main_viewer.cpp b/qt5/demos/main_viewer.cpp
new file mode 100644
index 00000000..ad2f3885
--- /dev/null
+++ b/qt5/demos/main_viewer.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "viewer.h"
+
+#include <QtWidgets/QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    const QStringList args = QCoreApplication::arguments();
+    PdfViewer *viewer = new PdfViewer();
+    viewer->show();
+    if (args.count() > 1) {
+        viewer->loadDocument(args.at(1));
+    }
+    return app.exec();
+}
diff --git a/qt5/demos/metadata.cpp b/qt5/demos/metadata.cpp
new file mode 100644
index 00000000..ef7b1f48
--- /dev/null
+++ b/qt5/demos/metadata.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "metadata.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QTextEdit>
+
+MetadataDock::MetadataDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_edit = new QTextEdit(this);
+    setWidget(m_edit);
+    setWindowTitle(tr("Metadata"));
+    m_edit->setAcceptRichText(false);
+    m_edit->setReadOnly(true);
+}
+
+MetadataDock::~MetadataDock()
+{
+}
+
+void MetadataDock::fillInfo()
+{
+    m_edit->setPlainText(document()->metadata());
+}
+
+void MetadataDock::documentClosed()
+{
+    m_edit->clear();
+    AbstractInfoDock::documentClosed();
+}
+
+#include "metadata.moc"
diff --git a/qt5/demos/metadata.h b/qt5/demos/metadata.h
new file mode 100644
index 00000000..6f1507a6
--- /dev/null
+++ b/qt5/demos/metadata.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef METADATA_H
+#define METADATA_H
+
+#include "abstractinfodock.h"
+
+class QTextEdit;
+
+class MetadataDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    MetadataDock(QWidget *parent = 0);
+    ~MetadataDock();
+
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private:
+    QTextEdit *m_edit;
+};
+
+#endif
diff --git a/qt5/demos/navigationtoolbar.cpp b/qt5/demos/navigationtoolbar.cpp
new file mode 100644
index 00000000..0b6c8622
--- /dev/null
+++ b/qt5/demos/navigationtoolbar.cpp
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "navigationtoolbar.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QAction>
+#include <QtWidgets/QComboBox>
+
+NavigationToolBar::NavigationToolBar(QWidget *parent)
+    : QToolBar(parent)
+{
+    m_firstAct = addAction(tr("First"), this, SLOT(slotGoFirst()));
+    m_prevAct = addAction(tr("Previous"), this, SLOT(slotGoPrev()));
+    m_pageCombo = new QComboBox(this);
+    connect(m_pageCombo, SIGNAL(activated(int)), this, SLOT(slotComboActivated(int)));
+    addWidget(m_pageCombo);
+    m_nextAct = addAction(tr("Next"), this, SLOT(slotGoNext()));
+    m_lastAct = addAction(tr("Last"), this, SLOT(slotGoLast()));
+
+    addSeparator();
+
+    m_zoomCombo = new QComboBox(this);
+    m_zoomCombo->setEditable(true);
+    m_zoomCombo->addItem(tr("10%"));
+    m_zoomCombo->addItem(tr("25%"));
+    m_zoomCombo->addItem(tr("33%"));
+    m_zoomCombo->addItem(tr("50%"));
+    m_zoomCombo->addItem(tr("66%"));
+    m_zoomCombo->addItem(tr("75%"));
+    m_zoomCombo->addItem(tr("100%"));
+    m_zoomCombo->addItem(tr("125%"));
+    m_zoomCombo->addItem(tr("150%"));
+    m_zoomCombo->addItem(tr("200%"));
+    m_zoomCombo->addItem(tr("300%"));
+    m_zoomCombo->addItem(tr("400%"));
+    m_zoomCombo->setCurrentIndex(6); // "100%"
+    connect(m_zoomCombo, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotZoomComboChanged(QString)));
+    addWidget(m_zoomCombo);
+
+    m_rotationCombo = new QComboBox(this);
+    // NOTE: \302\260 = degree symbol
+    m_rotationCombo->addItem(trUtf8("0\302\260"));
+    m_rotationCombo->addItem(trUtf8("90\302\260"));
+    m_rotationCombo->addItem(trUtf8("180\302\260"));
+    m_rotationCombo->addItem(trUtf8("270\302\260"));
+    connect(m_rotationCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(slotRotationComboChanged(int)));
+    addWidget(m_rotationCombo);
+
+    documentClosed();
+}
+
+NavigationToolBar::~NavigationToolBar()
+{
+}
+
+void NavigationToolBar::documentLoaded()
+{
+    const int pageCount = document()->numPages();
+    for (int i = 0; i < pageCount; ++i) {
+        m_pageCombo->addItem(QString::number(i + 1));
+    }
+    m_pageCombo->setEnabled(true);
+}
+
+void NavigationToolBar::documentClosed()
+{
+    m_firstAct->setEnabled(false);
+    m_prevAct->setEnabled(false);
+    m_nextAct->setEnabled(false);
+    m_lastAct->setEnabled(false);
+    m_pageCombo->clear();
+    m_pageCombo->setEnabled(false);
+}
+
+void NavigationToolBar::pageChanged(int page)
+{
+    const int pageCount = document()->numPages();
+    m_firstAct->setEnabled(page > 0);
+    m_prevAct->setEnabled(page > 0);
+    m_nextAct->setEnabled(page < (pageCount - 1));
+    m_lastAct->setEnabled(page < (pageCount - 1));
+    m_pageCombo->setCurrentIndex(page);
+}
+
+void NavigationToolBar::slotGoFirst()
+{
+    setPage(0);
+}
+
+void NavigationToolBar::slotGoPrev()
+{
+    setPage(page() - 1);
+}
+
+void NavigationToolBar::slotGoNext()
+{
+    setPage(page() + 1);
+}
+
+void NavigationToolBar::slotGoLast()
+{
+    setPage(document()->numPages() - 1);
+}
+
+void NavigationToolBar::slotComboActivated(int index)
+{
+    setPage(index);
+}
+
+void NavigationToolBar::slotZoomComboChanged(const QString &_text)
+{
+    QString text = _text;
+    text.remove(QLatin1Char('%'));
+    bool ok = false;
+    int value = text.toInt(&ok);
+    if (ok && value >= 10) {
+        emit zoomChanged(qreal(value) / 100);
+    }
+}
+
+void NavigationToolBar::slotRotationComboChanged(int idx)
+{
+    emit rotationChanged(idx * 90);
+}
+
+#include "navigationtoolbar.moc"
diff --git a/qt5/demos/navigationtoolbar.h b/qt5/demos/navigationtoolbar.h
new file mode 100644
index 00000000..e249adbc
--- /dev/null
+++ b/qt5/demos/navigationtoolbar.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef NAVIGATIONTOOLBAR_H
+#define NAVIGATIONTOOLBAR_H
+
+#include <QtWidgets/QToolBar>
+
+#include "documentobserver.h"
+
+class QAction;
+class QComboBox;
+
+class NavigationToolBar : public QToolBar, public DocumentObserver
+{
+    Q_OBJECT
+
+public:
+    NavigationToolBar(QWidget *parent = 0);
+    ~NavigationToolBar();
+
+    /*virtual*/ void documentLoaded();
+    /*virtual*/ void documentClosed();
+    /*virtual*/ void pageChanged(int page);
+
+Q_SIGNALS:
+    void zoomChanged(qreal value);
+    void rotationChanged(int rotation);
+
+private Q_SLOTS:
+    void slotGoFirst();
+    void slotGoPrev();
+    void slotGoNext();
+    void slotGoLast();
+    void slotComboActivated(int index);
+    void slotZoomComboChanged(const QString &text);
+    void slotRotationComboChanged(int idx);
+
+private:
+    QAction *m_firstAct;
+    QAction *m_prevAct;
+    QComboBox *m_pageCombo;
+    QAction *m_nextAct;
+    QAction *m_lastAct;
+    QComboBox *m_zoomCombo;
+    QComboBox *m_rotationCombo;
+};
+
+#endif
diff --git a/qt5/demos/optcontent.cpp b/qt5/demos/optcontent.cpp
new file mode 100644
index 00000000..56f8e967
--- /dev/null
+++ b/qt5/demos/optcontent.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "optcontent.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QTreeView>
+
+OptContentDock::OptContentDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_view = new QTreeView(this);
+    setWidget(m_view);
+    setWindowTitle(tr("Optional content"));
+    m_view->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+}
+
+OptContentDock::~OptContentDock()
+{
+}
+
+
+void OptContentDock::documentLoaded()
+{
+    AbstractInfoDock::documentLoaded();
+    if ( document()->pageMode() == Poppler::Document::UseOC ) {
+        show();
+    }  
+}
+
+void OptContentDock::fillInfo()
+{
+    if (!document()->hasOptionalContent()) {
+        return;
+    }
+
+    m_view->setModel(document()->optionalContentModel());
+    connect(m_view->model(), SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SLOT(reloadImage()));
+    m_view->expandToDepth(1);
+}
+
+void OptContentDock::documentClosed()
+{
+    m_view->setModel(0);
+    AbstractInfoDock::documentClosed();
+}
+
+void OptContentDock::reloadImage()
+{
+    reloadPage();
+}
+
+#include "optcontent.moc"
diff --git a/qt5/demos/optcontent.h b/qt5/demos/optcontent.h
new file mode 100644
index 00000000..b933f5cd
--- /dev/null
+++ b/qt5/demos/optcontent.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef OPTCONTENT_H
+#define OPTCONTENT_H
+
+#include "abstractinfodock.h"
+
+class QTreeView;
+
+class OptContentDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    OptContentDock(QWidget *parent = 0);
+    ~OptContentDock();
+
+    /*virtual*/ void documentLoaded();
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private Q_SLOTS:
+    void reloadImage();
+
+private:
+    QTreeView *m_view;
+};
+
+#endif
diff --git a/qt5/demos/pageview.cpp b/qt5/demos/pageview.cpp
new file mode 100644
index 00000000..cb2731b1
--- /dev/null
+++ b/qt5/demos/pageview.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "pageview.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtGui/QImage>
+#include <QtWidgets/QLabel>
+#include <QtGui/QPixmap>
+
+PageView::PageView(QWidget *parent)
+    : QScrollArea(parent)
+    , m_zoom(1.0)
+    , m_rotation(0)
+    , m_dpiX(QApplication::desktop()->physicalDpiX())
+    , m_dpiY(QApplication::desktop()->physicalDpiY())
+{
+    m_imageLabel = new QLabel(this);
+    m_imageLabel->resize(0, 0);
+    setWidget(m_imageLabel);
+}
+
+PageView::~PageView()
+{
+}
+
+void PageView::documentLoaded()
+{
+}
+
+void PageView::documentClosed()
+{
+    m_imageLabel->clear();
+    m_imageLabel->resize(0, 0);
+}
+
+void PageView::pageChanged(int page)
+{
+    Poppler::Page *popplerPage = document()->page(page);
+    const double resX = m_dpiX * m_zoom;
+    const double resY = m_dpiY * m_zoom;
+
+    Poppler::Page::Rotation rot;
+    if (m_rotation == 0)
+        rot = Poppler::Page::Rotate0;
+    else if (m_rotation == 90)
+        rot = Poppler::Page::Rotate90;
+    else if (m_rotation == 180)
+        rot = Poppler::Page::Rotate180;
+    else // m_rotation == 270
+        rot = Poppler::Page::Rotate270;
+
+    QImage image = popplerPage->renderToImage(resX, resY, -1, -1, -1, -1, rot);
+    if (!image.isNull()) {
+        m_imageLabel->resize(image.size());
+        m_imageLabel->setPixmap(QPixmap::fromImage(image));
+    } else {
+        m_imageLabel->resize(0, 0);
+        m_imageLabel->setPixmap(QPixmap());
+    }
+    delete popplerPage;
+}
+
+void PageView::slotZoomChanged(qreal value)
+{
+    m_zoom = value;
+    if (!document()) {
+        return;
+    }
+    reloadPage();
+}
+
+void PageView::slotRotationChanged(int value)
+{
+    m_rotation = value;
+    if (!document()) {
+        return;
+    }
+    reloadPage();
+}
+
+#include "pageview.moc"
diff --git a/qt5/demos/pageview.h b/qt5/demos/pageview.h
new file mode 100644
index 00000000..95795a5a
--- /dev/null
+++ b/qt5/demos/pageview.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef PAGEVIEW_H
+#define PAGEVIEW_H
+
+#include <QtWidgets/QScrollArea>
+
+#include "documentobserver.h"
+
+class QLabel;
+
+class PageView : public QScrollArea, public DocumentObserver
+{
+    Q_OBJECT
+
+public:
+    PageView(QWidget *parent = 0);
+    ~PageView();
+
+    /*virtual*/ void documentLoaded();
+    /*virtual*/ void documentClosed();
+    /*virtual*/ void pageChanged(int page);
+
+private Q_SLOTS:
+    void slotZoomChanged(qreal value);
+    void slotRotationChanged(int value);
+
+private:
+    QLabel *m_imageLabel;
+    qreal m_zoom;
+    int m_rotation;
+    int m_dpiX;
+    int m_dpiY;
+};
+
+#endif
diff --git a/qt5/demos/permissions.cpp b/qt5/demos/permissions.cpp
new file mode 100644
index 00000000..983dc0fc
--- /dev/null
+++ b/qt5/demos/permissions.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "permissions.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QListWidget>
+
+PermissionsDock::PermissionsDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_table = new QListWidget(this);
+    setWidget(m_table);
+    setWindowTitle(tr("Permissions"));
+    m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+}
+
+PermissionsDock::~PermissionsDock()
+{
+}
+
+void PermissionsDock::fillInfo()
+{
+#define ADD_ROW(title, function) \
+do { \
+    QListWidgetItem *item = new QListWidgetItem(); \
+    item->setFlags(item->flags() & ~Qt::ItemIsEnabled); \
+    item->setText(title); \
+    item->setCheckState(document()->function() ? Qt::Checked : Qt::Unchecked); \
+    m_table->addItem(item); \
+} while (0)
+    ADD_ROW("Print", okToPrint);
+    ADD_ROW("PrintHiRes", okToPrintHighRes);
+    ADD_ROW("Change", okToChange);
+    ADD_ROW("Copy", okToCopy);
+    ADD_ROW("Add Notes", okToAddNotes);
+    ADD_ROW("Fill Forms", okToFillForm);
+    ADD_ROW("Create Forms", okToCreateFormFields);
+    ADD_ROW("Extract for accessibility", okToExtractForAccessibility);
+    ADD_ROW("Assemble", okToAssemble);
+#undef ADD_ROW
+}
+
+void PermissionsDock::documentClosed()
+{
+    m_table->clear();
+    AbstractInfoDock::documentClosed();
+}
+
+#include "permissions.moc"
diff --git a/qt5/demos/permissions.h b/qt5/demos/permissions.h
new file mode 100644
index 00000000..13bcbbf0
--- /dev/null
+++ b/qt5/demos/permissions.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef PERMISSIONS_H
+#define PERMISSIONS_H
+
+#include "abstractinfodock.h"
+
+class QListWidget;
+
+class PermissionsDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    PermissionsDock(QWidget *parent = 0);
+    ~PermissionsDock();
+
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private:
+    QListWidget *m_table;
+};
+
+#endif
diff --git a/qt5/demos/thumbnails.cpp b/qt5/demos/thumbnails.cpp
new file mode 100644
index 00000000..1dafb5ee
--- /dev/null
+++ b/qt5/demos/thumbnails.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2009, Shawn Rutledge <shawn.t.rutledge@gmail.com>
+ * Copyright (C) 2009, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "thumbnails.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QListWidget>
+
+static const int PageRole = Qt::UserRole + 1;
+
+ThumbnailsDock::ThumbnailsDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_list = new QListWidget(this);
+    setWidget(m_list);
+    setWindowTitle(tr("Thumbnails"));
+    m_list->setViewMode(QListView::ListMode);
+    m_list->setMovement(QListView::Static);
+    m_list->setVerticalScrollMode(QListView::ScrollPerPixel);
+    connect(m_list, SIGNAL(itemActivated(QListWidgetItem*)),
+            this, SLOT(slotItemActivated(QListWidgetItem*)));
+}
+
+ThumbnailsDock::~ThumbnailsDock()
+{
+}
+
+void ThumbnailsDock::fillInfo()
+{
+    const int num = document()->numPages();
+    QSize maxSize;
+    for (int i = 0; i < num; ++i) {
+        const Poppler::Page *page = document()->page(i);
+        const QImage image = page->thumbnail();
+        if (!image.isNull()) {
+            QListWidgetItem *item = new QListWidgetItem();
+            item->setText(QString::number(i + 1));
+            item->setData(Qt::DecorationRole, QPixmap::fromImage(image));
+            item->setData(PageRole, i);
+            m_list->addItem(item);
+            maxSize.setWidth(qMax(maxSize.width(), image.width()));
+            maxSize.setHeight(qMax(maxSize.height(), image.height()));
+        }
+        delete page;
+    }
+    if (num > 0) {
+        m_list->setGridSize(maxSize);
+        m_list->setIconSize(maxSize);
+    }
+}
+
+void ThumbnailsDock::documentClosed()
+{
+    m_list->clear();
+    AbstractInfoDock::documentClosed();
+}
+
+void ThumbnailsDock::slotItemActivated(QListWidgetItem *item)
+{
+    if (!item) {
+        return;
+    }
+
+    setPage(item->data(PageRole).toInt());
+}
+
+#include "thumbnails.moc"
diff --git a/qt5/demos/thumbnails.h b/qt5/demos/thumbnails.h
new file mode 100644
index 00000000..076d5aee
--- /dev/null
+++ b/qt5/demos/thumbnails.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2009, Shawn Rutledge <shawn.t.rutledge@gmail.com>
+ * Copyright (C) 2009, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef THUMBNAILS_H
+#define THUMBNAILS_H
+
+#include "abstractinfodock.h"
+
+class QListWidget;
+class QListWidgetItem;
+
+class ThumbnailsDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    ThumbnailsDock(QWidget *parent = 0);
+    ~ThumbnailsDock();
+
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private Q_SLOTS:
+    void slotItemActivated(QListWidgetItem *item);
+
+private:
+    QListWidget *m_list;
+};
+
+#endif
diff --git a/qt5/demos/toc.cpp b/qt5/demos/toc.cpp
new file mode 100644
index 00000000..c7fec837
--- /dev/null
+++ b/qt5/demos/toc.cpp
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "toc.h"
+
+#include <poppler-qt5.h>
+
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeWidget>
+
+static void fillToc(const QDomNode &parent, QTreeWidget *tree, QTreeWidgetItem *parentItem)
+{
+    QTreeWidgetItem *newitem = 0;
+    for (QDomNode node = parent.firstChild(); !node.isNull(); node = node.nextSibling()) {
+        QDomElement e = node.toElement();
+
+        if (!parentItem) {
+            newitem = new QTreeWidgetItem(tree, newitem);
+        } else {
+            newitem = new QTreeWidgetItem(parentItem, newitem);
+        }
+        newitem->setText(0, e.tagName());
+
+        bool isOpen = false;
+        if (e.hasAttribute(QString::fromLatin1("Open"))) {
+            isOpen = QVariant(e.attribute(QString::fromLatin1("Open"))).toBool();
+        }
+        if (isOpen) {
+            tree->expandItem(newitem);
+        }
+
+        if (e.hasChildNodes()) {
+            fillToc(node, tree, newitem);
+        }
+    }
+}
+
+
+TocDock::TocDock(QWidget *parent)
+    : AbstractInfoDock(parent)
+{
+    m_tree = new QTreeWidget(this);
+    setWidget(m_tree);
+    m_tree->setAlternatingRowColors(true);
+    m_tree->header()->hide();
+    setWindowTitle(tr("TOC"));
+    m_tree->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel);
+}
+
+TocDock::~TocDock()
+{
+}
+
+void TocDock::fillInfo()
+{
+    const QDomDocument *toc = document()->toc();
+    if (toc) {
+        fillToc(*toc, m_tree, 0);
+    } else {
+        QTreeWidgetItem *item = new QTreeWidgetItem();
+        item->setText(0, tr("No TOC"));
+        item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+        m_tree->addTopLevelItem(item);
+    }
+}
+
+void TocDock::documentClosed()
+{
+    m_tree->clear();
+    AbstractInfoDock::documentClosed();
+}
+
+#include "toc.moc"
diff --git a/qt5/demos/toc.h b/qt5/demos/toc.h
new file mode 100644
index 00000000..bbc90827
--- /dev/null
+++ b/qt5/demos/toc.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TOC_H
+#define TOC_H
+
+#include "abstractinfodock.h"
+
+class QTreeWidget;
+
+class TocDock : public AbstractInfoDock
+{
+    Q_OBJECT
+
+public:
+    TocDock(QWidget *parent = 0);
+    ~TocDock();
+
+    /*virtual*/ void documentClosed();
+
+protected:
+    /*virtual*/ void fillInfo();
+
+private:
+    QTreeWidget *m_tree;
+};
+
+#endif
diff --git a/qt5/demos/viewer.cpp b/qt5/demos/viewer.cpp
new file mode 100644
index 00000000..a95d7f33
--- /dev/null
+++ b/qt5/demos/viewer.cpp
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2008-2009, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2009, Shawn Rutledge <shawn.t.rutledge@gmail.com>
+ * Copyright (C) 2013, Fabio D'Urso <fabiodurso@hotmail.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "viewer.h"
+
+#include "embeddedfiles.h"
+#include "fonts.h"
+#include "info.h"
+#include "metadata.h"
+#include "navigationtoolbar.h"
+#include "optcontent.h"
+#include "pageview.h"
+#include "permissions.h"
+#include "thumbnails.h"
+#include "toc.h"
+
+#include <poppler-qt5.h>
+
+#include <QtCore/QDir>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMessageBox>
+
+PdfViewer::PdfViewer()
+    : QMainWindow(), m_currentPage(0), m_doc(0)
+{
+    setWindowTitle(tr("Poppler-Qt5 Demo"));
+
+    // setup the menus
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    m_fileOpenAct = fileMenu->addAction(tr("&Open"), this, SLOT(slotOpenFile()));
+    m_fileOpenAct->setShortcut(Qt::CTRL + Qt::Key_O);
+    fileMenu->addSeparator();
+    m_fileSaveCopyAct = fileMenu->addAction(tr("&Save a Copy..."), this, SLOT(slotSaveCopy()));
+    m_fileSaveCopyAct->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_S);
+    m_fileSaveCopyAct->setEnabled(false);
+    fileMenu->addSeparator();
+    QAction *act = fileMenu->addAction(tr("&Quit"), qApp, SLOT(closeAllWindows()));
+    act->setShortcut(Qt::CTRL + Qt::Key_Q);
+
+    QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
+
+    QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings"));
+    m_settingsTextAAAct = settingsMenu->addAction(tr("Text Antialias"));
+    m_settingsTextAAAct->setCheckable(true);
+    connect(m_settingsTextAAAct, SIGNAL(toggled(bool)), this, SLOT(slotToggleTextAA(bool)));
+    m_settingsGfxAAAct = settingsMenu->addAction(tr("Graphics Antialias"));
+    m_settingsGfxAAAct->setCheckable(true);
+    connect(m_settingsGfxAAAct, SIGNAL(toggled(bool)), this, SLOT(slotToggleGfxAA(bool)));
+    QMenu *settingsRenderMenu = settingsMenu->addMenu(tr("Render Backend"));
+    m_settingsRenderBackendGrp = new QActionGroup(settingsRenderMenu);
+    m_settingsRenderBackendGrp->setExclusive(true);
+    act = settingsRenderMenu->addAction(tr("Splash"));
+    act->setCheckable(true);
+    act->setChecked(true);
+    act->setData(qVariantFromValue(0));
+    m_settingsRenderBackendGrp->addAction(act);
+    act = settingsRenderMenu->addAction(tr("Arthur"));
+    act->setCheckable(true);
+    act->setData(qVariantFromValue(1));
+    m_settingsRenderBackendGrp->addAction(act);
+    connect(m_settingsRenderBackendGrp, SIGNAL(triggered(QAction*)),
+            this, SLOT(slotRenderBackend(QAction*)));
+
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    act = helpMenu->addAction(tr("&About"), this, SLOT(slotAbout()));
+    act = helpMenu->addAction(tr("About &Qt"), this, SLOT(slotAboutQt()));
+
+    NavigationToolBar *navbar = new NavigationToolBar(this);
+    addToolBar(navbar);
+    m_observers.append(navbar);
+
+    PageView *view = new PageView(this);
+    setCentralWidget(view);
+    m_observers.append(view);
+
+    InfoDock *infoDock = new InfoDock(this);
+    addDockWidget(Qt::LeftDockWidgetArea, infoDock);
+    infoDock->hide();
+    viewMenu->addAction(infoDock->toggleViewAction());
+    m_observers.append(infoDock);
+
+    TocDock *tocDock = new TocDock(this);
+    addDockWidget(Qt::LeftDockWidgetArea, tocDock);
+    tocDock->hide();
+    viewMenu->addAction(tocDock->toggleViewAction());
+    m_observers.append(tocDock);
+
+    FontsDock *fontsDock = new FontsDock(this);
+    addDockWidget(Qt::LeftDockWidgetArea, fontsDock);
+    fontsDock->hide();
+    viewMenu->addAction(fontsDock->toggleViewAction());
+    m_observers.append(fontsDock);
+
+    PermissionsDock *permissionsDock = new PermissionsDock(this);
+    addDockWidget(Qt::LeftDockWidgetArea, permissionsDock);
+    permissionsDock->hide();
+    viewMenu->addAction(permissionsDock->toggleViewAction());
+    m_observers.append(permissionsDock);
+
+    ThumbnailsDock *thumbnailsDock = new ThumbnailsDock(this);
+    addDockWidget(Qt::LeftDockWidgetArea, thumbnailsDock);
+    thumbnailsDock->hide();
+    viewMenu->addAction(thumbnailsDock->toggleViewAction());
+    m_observers.append(thumbnailsDock);
+
+    EmbeddedFilesDock *embfilesDock = new EmbeddedFilesDock(this);
+    addDockWidget(Qt::BottomDockWidgetArea, embfilesDock);
+    embfilesDock->hide();
+    viewMenu->addAction(embfilesDock->toggleViewAction());
+    m_observers.append(embfilesDock);
+
+    MetadataDock *metadataDock = new MetadataDock(this);
+    addDockWidget(Qt::BottomDockWidgetArea, metadataDock);
+    metadataDock->hide();
+    viewMenu->addAction(metadataDock->toggleViewAction());
+    m_observers.append(metadataDock);
+
+    OptContentDock *optContentDock = new OptContentDock(this);
+    addDockWidget(Qt::LeftDockWidgetArea, optContentDock);
+    optContentDock->hide();
+    viewMenu->addAction(optContentDock->toggleViewAction());
+    m_observers.append(optContentDock);
+
+    Q_FOREACH(DocumentObserver *obs, m_observers) {
+        obs->m_viewer = this;
+    }
+
+    connect(navbar, SIGNAL(zoomChanged(qreal)), view, SLOT(slotZoomChanged(qreal)));
+    connect(navbar, SIGNAL(rotationChanged(int)), view, SLOT(slotRotationChanged(int)));
+
+    // activate AA by default
+    m_settingsTextAAAct->setChecked(true);
+    m_settingsGfxAAAct->setChecked(true);
+}
+
+PdfViewer::~PdfViewer()
+{
+    closeDocument();
+}
+
+QSize PdfViewer::sizeHint() const
+{
+    return QSize(500, 600);
+}
+
+void PdfViewer::loadDocument(const QString &file)
+{
+    Poppler::Document *newdoc = Poppler::Document::load(file);
+    if (!newdoc) {
+        QMessageBox msgbox(QMessageBox::Critical, tr("Open Error"), tr("Cannot open:\n") + file,
+                           QMessageBox::Ok, this);
+        msgbox.exec();
+        return;
+    }
+
+    while (newdoc->isLocked()) {
+        bool ok = true;
+        QString password = QInputDialog::getText(this, tr("Document Password"),
+                                                 tr("Please insert the password of the document:"),
+                                                 QLineEdit::Password, QString(), &ok);
+        if (!ok) {
+            delete newdoc;
+            return;
+        }
+        newdoc->unlock(password.toLatin1(), password.toLatin1());
+    }
+
+    closeDocument();
+
+    m_doc = newdoc;
+
+    m_doc->setRenderHint(Poppler::Document::TextAntialiasing, m_settingsTextAAAct->isChecked());
+    m_doc->setRenderHint(Poppler::Document::Antialiasing, m_settingsGfxAAAct->isChecked());
+    m_doc->setRenderBackend((Poppler::Document::RenderBackend)m_settingsRenderBackendGrp->checkedAction()->data().toInt());
+
+    Q_FOREACH(DocumentObserver *obs, m_observers) {
+        obs->documentLoaded();
+        obs->pageChanged(0);
+    }
+
+    m_fileSaveCopyAct->setEnabled(true);
+}
+
+void PdfViewer::closeDocument()
+{
+    if (!m_doc) {
+        return;
+    }
+
+    Q_FOREACH(DocumentObserver *obs, m_observers) {
+        obs->documentClosed();
+    }
+
+    m_currentPage = 0;
+    delete m_doc;
+    m_doc = 0;
+
+    m_fileSaveCopyAct->setEnabled(false);
+}
+
+void PdfViewer::slotOpenFile()
+{
+    QString fileName = QFileDialog::getOpenFileName(this, tr("Open PDF Document"), QDir::homePath(), tr("PDF Documents (*.pdf)"));
+    if (fileName.isEmpty()) {
+        return;
+    }
+
+    loadDocument(fileName);
+}
+
+void PdfViewer::slotSaveCopy()
+{
+    if (!m_doc) {
+        return;
+    }
+
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save Copy"), QDir::homePath(), tr("PDF Documents (*.pdf)"));
+    if (fileName.isEmpty()) {
+        return;
+    }
+
+    Poppler::PDFConverter *converter = m_doc->pdfConverter();
+    converter->setOutputFileName(fileName);
+    converter->setPDFOptions(converter->pdfOptions() & ~Poppler::PDFConverter::WithChanges);
+    if (!converter->convert()) {
+        QMessageBox msgbox(QMessageBox::Critical, tr("Save Error"), tr("Cannot export to:\n%1").arg(fileName),
+                           QMessageBox::Ok, this);
+    }
+    delete converter;
+}
+
+void PdfViewer::slotAbout()
+{
+    const QString text("This is a demo of the Poppler-Qt5 library.");
+    QMessageBox::about(this, QString::fromLatin1("About Poppler-Qt5 Demo"), text);
+}
+
+void PdfViewer::slotAboutQt()
+{
+    QMessageBox::aboutQt(this);
+}
+
+void PdfViewer::slotToggleTextAA(bool value)
+{
+    if (!m_doc) {
+        return;
+    }
+
+    m_doc->setRenderHint(Poppler::Document::TextAntialiasing, value);
+
+    Q_FOREACH(DocumentObserver *obs, m_observers) {
+        obs->pageChanged(m_currentPage);
+    }
+}
+
+void PdfViewer::slotToggleGfxAA(bool value)
+{
+    if (!m_doc) {
+        return;
+    }
+
+    m_doc->setRenderHint(Poppler::Document::Antialiasing, value);
+
+    Q_FOREACH(DocumentObserver *obs, m_observers) {
+        obs->pageChanged(m_currentPage);
+    }
+}
+
+void PdfViewer::slotRenderBackend(QAction *act)
+{
+    if (!m_doc || !act) {
+        return;
+    }
+
+    m_doc->setRenderBackend((Poppler::Document::RenderBackend)act->data().toInt());
+
+    Q_FOREACH(DocumentObserver *obs, m_observers) {
+        obs->pageChanged(m_currentPage);
+    }
+}
+
+void PdfViewer::setPage(int page)
+{
+    Q_FOREACH(DocumentObserver *obs, m_observers) {
+        obs->pageChanged(page);
+    }
+
+    m_currentPage = page;
+}
+
+int PdfViewer::page() const
+{
+    return m_currentPage;
+}
+
+#include "viewer.moc"
diff --git a/qt5/demos/viewer.h b/qt5/demos/viewer.h
new file mode 100644
index 00000000..e1485b71
--- /dev/null
+++ b/qt5/demos/viewer.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef PDFVIEWER_H
+#define PDFVIEWER_H
+
+#include <QtWidgets/QMainWindow>
+
+class QAction;
+class QActionGroup;
+class QLabel;
+class DocumentObserver;
+namespace Poppler {
+class Document;
+}
+
+class PdfViewer : public QMainWindow
+{
+    Q_OBJECT
+
+    friend class DocumentObserver;
+
+public:
+    PdfViewer();
+    ~PdfViewer();
+
+    /*virtual*/ QSize sizeHint() const;
+
+    void loadDocument(const QString &file);
+    void closeDocument();
+
+private Q_SLOTS:
+    void slotOpenFile();
+    void slotSaveCopy();
+    void slotAbout();
+    void slotAboutQt();
+    void slotToggleTextAA(bool value);
+    void slotToggleGfxAA(bool value);
+    void slotRenderBackend(QAction *act);
+
+private:
+    void setPage(int page);
+    int page() const;
+
+    int m_currentPage;
+
+    QAction *m_fileOpenAct;
+    QAction *m_fileSaveCopyAct;
+    QAction *m_settingsTextAAAct;
+    QAction *m_settingsGfxAAAct;
+    QActionGroup *m_settingsRenderBackendGrp;
+
+    QList<DocumentObserver *> m_observers;
+
+    Poppler::Document *m_doc;
+};
+
+#endif
diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
new file mode 100644
index 00000000..5d57e933
--- /dev/null
+++ b/qt5/src/ArthurOutputDev.cc
@@ -0,0 +1,816 @@
+//========================================================================
+//
+// ArthurOutputDev.cc
+//
+// Copyright 2003 Glyph & Cog, LLC
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
+// Copyright (C) 2005-2009, 2011, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org>
+// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
+// Copyright (C) 2010 Matthias Fauconneau <matthias.fauconneau@gmail.com>
+// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+//
+// 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
+//
+//========================================================================
+
+#include <config.h>
+
+#ifdef USE_GCC_PRAGMAS
+#pragma implementation
+#endif
+
+#include <string.h>
+#include <math.h>
+
+#include "goo/gfile.h"
+#include "GlobalParams.h"
+#include "Error.h"
+#include "Object.h"
+#include "GfxState.h"
+#include "GfxFont.h"
+#include "Link.h"
+#include "FontEncodingTables.h"
+#include <fofi/FoFiTrueType.h>
+#include "ArthurOutputDev.h"
+
+#include <QtCore/QtDebug>
+#include <QtGui/QPainterPath>
+//------------------------------------------------------------------------
+
+#ifdef HAVE_SPLASH
+#include "splash/SplashFontFileID.h"
+#include "splash/SplashFontFile.h"
+#include "splash/SplashFontEngine.h"
+#include "splash/SplashFont.h"
+#include "splash/SplashMath.h"
+#include "splash/SplashPath.h"
+#include "splash/SplashGlyphBitmap.h"
+//------------------------------------------------------------------------
+// SplashOutFontFileID
+//------------------------------------------------------------------------
+
+class SplashOutFontFileID: public SplashFontFileID {
+public:
+
+  SplashOutFontFileID(Ref *rA) { r = *rA; }
+
+  ~SplashOutFontFileID() {}
+
+  GBool matches(SplashFontFileID *id) {
+    return ((SplashOutFontFileID *)id)->r.num == r.num &&
+           ((SplashOutFontFileID *)id)->r.gen == r.gen;
+  }
+
+private:
+
+  Ref r;
+};
+
+#endif
+
+//------------------------------------------------------------------------
+// ArthurOutputDev
+//------------------------------------------------------------------------
+
+ArthurOutputDev::ArthurOutputDev(QPainter *painter):
+  m_painter(painter),
+  m_fontHinting(NoHinting)
+{
+  m_currentBrush = QBrush(Qt::SolidPattern);
+  m_fontEngine = 0;
+  m_font = 0;
+}
+
+ArthurOutputDev::~ArthurOutputDev()
+{
+#ifdef HAVE_SPLASH
+  delete m_fontEngine;
+#endif
+}
+
+void ArthurOutputDev::startDoc(XRef *xrefA) {
+  xref = xrefA;
+#ifdef HAVE_SPLASH
+  delete m_fontEngine;
+
+  const bool isHintingEnabled = m_fontHinting != NoHinting;
+  const bool isSlightHinting = m_fontHinting == SlightHinting;
+
+  m_fontEngine = new SplashFontEngine(
+#if HAVE_T1LIB_H
+  globalParams->getEnableT1lib(),
+#endif
+#if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
+  globalParams->getEnableFreeType(),
+  isHintingEnabled,
+  isSlightHinting,
+#endif
+  m_painter->testRenderHint(QPainter::TextAntialiasing));
+#endif
+}
+
+void ArthurOutputDev::startPage(int pageNum, GfxState *state, XRef *xref)
+{
+  // fill page with white background.
+  int w = static_cast<int>(state->getPageWidth());
+  int h = static_cast<int>(state->getPageHeight());
+  QColor fillColour(Qt::white);
+  QBrush fill(fillColour);
+  m_painter->save();
+  m_painter->setPen(fillColour);
+  m_painter->setBrush(fill);
+  m_painter->drawRect(0, 0, w, h);
+  m_painter->restore();
+}
+
+void ArthurOutputDev::endPage() {
+}
+
+void ArthurOutputDev::saveState(GfxState *state)
+{
+  m_painter->save();
+}
+
+void ArthurOutputDev::restoreState(GfxState *state)
+{
+  m_painter->restore();
+}
+
+void ArthurOutputDev::updateAll(GfxState *state)
+{
+  OutputDev::updateAll(state);
+  m_needFontUpdate = gTrue;
+}
+
+// This looks wrong - why aren't adjusting the matrix?
+void ArthurOutputDev::updateCTM(GfxState *state, double m11, double m12,
+				double m21, double m22,
+				double m31, double m32)
+{
+  updateLineDash(state);
+  updateLineJoin(state);
+  updateLineCap(state);
+  updateLineWidth(state);
+}
+
+void ArthurOutputDev::updateLineDash(GfxState *state)
+{
+  double *dashPattern;
+  int dashLength;
+  double dashStart;
+  state->getLineDash(&dashPattern, &dashLength, &dashStart);
+  QVector<qreal> pattern(dashLength);
+  for (int i = 0; i < dashLength; ++i) {
+    pattern[i] = dashPattern[i];
+  }
+  m_currentPen.setDashPattern(pattern);
+  m_currentPen.setDashOffset(dashStart);
+  m_painter->setPen(m_currentPen);
+}
+
+void ArthurOutputDev::updateFlatness(GfxState *state)
+{
+  // qDebug() << "updateFlatness";
+}
+
+void ArthurOutputDev::updateLineJoin(GfxState *state)
+{
+  switch (state->getLineJoin()) {
+  case 0:
+    m_currentPen.setJoinStyle(Qt::MiterJoin);
+    break;
+  case 1:
+    m_currentPen.setJoinStyle(Qt::RoundJoin);
+    break;
+  case 2:
+    m_currentPen.setJoinStyle(Qt::BevelJoin);
+    break;
+  }
+  m_painter->setPen(m_currentPen);
+}
+
+void ArthurOutputDev::updateLineCap(GfxState *state)
+{
+  switch (state->getLineCap()) {
+  case 0:
+    m_currentPen.setCapStyle(Qt::FlatCap);
+    break;
+  case 1:
+    m_currentPen.setCapStyle(Qt::RoundCap);
+    break;
+  case 2:
+    m_currentPen.setCapStyle(Qt::SquareCap);
+    break;
+  }
+  m_painter->setPen(m_currentPen);
+}
+
+void ArthurOutputDev::updateMiterLimit(GfxState *state)
+{
+  m_currentPen.setMiterLimit(state->getMiterLimit());
+  m_painter->setPen(m_currentPen);
+}
+
+void ArthurOutputDev::updateLineWidth(GfxState *state)
+{
+  m_currentPen.setWidthF(state->getLineWidth());
+  m_painter->setPen(m_currentPen);
+}
+
+void ArthurOutputDev::updateFillColor(GfxState *state)
+{
+  GfxRGB rgb;
+  QColor brushColour = m_currentBrush.color();
+  state->getFillRGB(&rgb);
+  brushColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), brushColour.alphaF());
+  m_currentBrush.setColor(brushColour);
+}
+
+void ArthurOutputDev::updateStrokeColor(GfxState *state)
+{
+  GfxRGB rgb;
+  QColor penColour = m_currentPen.color();
+  state->getStrokeRGB(&rgb);
+  penColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), penColour.alphaF());
+  m_currentPen.setColor(penColour);
+  m_painter->setPen(m_currentPen);
+}
+
+void ArthurOutputDev::updateFillOpacity(GfxState *state)
+{
+  QColor brushColour= m_currentBrush.color();
+  brushColour.setAlphaF(state->getFillOpacity());
+  m_currentBrush.setColor(brushColour);
+}
+
+void ArthurOutputDev::updateStrokeOpacity(GfxState *state)
+{
+  QColor penColour= m_currentPen.color();
+  penColour.setAlphaF(state->getStrokeOpacity());
+  m_currentPen.setColor(penColour);
+  m_painter->setPen(m_currentPen);
+}
+
+void ArthurOutputDev::updateFont(GfxState *state)
+{
+#ifdef HAVE_SPLASH
+  GfxFont *gfxFont;
+  GfxFontLoc *fontLoc;
+  GfxFontType fontType;
+  SplashOutFontFileID *id;
+  SplashFontFile *fontFile;
+  SplashFontSrc *fontsrc = NULL;
+  FoFiTrueType *ff;
+  Object refObj, strObj;
+  GooString *fileName;
+  char *tmpBuf;
+  int tmpBufLen;
+  int *codeToGID;
+  double *textMat;
+  double m11, m12, m21, m22, fontSize;
+  SplashCoord mat[4];
+  int n;
+  int faceIndex = 0;
+  SplashCoord matrix[6];
+
+  m_needFontUpdate = false;
+  m_font = NULL;
+  fileName = NULL;
+  tmpBuf = NULL;
+  fontLoc = NULL;
+
+  if (!(gfxFont = state->getFont())) {
+    goto err1;
+  }
+  fontType = gfxFont->getType();
+  if (fontType == fontType3) {
+    goto err1;
+  }
+
+  // check the font file cache
+  id = new SplashOutFontFileID(gfxFont->getID());
+  if ((fontFile = m_fontEngine->getFontFile(id))) {
+    delete id;
+
+  } else {
+
+    if (!(fontLoc = gfxFont->locateFont(xref, gFalse))) {
+      error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
+	    gfxFont->getName() ? gfxFont->getName()->getCString()
+	                       : "(unnamed)");
+      goto err2;
+    }
+
+    // embedded font
+    if (fontLoc->locType == gfxFontLocEmbedded) {
+      // if there is an embedded font, read it to memory
+      tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
+      if (! tmpBuf)
+	goto err2;
+
+    // external font
+    } else { // gfxFontLocExternal
+      fileName = fontLoc->path;
+      fontType = fontLoc->fontType;
+    }
+
+    fontsrc = new SplashFontSrc;
+    if (fileName)
+      fontsrc->setFile(fileName, gFalse);
+    else
+      fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
+    
+    // load the font file
+    switch (fontType) {
+    case fontType1:
+      if (!(fontFile = m_fontEngine->loadType1Font(
+			   id,
+			   fontsrc,
+			   (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) {
+	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+	      gfxFont->getName() ? gfxFont->getName()->getCString()
+	                         : "(unnamed)");
+	goto err2;
+      }
+      break;
+    case fontType1C:
+      if (!(fontFile = m_fontEngine->loadType1CFont(
+			   id,
+			   fontsrc,
+			   (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) {
+	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+	      gfxFont->getName() ? gfxFont->getName()->getCString()
+	                         : "(unnamed)");
+	goto err2;
+      }
+      break;
+    case fontType1COT:
+      if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(
+			   id,
+			   fontsrc,
+			   (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) {
+	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+	      gfxFont->getName() ? gfxFont->getName()->getCString()
+	                         : "(unnamed)");
+	goto err2;
+      }
+      break;
+    case fontTrueType:
+    case fontTrueTypeOT:
+	if (fileName)
+	 ff = FoFiTrueType::load(fileName->getCString());
+	else
+	ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+      if (ff) {
+	codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
+	n = 256;
+	delete ff;
+      } else {
+	codeToGID = NULL;
+	n = 0;
+      }
+      if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+			   id,
+			   fontsrc,
+			   codeToGID, n))) {
+	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+	      gfxFont->getName() ? gfxFont->getName()->getCString()
+	                         : "(unnamed)");
+	goto err2;
+      }
+      break;
+    case fontCIDType0:
+    case fontCIDType0C:
+      if (!(fontFile = m_fontEngine->loadCIDFont(
+			   id,
+			   fontsrc))) {
+	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+	      gfxFont->getName() ? gfxFont->getName()->getCString()
+	                         : "(unnamed)");
+	goto err2;
+      }
+      break;
+    case fontCIDType0COT:
+      if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
+	n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
+	codeToGID = (int *)gmallocn(n, sizeof(int));
+	memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
+	       n * sizeof(int));
+      } else {
+	codeToGID = NULL;
+	n = 0;
+      }      
+      if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
+			   id,
+			   fontsrc,
+			   codeToGID, n))) {
+	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+	      gfxFont->getName() ? gfxFont->getName()->getCString()
+	                         : "(unnamed)");
+	goto err2;
+      }
+      break;
+    case fontCIDType2:
+    case fontCIDType2OT:
+      codeToGID = NULL;
+      n = 0;
+      if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
+	n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
+	if (n) {
+	  codeToGID = (int *)gmallocn(n, sizeof(int));
+	  memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
+		  n * sizeof(Gushort));
+	}
+      } else {
+	if (fileName)
+	  ff = FoFiTrueType::load(fileName->getCString());
+	else
+	  ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+	if (! ff)
+	  goto err2;
+	codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
+	delete ff;
+      }
+      if (!(fontFile = m_fontEngine->loadTrueTypeFont(
+			   id,
+			   fontsrc,
+			   codeToGID, n, faceIndex))) {
+	error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
+	      gfxFont->getName() ? gfxFont->getName()->getCString()
+	                         : "(unnamed)");
+	goto err2;
+      }
+      break;
+    default:
+      // this shouldn't happen
+      goto err2;
+    }
+  }
+
+  // get the font matrix
+  textMat = state->getTextMat();
+  fontSize = state->getFontSize();
+  m11 = textMat[0] * fontSize * state->getHorizScaling();
+  m12 = textMat[1] * fontSize * state->getHorizScaling();
+  m21 = textMat[2] * fontSize;
+  m22 = textMat[3] * fontSize;
+
+  {
+  QMatrix painterMatrix = m_painter->worldMatrix();
+  matrix[0] = painterMatrix.m11();
+  matrix[1] = painterMatrix.m12();
+  matrix[2] = painterMatrix.m21();
+  matrix[3] = painterMatrix.m22();
+  matrix[4] = painterMatrix.dx();
+  matrix[5] = painterMatrix.dy();
+  }
+
+  // create the scaled font
+  mat[0] = m11;  mat[1] = -m12;
+  mat[2] = m21;  mat[3] = -m22;
+  m_font = m_fontEngine->getFont(fontFile, mat, matrix);
+
+  delete fontLoc;
+  if (fontsrc && !fontsrc->isFile)
+      fontsrc->unref();
+  return;
+
+ err2:
+  delete id;
+  delete fontLoc;
+ err1:
+  if (fontsrc && !fontsrc->isFile)
+      fontsrc->unref();
+  return;
+#endif
+}
+
+static QPainterPath convertPath(GfxState *state, GfxPath *path, Qt::FillRule fillRule)
+{
+  GfxSubpath *subpath;
+  double x1, y1, x2, y2, x3, y3;
+  int i, j;
+
+  QPainterPath qPath;
+  qPath.setFillRule(fillRule);
+  for (i = 0; i < path->getNumSubpaths(); ++i) {
+    subpath = path->getSubpath(i);
+    if (subpath->getNumPoints() > 0) {
+      state->transform(subpath->getX(0), subpath->getY(0), &x1, &y1);
+      qPath.moveTo(x1, y1);
+      j = 1;
+      while (j < subpath->getNumPoints()) {
+	if (subpath->getCurve(j)) {
+	  state->transform(subpath->getX(j), subpath->getY(j), &x1, &y1);
+	  state->transform(subpath->getX(j+1), subpath->getY(j+1), &x2, &y2);
+	  state->transform(subpath->getX(j+2), subpath->getY(j+2), &x3, &y3);
+	  qPath.cubicTo( x1, y1, x2, y2, x3, y3);
+	  j += 3;
+	} else {
+	  state->transform(subpath->getX(j), subpath->getY(j), &x1, &y1);
+	  qPath.lineTo(x1, y1);
+	  ++j;
+	}
+      }
+      if (subpath->isClosed()) {
+	qPath.closeSubpath();
+      }
+    }
+  }
+  return qPath;
+}
+
+void ArthurOutputDev::stroke(GfxState *state)
+{
+  m_painter->strokePath( convertPath( state, state->getPath(), Qt::OddEvenFill ), m_currentPen );
+}
+
+void ArthurOutputDev::fill(GfxState *state)
+{
+  m_painter->fillPath( convertPath( state, state->getPath(), Qt::WindingFill ), m_currentBrush );
+}
+
+void ArthurOutputDev::eoFill(GfxState *state)
+{
+  m_painter->fillPath( convertPath( state, state->getPath(), Qt::OddEvenFill ), m_currentBrush );
+}
+
+void ArthurOutputDev::clip(GfxState *state)
+{
+  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::WindingFill ) );
+}
+
+void ArthurOutputDev::eoClip(GfxState *state)
+{
+  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::OddEvenFill ) );
+}
+
+void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
+			       double dx, double dy,
+			       double originX, double originY,
+			       CharCode code, int nBytes, Unicode *u, int uLen) {
+#ifdef HAVE_SPLASH
+  double x1, y1;
+  double x2, y2;
+//   SplashPath *path;
+  int render;
+
+  if (m_needFontUpdate) {
+    updateFont(state);
+  }
+  if (!m_font) {
+    return;
+  }
+
+  // check for invisible text -- this is used by Acrobat Capture
+  render = state->getRender();
+  if (render == 3) {
+    return;
+  }
+
+  x -= originX;
+  y -= originY;
+
+  // fill
+  if (!(render & 1)) {
+    SplashPath * fontPath;
+    fontPath = m_font->getGlyphPath(code);
+    if (fontPath) {
+      QPainterPath qPath;
+      qPath.setFillRule(Qt::WindingFill);
+      for (int i = 0; i < fontPath->length; ++i) {
+        if (fontPath->flags[i] & splashPathFirst) {
+            state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
+            qPath.moveTo(x1,y1);
+        } else if (fontPath->flags[i] & splashPathCurve) {
+            state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
+            state->transform(fontPath->pts[i+1].x+x, -fontPath->pts[i+1].y+y, &x2, &y2);
+            qPath.quadTo(x1,y1,x2,y2);
+            ++i;
+        }
+        // FIXME fix this
+        // 	else if (fontPath->flags[i] & splashPathArcCW) {
+        // 	  qDebug() << "Need to implement arc";
+        // 	}
+        else {
+            state->transform(fontPath->pts[i].x+x, -fontPath->pts[i].y+y, &x1, &y1);
+            qPath.lineTo(x1,y1);
+        }
+        if (fontPath->flags[i] & splashPathLast) {
+            qPath.closeSubpath();
+        }
+      }
+      GfxRGB rgb;
+      QColor brushColour = m_currentBrush.color();
+      state->getFillRGB(&rgb);
+      brushColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), state->getFillOpacity());
+      m_painter->setBrush(brushColour);
+      QColor penColour = m_currentPen.color();
+      state->getStrokeRGB(&rgb);
+      penColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), state->getStrokeOpacity());
+      m_painter->setPen(penColour);
+      m_painter->drawPath( qPath );
+      delete fontPath;
+    }
+  }
+
+  // stroke
+  if ((render & 3) == 1 || (render & 3) == 2) {
+    qDebug() << "no stroke";
+    /*
+    if ((path = m_font->getGlyphPath(code))) {
+      path->offset((SplashCoord)x1, (SplashCoord)y1);
+      splash->stroke(path);
+      delete path;
+    }
+    */
+  }
+
+  // clip
+  if (render & 4) {
+    qDebug() << "no clip";
+    /*
+    path = m_font->getGlyphPath(code);
+    path->offset((SplashCoord)x1, (SplashCoord)y1);
+    if (textClipPath) {
+      textClipPath->append(path);
+      delete path;
+    } else {
+      textClipPath = path;
+    }
+    */
+  }
+#endif
+}
+
+GBool ArthurOutputDev::beginType3Char(GfxState *state, double x, double y,
+				      double dx, double dy,
+				      CharCode code, Unicode *u, int uLen)
+{
+  return gFalse;
+}
+
+void ArthurOutputDev::endType3Char(GfxState *state)
+{
+}
+
+void ArthurOutputDev::type3D0(GfxState *state, double wx, double wy)
+{
+}
+
+void ArthurOutputDev::type3D1(GfxState *state, double wx, double wy,
+			      double llx, double lly, double urx, double ury)
+{
+}
+
+void ArthurOutputDev::endTextObject(GfxState *state)
+{
+}
+
+
+void ArthurOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
+				    int width, int height, GBool invert,
+				    GBool interpolate, GBool inlineImg)
+{
+  qDebug() << "drawImageMask";
+#if 0
+  unsigned char *buffer;
+  unsigned char *dest;
+  cairo_surface_t *image;
+  cairo_pattern_t *pattern;
+  int x, y;
+  ImageStream *imgStr;
+  Guchar *pix;
+  double *ctm;
+  cairo_matrix_t matrix;
+  int invert_bit;
+  int row_stride;
+
+  row_stride = (width + 3) & ~3;
+  buffer = (unsigned char *) malloc (height * row_stride);
+  if (buffer == NULL) {
+    error(-1, "Unable to allocate memory for image.");
+    return;
+  }
+
+  /* TODO: Do we want to cache these? */
+  imgStr = new ImageStream(str, width, 1, 1);
+  imgStr->reset();
+
+  invert_bit = invert ? 1 : 0;
+
+  for (y = 0; y < height; y++) {
+    pix = imgStr->getLine();
+    dest = buffer + y * row_stride;
+    for (x = 0; x < width; x++) {
+
+      if (pix[x] ^ invert_bit)
+	*dest++ = 0;
+      else
+	*dest++ = 255;
+    }
+  }
+
+  image = cairo_image_surface_create_for_data (buffer, CAIRO_FORMAT_A8,
+					  width, height, row_stride);
+  if (image == NULL)
+    return;
+  pattern = cairo_pattern_create_for_surface (image);
+  if (pattern == NULL)
+    return;
+
+  ctm = state->getCTM();
+  LOG (printf ("drawImageMask %dx%d, matrix: %f, %f, %f, %f, %f, %f\n",
+	       width, height, ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]));
+  matrix.xx = ctm[0] / width;
+  matrix.xy = -ctm[2] / height;
+  matrix.yx = ctm[1] / width;
+  matrix.yy = -ctm[3] / height;
+  matrix.x0 = ctm[2] + ctm[4];
+  matrix.y0 = ctm[3] + ctm[5];
+  cairo_matrix_invert (&matrix);
+  cairo_pattern_set_matrix (pattern, &matrix);
+
+  cairo_pattern_set_filter (pattern, CAIRO_FILTER_BEST);
+  /* FIXME: Doesn't the image mask support any colorspace? */
+  cairo_set_source_rgb (cairo, fill_color.r, fill_color.g, fill_color.b);
+  cairo_mask (cairo, pattern);
+
+  cairo_pattern_destroy (pattern);
+  cairo_surface_destroy (image);
+  free (buffer);
+  imgStr->close ();
+  delete imgStr;
+#endif
+}
+
+//TODO: lots more work here.
+void ArthurOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+				int width, int height,
+				GfxImageColorMap *colorMap,
+				GBool interpolate, int *maskColors, GBool inlineImg)
+{
+  unsigned int *data;
+  unsigned int *line;
+  int x, y;
+  ImageStream *imgStr;
+  Guchar *pix;
+  int i;
+  double *ctm;
+  QMatrix matrix;
+  QImage image;
+  int stride;
+  
+  /* TODO: Do we want to cache these? */
+  imgStr = new ImageStream(str, width,
+			   colorMap->getNumPixelComps(),
+			   colorMap->getBits());
+  imgStr->reset();
+  
+  image = QImage(width, height, QImage::Format_ARGB32);
+  data = (unsigned int *)image.bits();
+  stride = image.bytesPerLine()/4;
+  for (y = 0; y < height; y++) {
+    pix = imgStr->getLine();
+    line = data+y*stride;
+    colorMap->getRGBLine(pix, line, width);
+
+    if (maskColors) {
+      for (x = 0; x < width; x++) {
+        for (i = 0; i < colorMap->getNumPixelComps(); ++i) {
+            if (pix[i] < maskColors[2*i] * 255||
+                pix[i] > maskColors[2*i+1] * 255) {
+                *line = *line | 0xff000000;
+                break;
+            }
+        }
+        pix += colorMap->getNumPixelComps();
+        line++;
+      }
+    } else {
+      for (x = 0; x < width; x++) { *line = *line | 0xff000000; line++; }
+    }
+  }
+
+  ctm = state->getCTM();
+  matrix.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
+
+  m_painter->setMatrix(matrix, true);
+  m_painter->drawImage( QPoint(0,0), image );
+  delete imgStr;
+
+}
diff --git a/qt5/src/ArthurOutputDev.h b/qt5/src/ArthurOutputDev.h
new file mode 100644
index 00000000..9d5e8679
--- /dev/null
+++ b/qt5/src/ArthurOutputDev.h
@@ -0,0 +1,170 @@
+//========================================================================
+//
+// ArthurOutputDev.h
+//
+// Copyright 2003 Glyph & Cog, LLC
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
+// Copyright (C) 2005 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2010 Pino Toscano <pino@kde.org>
+// Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+//
+// 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
+//
+//========================================================================
+
+#ifndef ARTHUROUTPUTDEV_H
+#define ARTHUROUTPUTDEV_H
+
+#ifdef USE_GCC_PRAGMAS
+#pragma interface
+#endif
+
+#include "goo/gtypes.h"
+#include "OutputDev.h"
+#include "GfxState.h"
+
+#include <QtGui/QPainter>
+
+class GfxState;
+class GfxPath;
+class Gfx8BitFont;
+struct GfxRGB;
+
+class SplashFont;
+class SplashFontEngine;
+struct SplashGlyphBitmap;
+
+//------------------------------------------------------------------------
+// ArthurOutputDev - Qt 4 QPainter renderer
+//------------------------------------------------------------------------
+
+class ArthurOutputDev: public OutputDev {
+public:
+  /**
+   * Describes how fonts are distorted (aka hinted) to fit the pixel grid.
+   * More hinting means sharper edges and less adherence to the true letter shapes.
+   */
+  enum FontHinting {
+    NoHinting = 0, ///< Font shapes are left unchanged
+    SlightHinting, ///< Font shapes are distorted vertically only
+    FullHinting ///< Font shapes are distorted horizontally and vertically
+  };
+
+  // Constructor.
+  ArthurOutputDev(QPainter *painter );
+
+  // Destructor.
+  virtual ~ArthurOutputDev();
+
+  void setFontHinting(FontHinting hinting) { m_fontHinting = hinting; }
+
+  //----- get info about output device
+
+  // Does this device use upside-down coordinates?
+  // (Upside-down means (0,0) is the top left corner of the page.)
+  virtual GBool upsideDown() { return gTrue; }
+
+  // Does this device use drawChar() or drawString()?
+  virtual GBool useDrawChar() { return gTrue; }
+
+  // Does this device use beginType3Char/endType3Char?  Otherwise,
+  // text in Type 3 fonts will be drawn with drawChar/drawString.
+  virtual GBool interpretType3Chars() { return gTrue; }
+
+  //----- initialization and control
+
+  // Start a page.
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
+
+  // End a page.
+  virtual void endPage();
+
+  //----- save/restore graphics state
+  virtual void saveState(GfxState *state);
+  virtual void restoreState(GfxState *state);
+
+  //----- update graphics state
+  virtual void updateAll(GfxState *state);
+  virtual void updateCTM(GfxState *state, double m11, double m12,
+			 double m21, double m22, double m31, double m32);
+  virtual void updateLineDash(GfxState *state);
+  virtual void updateFlatness(GfxState *state);
+  virtual void updateLineJoin(GfxState *state);
+  virtual void updateLineCap(GfxState *state);
+  virtual void updateMiterLimit(GfxState *state);
+  virtual void updateLineWidth(GfxState *state);
+  virtual void updateFillColor(GfxState *state);
+  virtual void updateStrokeColor(GfxState *state);
+  virtual void updateFillOpacity(GfxState *state);
+  virtual void updateStrokeOpacity(GfxState *state);
+
+  //----- update text state
+  virtual void updateFont(GfxState *state);
+
+  //----- path painting
+  virtual void stroke(GfxState *state);
+  virtual void fill(GfxState *state);
+  virtual void eoFill(GfxState *state);
+
+  //----- path clipping
+  virtual void clip(GfxState *state);
+  virtual void eoClip(GfxState *state);
+
+  //----- text drawing
+  //   virtual void drawString(GfxState *state, GooString *s);
+  virtual void drawChar(GfxState *state, double x, double y,
+			double dx, double dy,
+			double originX, double originY,
+			CharCode code, int nBytes, Unicode *u, int uLen);
+  virtual GBool beginType3Char(GfxState *state, double x, double y,
+			       double dx, double dy,
+			       CharCode code, Unicode *u, int uLen);
+  virtual void endType3Char(GfxState *state);
+  virtual void endTextObject(GfxState *state);
+
+  //----- image drawing
+  virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+			     int width, int height, GBool invert,
+			     GBool interpolate, GBool inlineImg);
+  virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+			 int width, int height, GfxImageColorMap *colorMap,
+			 GBool interpolate, int *maskColors, GBool inlineImg);
+
+  //----- Type 3 font operators
+  virtual void type3D0(GfxState *state, double wx, double wy);
+  virtual void type3D1(GfxState *state, double wx, double wy,
+		       double llx, double lly, double urx, double ury);
+
+  //----- special access
+
+  // Called to indicate that a new PDF document has been loaded.
+  void startDoc(XRef *xrefA);
+ 
+  GBool isReverseVideo() { return gFalse; }
+  
+private:
+  QPainter *m_painter;
+  FontHinting m_fontHinting;
+  QFont m_currentFont;
+  QPen m_currentPen;
+  QBrush m_currentBrush;
+  GBool m_needFontUpdate;		// set when the font needs to be updated
+  SplashFontEngine *m_fontEngine;
+  SplashFont *m_font;		// current font
+  XRef *xref;			// xref table for current document
+};
+
+#endif
diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
new file mode 100644
index 00000000..8679ae03
--- /dev/null
+++ b/qt5/src/CMakeLists.txt
@@ -0,0 +1,52 @@
+add_definitions(${QT5_DEFINITIONS})
+add_definitions(${Qt5Core_DEFINITIONS})
+
+set(CMAKE_AUTOMOC ON)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(poppler_qt5_SRCS
+  poppler-annotation.cc
+  poppler-document.cc
+  poppler-embeddedfile.cc
+  poppler-fontinfo.cc
+  poppler-form.cc
+  poppler-link.cc
+  poppler-link-extractor.cc
+  poppler-movie.cc
+  poppler-optcontent.cc
+  poppler-page.cc
+  poppler-base-converter.cc
+  poppler-pdf-converter.cc
+  poppler-private.cc
+  poppler-ps-converter.cc
+  poppler-qiodeviceoutstream.cc
+  poppler-sound.cc
+  poppler-textbox.cc
+  poppler-page-transition.cc
+  poppler-media.cc
+  ArthurOutputDev.cc
+)
+add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
+set_target_properties(poppler-qt5 PROPERTIES VERSION 1.0.0 SOVERSION 1)
+target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
+if(MSVC)
+target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
+endif(MSVC)
+install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
+
+install(FILES
+  poppler-qt5.h
+  poppler-link.h
+  poppler-annotation.h
+  poppler-form.h
+  poppler-optcontent.h
+  poppler-export.h
+  poppler-page-transition.h
+  poppler-media.h
+  DESTINATION include/poppler/qt5)
+
diff --git a/qt5/src/Makefile.am b/qt5/src/Makefile.am
new file mode 100644
index 00000000..e892f04d
--- /dev/null
+++ b/qt5/src/Makefile.am
@@ -0,0 +1,74 @@
+INCLUDES =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler			\
+	$(POPPLER_QT5_CFLAGS)			\
+	$(LCMS_CFLAGS)
+
+SUFFIXES: .moc
+
+poppler_includedir = $(includedir)/poppler/qt5
+
+poppler_include_HEADERS =			\
+	poppler-qt5.h				\
+	poppler-link.h				\
+	poppler-annotation.h			\
+	poppler-form.h				\
+	poppler-optcontent.h			\
+	poppler-export.h			\
+	poppler-media.h				\
+	poppler-page-transition.h
+
+lib_LTLIBRARIES = libpoppler-qt5.la
+
+libpoppler_qt5_la_SOURCES =			\
+	poppler-document.cc			\
+	poppler-page.cc				\
+	poppler-fontinfo.cc			\
+	poppler-embeddedfile.cc			\
+	poppler-textbox.cc			\
+	poppler-link.cc				\
+	poppler-annotation.cc			\
+	poppler-link-extractor.cc		\
+	poppler-optcontent.cc			\
+	poppler-optcontent.h			\
+	poppler-page-transition.cc		\
+	poppler-sound.cc			\
+	poppler-form.cc				\
+	poppler-base-converter.cc		\
+	poppler-ps-converter.cc			\
+	poppler-pdf-converter.cc		\
+	poppler-qiodeviceoutstream.cc		\
+	poppler-private.cc			\
+	poppler-movie.cc			\
+	poppler-media.cc			\
+	poppler-annotation-helper.h		\
+	poppler-page-private.h			\
+	poppler-link-extractor-private.h	\
+	poppler-annotation-private.h		\
+	poppler-converter-private.h		\
+	poppler-qiodeviceoutstream-private.h	\
+	poppler-optcontent-private.h		\
+	poppler-export.h			\
+	poppler-private.h			\
+	poppler-page-transition-private.h	\
+	poppler-embeddedfile-private.h		\
+	ArthurOutputDev.h			\
+	ArthurOutputDev.cc
+
+libpoppler_qt5_la_CXXFLAGS = 			\
+	-Dpoppler_qt5_EXPORTS -fPIC
+
+libpoppler_qt5_la_LIBADD = 			\
+	$(top_builddir)/poppler/libpoppler.la	\
+	$(POPPLER_QT5_LIBS)
+
+libpoppler_qt5_la_LDFLAGS = -version-info 1:0:0 @create_shared_lib@ @auto_import_flags@
+
+# This rule lets GNU make create any *.moc from the equivalent *.h
+.h.moc:
+	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
+
+BUILT_SOURCES = poppler-optcontent.moc
+
+clean-generic:
+	rm -f *.moc
diff --git a/qt5/src/Makefile.in b/qt5/src/Makefile.in
new file mode 100644
index 00000000..58793d50
--- /dev/null
+++ b/qt5/src/Makefile.in
@@ -0,0 +1,1024 @@
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = qt5/src
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(poppler_include_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/poppler/poppler-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" \
+	"$(DESTDIR)$(poppler_includedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libpoppler_qt5_la_DEPENDENCIES =  \
+	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
+am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
+	libpoppler_qt5_la-poppler-page.lo \
+	libpoppler_qt5_la-poppler-fontinfo.lo \
+	libpoppler_qt5_la-poppler-embeddedfile.lo \
+	libpoppler_qt5_la-poppler-textbox.lo \
+	libpoppler_qt5_la-poppler-link.lo \
+	libpoppler_qt5_la-poppler-annotation.lo \
+	libpoppler_qt5_la-poppler-link-extractor.lo \
+	libpoppler_qt5_la-poppler-optcontent.lo \
+	libpoppler_qt5_la-poppler-page-transition.lo \
+	libpoppler_qt5_la-poppler-sound.lo \
+	libpoppler_qt5_la-poppler-form.lo \
+	libpoppler_qt5_la-poppler-base-converter.lo \
+	libpoppler_qt5_la-poppler-ps-converter.lo \
+	libpoppler_qt5_la-poppler-pdf-converter.lo \
+	libpoppler_qt5_la-poppler-qiodeviceoutstream.lo \
+	libpoppler_qt5_la-poppler-private.lo \
+	libpoppler_qt5_la-poppler-movie.lo \
+	libpoppler_qt5_la-poppler-media.lo \
+	libpoppler_qt5_la-ArthurOutputDev.lo
+libpoppler_qt5_la_OBJECTS = $(am_libpoppler_qt5_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libpoppler_qt5_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) \
+	$(libpoppler_qt5_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libpoppler_qt5_la_SOURCES)
+DIST_SOURCES = $(libpoppler_qt5_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(poppler_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_FEATURE = @CAIRO_FEATURE@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_REQ = @CAIRO_REQ@
+CAIRO_VERSION = @CAIRO_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
+GTK_TEST_LIBS = @GTK_TEST_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
+LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBOPENJPEG_CFLAGS = @LIBOPENJPEG_CFLAGS@
+LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTIFF_CFLAGS = @LIBTIFF_CFLAGS@
+LIBTIFF_CFLAGSS = @LIBTIFF_CFLAGSS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PC_REQUIRES = @PC_REQUIRES@
+PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POPPLER_DATADIR = @POPPLER_DATADIR@
+POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
+POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
+POPPLER_GLIB_DISABLE_SINGLE_INCLUDES = @POPPLER_GLIB_DISABLE_SINGLE_INCLUDES@
+POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
+POPPLER_MAJOR_VERSION = @POPPLER_MAJOR_VERSION@
+POPPLER_MICRO_VERSION = @POPPLER_MICRO_VERSION@
+POPPLER_MINOR_VERSION = @POPPLER_MINOR_VERSION@
+POPPLER_QT4_CFLAGS = @POPPLER_QT4_CFLAGS@
+POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
+POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
+POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTDATADIR = @TESTDATADIR@
+VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+create_shared_lib = @create_shared_lib@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+win32_libs = @win32_libs@
+INCLUDES = \
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler			\
+	$(POPPLER_QT5_CFLAGS)			\
+	$(LCMS_CFLAGS)
+
+poppler_includedir = $(includedir)/poppler/qt5
+poppler_include_HEADERS = \
+	poppler-qt5.h				\
+	poppler-link.h				\
+	poppler-annotation.h			\
+	poppler-form.h				\
+	poppler-optcontent.h			\
+	poppler-export.h			\
+	poppler-media.h				\
+	poppler-page-transition.h
+
+lib_LTLIBRARIES = libpoppler-qt5.la
+libpoppler_qt5_la_SOURCES = \
+	poppler-document.cc			\
+	poppler-page.cc				\
+	poppler-fontinfo.cc			\
+	poppler-embeddedfile.cc			\
+	poppler-textbox.cc			\
+	poppler-link.cc				\
+	poppler-annotation.cc			\
+	poppler-link-extractor.cc		\
+	poppler-optcontent.cc			\
+	poppler-optcontent.h			\
+	poppler-page-transition.cc		\
+	poppler-sound.cc			\
+	poppler-form.cc				\
+	poppler-base-converter.cc		\
+	poppler-ps-converter.cc			\
+	poppler-pdf-converter.cc		\
+	poppler-qiodeviceoutstream.cc		\
+	poppler-private.cc			\
+	poppler-movie.cc			\
+	poppler-media.cc			\
+	poppler-annotation-helper.h		\
+	poppler-page-private.h			\
+	poppler-link-extractor-private.h	\
+	poppler-annotation-private.h		\
+	poppler-converter-private.h		\
+	poppler-qiodeviceoutstream-private.h	\
+	poppler-optcontent-private.h		\
+	poppler-export.h			\
+	poppler-private.h			\
+	poppler-page-transition-private.h	\
+	poppler-embeddedfile-private.h		\
+	ArthurOutputDev.h			\
+	ArthurOutputDev.cc
+
+libpoppler_qt5_la_CXXFLAGS = \
+	-Dpoppler_qt5_EXPORTS -fPIC
+
+libpoppler_qt5_la_LIBADD = \
+	$(top_builddir)/poppler/libpoppler.la	\
+	$(POPPLER_QT5_LIBS)
+
+libpoppler_qt5_la_LDFLAGS = -version-info 1:0:0 @create_shared_lib@ @auto_import_flags@
+BUILT_SOURCES = poppler-optcontent.moc
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .cc .h .lo .moc .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qt5/src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign qt5/src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libpoppler-qt5.la: $(libpoppler_qt5_la_OBJECTS) $(libpoppler_qt5_la_DEPENDENCIES) $(EXTRA_libpoppler_qt5_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libpoppler_qt5_la_LINK) -rpath $(libdir) $(libpoppler_qt5_la_OBJECTS) $(libpoppler_qt5_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-ArthurOutputDev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-annotation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-base-converter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-document.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-embeddedfile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-fontinfo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-form.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-link-extractor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-link.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-media.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-movie.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-optcontent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-page-transition.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-page.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-pdf-converter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-private.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-ps-converter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-qiodeviceoutstream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-sound.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpoppler_qt5_la-poppler-textbox.Plo@am__quote@
+
+.cc.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+libpoppler_qt5_la-poppler-document.lo: poppler-document.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-document.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-document.Tpo -c -o libpoppler_qt5_la-poppler-document.lo `test -f 'poppler-document.cc' || echo '$(srcdir)/'`poppler-document.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-document.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-document.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-document.cc' object='libpoppler_qt5_la-poppler-document.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-document.lo `test -f 'poppler-document.cc' || echo '$(srcdir)/'`poppler-document.cc
+
+libpoppler_qt5_la-poppler-page.lo: poppler-page.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-page.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-page.Tpo -c -o libpoppler_qt5_la-poppler-page.lo `test -f 'poppler-page.cc' || echo '$(srcdir)/'`poppler-page.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-page.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-page.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-page.cc' object='libpoppler_qt5_la-poppler-page.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-page.lo `test -f 'poppler-page.cc' || echo '$(srcdir)/'`poppler-page.cc
+
+libpoppler_qt5_la-poppler-fontinfo.lo: poppler-fontinfo.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-fontinfo.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-fontinfo.Tpo -c -o libpoppler_qt5_la-poppler-fontinfo.lo `test -f 'poppler-fontinfo.cc' || echo '$(srcdir)/'`poppler-fontinfo.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-fontinfo.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-fontinfo.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-fontinfo.cc' object='libpoppler_qt5_la-poppler-fontinfo.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-fontinfo.lo `test -f 'poppler-fontinfo.cc' || echo '$(srcdir)/'`poppler-fontinfo.cc
+
+libpoppler_qt5_la-poppler-embeddedfile.lo: poppler-embeddedfile.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-embeddedfile.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-embeddedfile.Tpo -c -o libpoppler_qt5_la-poppler-embeddedfile.lo `test -f 'poppler-embeddedfile.cc' || echo '$(srcdir)/'`poppler-embeddedfile.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-embeddedfile.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-embeddedfile.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-embeddedfile.cc' object='libpoppler_qt5_la-poppler-embeddedfile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-embeddedfile.lo `test -f 'poppler-embeddedfile.cc' || echo '$(srcdir)/'`poppler-embeddedfile.cc
+
+libpoppler_qt5_la-poppler-textbox.lo: poppler-textbox.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-textbox.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-textbox.Tpo -c -o libpoppler_qt5_la-poppler-textbox.lo `test -f 'poppler-textbox.cc' || echo '$(srcdir)/'`poppler-textbox.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-textbox.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-textbox.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-textbox.cc' object='libpoppler_qt5_la-poppler-textbox.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-textbox.lo `test -f 'poppler-textbox.cc' || echo '$(srcdir)/'`poppler-textbox.cc
+
+libpoppler_qt5_la-poppler-link.lo: poppler-link.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-link.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-link.Tpo -c -o libpoppler_qt5_la-poppler-link.lo `test -f 'poppler-link.cc' || echo '$(srcdir)/'`poppler-link.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-link.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-link.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-link.cc' object='libpoppler_qt5_la-poppler-link.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-link.lo `test -f 'poppler-link.cc' || echo '$(srcdir)/'`poppler-link.cc
+
+libpoppler_qt5_la-poppler-annotation.lo: poppler-annotation.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-annotation.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-annotation.Tpo -c -o libpoppler_qt5_la-poppler-annotation.lo `test -f 'poppler-annotation.cc' || echo '$(srcdir)/'`poppler-annotation.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-annotation.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-annotation.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-annotation.cc' object='libpoppler_qt5_la-poppler-annotation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-annotation.lo `test -f 'poppler-annotation.cc' || echo '$(srcdir)/'`poppler-annotation.cc
+
+libpoppler_qt5_la-poppler-link-extractor.lo: poppler-link-extractor.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-link-extractor.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-link-extractor.Tpo -c -o libpoppler_qt5_la-poppler-link-extractor.lo `test -f 'poppler-link-extractor.cc' || echo '$(srcdir)/'`poppler-link-extractor.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-link-extractor.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-link-extractor.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-link-extractor.cc' object='libpoppler_qt5_la-poppler-link-extractor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-link-extractor.lo `test -f 'poppler-link-extractor.cc' || echo '$(srcdir)/'`poppler-link-extractor.cc
+
+libpoppler_qt5_la-poppler-optcontent.lo: poppler-optcontent.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-optcontent.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-optcontent.Tpo -c -o libpoppler_qt5_la-poppler-optcontent.lo `test -f 'poppler-optcontent.cc' || echo '$(srcdir)/'`poppler-optcontent.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-optcontent.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-optcontent.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-optcontent.cc' object='libpoppler_qt5_la-poppler-optcontent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-optcontent.lo `test -f 'poppler-optcontent.cc' || echo '$(srcdir)/'`poppler-optcontent.cc
+
+libpoppler_qt5_la-poppler-page-transition.lo: poppler-page-transition.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-page-transition.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-page-transition.Tpo -c -o libpoppler_qt5_la-poppler-page-transition.lo `test -f 'poppler-page-transition.cc' || echo '$(srcdir)/'`poppler-page-transition.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-page-transition.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-page-transition.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-page-transition.cc' object='libpoppler_qt5_la-poppler-page-transition.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-page-transition.lo `test -f 'poppler-page-transition.cc' || echo '$(srcdir)/'`poppler-page-transition.cc
+
+libpoppler_qt5_la-poppler-sound.lo: poppler-sound.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-sound.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-sound.Tpo -c -o libpoppler_qt5_la-poppler-sound.lo `test -f 'poppler-sound.cc' || echo '$(srcdir)/'`poppler-sound.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-sound.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-sound.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-sound.cc' object='libpoppler_qt5_la-poppler-sound.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-sound.lo `test -f 'poppler-sound.cc' || echo '$(srcdir)/'`poppler-sound.cc
+
+libpoppler_qt5_la-poppler-form.lo: poppler-form.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-form.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-form.Tpo -c -o libpoppler_qt5_la-poppler-form.lo `test -f 'poppler-form.cc' || echo '$(srcdir)/'`poppler-form.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-form.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-form.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-form.cc' object='libpoppler_qt5_la-poppler-form.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-form.lo `test -f 'poppler-form.cc' || echo '$(srcdir)/'`poppler-form.cc
+
+libpoppler_qt5_la-poppler-base-converter.lo: poppler-base-converter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-base-converter.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-base-converter.Tpo -c -o libpoppler_qt5_la-poppler-base-converter.lo `test -f 'poppler-base-converter.cc' || echo '$(srcdir)/'`poppler-base-converter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-base-converter.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-base-converter.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-base-converter.cc' object='libpoppler_qt5_la-poppler-base-converter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-base-converter.lo `test -f 'poppler-base-converter.cc' || echo '$(srcdir)/'`poppler-base-converter.cc
+
+libpoppler_qt5_la-poppler-ps-converter.lo: poppler-ps-converter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-ps-converter.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-ps-converter.Tpo -c -o libpoppler_qt5_la-poppler-ps-converter.lo `test -f 'poppler-ps-converter.cc' || echo '$(srcdir)/'`poppler-ps-converter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-ps-converter.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-ps-converter.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-ps-converter.cc' object='libpoppler_qt5_la-poppler-ps-converter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-ps-converter.lo `test -f 'poppler-ps-converter.cc' || echo '$(srcdir)/'`poppler-ps-converter.cc
+
+libpoppler_qt5_la-poppler-pdf-converter.lo: poppler-pdf-converter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-pdf-converter.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-pdf-converter.Tpo -c -o libpoppler_qt5_la-poppler-pdf-converter.lo `test -f 'poppler-pdf-converter.cc' || echo '$(srcdir)/'`poppler-pdf-converter.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-pdf-converter.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-pdf-converter.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-pdf-converter.cc' object='libpoppler_qt5_la-poppler-pdf-converter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-pdf-converter.lo `test -f 'poppler-pdf-converter.cc' || echo '$(srcdir)/'`poppler-pdf-converter.cc
+
+libpoppler_qt5_la-poppler-qiodeviceoutstream.lo: poppler-qiodeviceoutstream.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-qiodeviceoutstream.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-qiodeviceoutstream.Tpo -c -o libpoppler_qt5_la-poppler-qiodeviceoutstream.lo `test -f 'poppler-qiodeviceoutstream.cc' || echo '$(srcdir)/'`poppler-qiodeviceoutstream.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-qiodeviceoutstream.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-qiodeviceoutstream.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-qiodeviceoutstream.cc' object='libpoppler_qt5_la-poppler-qiodeviceoutstream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-qiodeviceoutstream.lo `test -f 'poppler-qiodeviceoutstream.cc' || echo '$(srcdir)/'`poppler-qiodeviceoutstream.cc
+
+libpoppler_qt5_la-poppler-private.lo: poppler-private.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-private.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-private.Tpo -c -o libpoppler_qt5_la-poppler-private.lo `test -f 'poppler-private.cc' || echo '$(srcdir)/'`poppler-private.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-private.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-private.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-private.cc' object='libpoppler_qt5_la-poppler-private.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-private.lo `test -f 'poppler-private.cc' || echo '$(srcdir)/'`poppler-private.cc
+
+libpoppler_qt5_la-poppler-movie.lo: poppler-movie.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-movie.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-movie.Tpo -c -o libpoppler_qt5_la-poppler-movie.lo `test -f 'poppler-movie.cc' || echo '$(srcdir)/'`poppler-movie.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-movie.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-movie.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-movie.cc' object='libpoppler_qt5_la-poppler-movie.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-movie.lo `test -f 'poppler-movie.cc' || echo '$(srcdir)/'`poppler-movie.cc
+
+libpoppler_qt5_la-poppler-media.lo: poppler-media.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-poppler-media.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-poppler-media.Tpo -c -o libpoppler_qt5_la-poppler-media.lo `test -f 'poppler-media.cc' || echo '$(srcdir)/'`poppler-media.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-poppler-media.Tpo $(DEPDIR)/libpoppler_qt5_la-poppler-media.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='poppler-media.cc' object='libpoppler_qt5_la-poppler-media.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-poppler-media.lo `test -f 'poppler-media.cc' || echo '$(srcdir)/'`poppler-media.cc
+
+libpoppler_qt5_la-ArthurOutputDev.lo: ArthurOutputDev.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -MT libpoppler_qt5_la-ArthurOutputDev.lo -MD -MP -MF $(DEPDIR)/libpoppler_qt5_la-ArthurOutputDev.Tpo -c -o libpoppler_qt5_la-ArthurOutputDev.lo `test -f 'ArthurOutputDev.cc' || echo '$(srcdir)/'`ArthurOutputDev.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpoppler_qt5_la-ArthurOutputDev.Tpo $(DEPDIR)/libpoppler_qt5_la-ArthurOutputDev.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ArthurOutputDev.cc' object='libpoppler_qt5_la-ArthurOutputDev.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpoppler_qt5_la_CXXFLAGS) $(CXXFLAGS) -c -o libpoppler_qt5_la-ArthurOutputDev.lo `test -f 'ArthurOutputDev.cc' || echo '$(srcdir)/'`ArthurOutputDev.cc
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-poppler_includeHEADERS: $(poppler_include_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(poppler_include_HEADERS)'; test -n "$(poppler_includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(poppler_includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(poppler_includedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(poppler_includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(poppler_includedir)" || exit $$?; \
+	done
+
+uninstall-poppler_includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(poppler_include_HEADERS)'; test -n "$(poppler_includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(poppler_includedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(poppler_includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-poppler_includeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES \
+	uninstall-poppler_includeHEADERS
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-poppler_includeHEADERS install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-poppler_includeHEADERS
+
+
+SUFFIXES: .moc
+
+# This rule lets GNU make create any *.moc from the equivalent *.h
+.h.moc:
+	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
+
+clean-generic:
+	rm -f *.moc
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/qt5/src/poppler-annotation-helper.h b/qt5/src/poppler-annotation-helper.h
new file mode 100644
index 00000000..5f335c04
--- /dev/null
+++ b/qt5/src/poppler-annotation-helper.h
@@ -0,0 +1,198 @@
+/* poppler-annotation-helper.h: qt interface to poppler
+ * Copyright (C) 2006, 2008, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2012, Fabio D'Urso <fabiodurso@hotmail.it>
+ * Adapting code from
+ *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <QtCore/QDebug>
+
+#include <Object.h>
+
+class QColor;
+
+class AnnotColor;
+
+namespace Poppler {
+
+class XPDFReader
+{
+    public:
+        // find named symbol and parse it
+        static inline void lookupName( Dict *, char *, QString & dest );
+        static inline void lookupString( Dict *, char *, QString & dest );
+        static inline void lookupBool( Dict *, char *, bool & dest );
+        static inline void lookupInt( Dict *, char *, int & dest );
+        static inline void lookupNum( Dict *, char *, double & dest );
+        static inline int lookupNumArray( Dict *, char *, double * dest, int len );
+        static inline void lookupColor( Dict *, char *, QColor & color );
+        static inline void lookupIntRef( Dict *, char *, int & dest );
+        static inline void lookupDate( Dict *, char *, QDateTime & dest );
+        // transform from user coords to normalized ones using the matrix M
+        static inline void transform( double * M, double x, double y, QPointF &res );
+        static inline void invTransform( double * M, const QPointF &p, double &x, double &y );
+};
+
+void XPDFReader::lookupName( Dict * dict, char * type, QString & dest )
+{
+    Object nameObj;
+    dict->lookup( type, &nameObj );
+    if ( nameObj.isNull() )
+        return;
+    if ( nameObj.isName() )
+        dest = nameObj.getName();
+    else
+        qDebug() << type << " is not Name." << endl;
+    nameObj.free();
+}
+
+void XPDFReader::lookupString( Dict * dict, char * type, QString & dest )
+{
+    Object stringObj;
+    dict->lookup( type, &stringObj );
+    if ( stringObj.isNull() )
+        return;
+    if ( stringObj.isString() )
+        dest = stringObj.getString()->getCString();
+    else
+        qDebug() << type << " is not String." << endl;
+    stringObj.free();
+}
+
+void XPDFReader::lookupBool( Dict * dict, char * type, bool & dest )
+{
+    Object boolObj;
+    dict->lookup( type, &boolObj );
+    if ( boolObj.isNull() )
+        return;
+    if ( boolObj.isBool() )
+        dest = boolObj.getBool() == gTrue;
+    else
+        qDebug() << type << " is not Bool." << endl;
+    boolObj.free();
+}
+
+void XPDFReader::lookupInt( Dict * dict, char * type, int & dest )
+{
+    Object intObj;
+    dict->lookup( type, &intObj );
+    if ( intObj.isNull() )
+        return;
+    if ( intObj.isInt() )
+        dest = intObj.getInt();
+    else
+        qDebug() << type << " is not Int." << endl;
+    intObj.free();
+}
+
+void XPDFReader::lookupNum( Dict * dict, char * type, double & dest )
+{
+    Object numObj;
+    dict->lookup( type, &numObj );
+    if ( numObj.isNull() )
+        return;
+    if ( numObj.isNum() )
+        dest = numObj.getNum();
+    else
+        qDebug() << type << " is not Num." << endl;
+    numObj.free();
+}
+
+int XPDFReader::lookupNumArray( Dict * dict, char * type, double * dest, int len )
+{
+    Object arrObj;
+    dict->lookup( type, &arrObj );
+    if ( arrObj.isNull() )
+        return 0;
+    Object numObj;
+    if ( arrObj.isArray() )
+    {
+        len = qMin( len, arrObj.arrayGetLength() );
+        for ( int i = 0; i < len; i++ )
+        {
+            dest[i] = arrObj.arrayGet( i, &numObj )->getNum();
+            numObj.free();
+        }
+    }
+    else
+    {
+        len = 0;
+        qDebug() << type << "is not Array." << endl;
+    }
+    arrObj.free();
+    return len;
+}
+
+void XPDFReader::lookupColor( Dict * dict, char * type, QColor & dest )
+{
+    double c[3];
+    if ( XPDFReader::lookupNumArray( dict, type, c, 3 ) == 3 )
+        dest = QColor( (int)(c[0]*255.0), (int)(c[1]*255.0), (int)(c[2]*255.0));
+}
+
+void XPDFReader::lookupIntRef( Dict * dict, char * type, int & dest )
+{
+    Object refObj;
+    dict->lookupNF( type, &refObj );
+    if ( refObj.isNull() )
+        return;
+    if ( refObj.isRef() )
+        dest = refObj.getRefNum();
+    else
+        qDebug() << type << " is not Ref." << endl;
+    refObj.free();
+}
+
+void XPDFReader::lookupDate( Dict * dict, char * type, QDateTime & dest )
+{
+    Object dateObj;
+    dict->lookup( type, &dateObj );
+    if ( dateObj.isNull() )
+        return;
+    if ( dateObj.isString() )
+    {
+        dest = convertDate( dateObj.getString()->getCString() );
+    }
+    else
+        qDebug() << type << " is not Date" << endl;
+    dateObj.free();
+}
+
+void XPDFReader::transform( double * M, double x, double y, QPointF &res )
+{
+    res.setX( M[0] * x + M[2] * y + M[4] );
+    res.setY( M[1] * x + M[3] * y + M[5] );
+}
+
+void XPDFReader::invTransform( double * M, const QPointF &p, double &x, double &y )
+{
+    const double det = M[0]*M[3] - M[1]*M[2];
+    Q_ASSERT(det != 0);
+
+    const double invM[4] = { M[3]/det, -M[1]/det, -M[2]/det, M[0]/det };
+    const double xt = p.x() - M[4];
+    const double yt = p.y() - M[5];
+
+    x = invM[0] * xt + invM[2] * yt;
+    y = invM[1] * xt + invM[3] * yt;
+}
+
+QColor convertAnnotColor( AnnotColor *color );
+AnnotColor* convertQColor( const QColor &color );
+
+}
diff --git a/qt5/src/poppler-annotation-private.h b/qt5/src/poppler-annotation-private.h
new file mode 100644
index 00000000..c755eb35
--- /dev/null
+++ b/qt5/src/poppler-annotation-private.h
@@ -0,0 +1,112 @@
+/* poppler-annotation-private.h: qt interface to poppler
+ * Copyright (C) 2007, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
+ * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012, Albert Astals Cid <aacid@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _POPPLER_ANNOTATION_PRIVATE_H_
+#define _POPPLER_ANNOTATION_PRIVATE_H_
+
+#include <QtCore/QLinkedList>
+#include <QtCore/QPointF>
+#include <QtCore/QSharedDataPointer>
+
+#include "poppler-annotation.h"
+
+#include <Object.h>
+
+class Annot;
+class AnnotPath;
+class Link;
+class Page;
+class PDFRectangle;
+
+namespace Poppler
+{
+class DocumentData;
+
+class AnnotationPrivate : public QSharedData
+{
+    public:
+        AnnotationPrivate();
+        virtual ~AnnotationPrivate();
+
+        void addRevision(Annotation *ann, Annotation::RevScope scope, Annotation::RevType type);
+
+        /* Returns an Annotation of the right subclass whose d_ptr points to
+         * this AnnotationPrivate */
+        virtual Annotation * makeAlias() = 0;
+
+        /* properties: contents related */
+        QString author;
+        QString contents;
+        QString uniqueName;
+        QDateTime modDate;       // before or equal to currentDateTime()
+        QDateTime creationDate;  // before or equal to modifyDate
+
+        /* properties: look/interaction related */
+        int flags;
+        QRectF boundary;
+
+        /* style and popup */
+        Annotation::Style style;
+        Annotation::Popup popup;
+
+        /* revisions */
+        Annotation::RevScope revisionScope;
+        Annotation::RevType revisionType;
+        QList<Annotation*> revisions;
+
+        /* After this call, the Annotation object will behave like a wrapper for
+         * the specified Annot object. All cached values are discarded */
+        void tieToNativeAnnot(Annot *ann, ::Page *page, DocumentData *doc);
+
+        /* Creates a new Annot object on the specified page, flushes current
+         * values to that object and ties this Annotation to that object */
+        virtual Annot* createNativeAnnot(::Page *destPage, DocumentData *doc) = 0;
+
+        /* Inited to 0 (i.e. untied annotation) */
+        Annot *pdfAnnot;
+        ::Page *pdfPage;
+        DocumentData * parentDoc;
+
+        /* The following helpers only work if pdfPage is set */
+        void flushBaseAnnotationProperties();
+        void fillNormalizationMTX(double MTX[6], int pageRotation) const;
+        void fillTransformationMTX(double MTX[6]) const;
+        QRectF fromPdfRectangle(const PDFRectangle &r) const;
+        PDFRectangle boundaryToPdfRectangle(const QRectF &r, int flags) const;
+        AnnotPath * toAnnotPath(const QLinkedList<QPointF> &l) const;
+
+        /* Scan page for annotations, parentId=0 searches for root annotations */
+        static QList<Annotation*> findAnnotations(::Page *pdfPage, DocumentData *doc, int parentId = 0);
+
+        /* Add given annotation to given page */
+        static void addAnnotationToPage(::Page *pdfPage, DocumentData *doc, const Annotation * ann);
+
+        /* Remove annotation from page and destroy ann */
+        static void removeAnnotationFromPage(::Page *pdfPage, const Annotation * ann);
+
+        Ref pdfObjectReference() const;
+
+        Link* additionalAction( Annotation::AdditionalActionType type ) const;
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc
new file mode 100644
index 00000000..052e0603
--- /dev/null
+++ b/qt5/src/poppler-annotation.cc
@@ -0,0 +1,4416 @@
+/* poppler-annotation.cc: qt interface to poppler
+ * Copyright (C) 2006, 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2006, 2008, 2010 Pino Toscano <pino@kde.org>
+ * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
+ * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
+ * Adapting code from
+ *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+// qt/kde includes
+#include <QtCore/QRegExp>
+#include <QtCore/QtAlgorithms>
+#include <QtXml/QDomElement>
+#include <QtGui/QColor>
+#include <QtGui/QTransform>
+
+// local includes
+#include "poppler-annotation.h"
+#include "poppler-link.h"
+#include "poppler-qt5.h"
+#include "poppler-annotation-helper.h"
+#include "poppler-annotation-private.h"
+#include "poppler-page-private.h"
+#include "poppler-private.h"
+
+// poppler includes
+#include <Page.h>
+#include <Annot.h>
+#include <Gfx.h>
+#include <Error.h>
+#include <FileSpec.h>
+#include <Link.h>
+
+/* Almost all getters directly query the underlying poppler annotation, with
+ * the exceptions of link, file attachment, sound, movie and screen annotations,
+ * Whose data retrieval logic has not been moved yet. Their getters return
+ * static data set at creation time by findAnnotations
+ */
+
+namespace Poppler {
+
+//BEGIN AnnotationUtils implementation
+Annotation * AnnotationUtils::createAnnotation( const QDomElement & annElement )
+{
+    // safety check on annotation element
+    if ( !annElement.hasAttribute( "type" ) )
+        return 0;
+
+    // build annotation of given type
+    Annotation * annotation = 0;
+    int typeNumber = annElement.attribute( "type" ).toInt();
+    switch ( typeNumber )
+    {
+        case Annotation::AText:
+            annotation = new TextAnnotation( annElement );
+            break;
+        case Annotation::ALine:
+            annotation = new LineAnnotation( annElement );
+            break;
+        case Annotation::AGeom:
+            annotation = new GeomAnnotation( annElement );
+            break;
+        case Annotation::AHighlight:
+            annotation = new HighlightAnnotation( annElement );
+            break;
+        case Annotation::AStamp:
+            annotation = new StampAnnotation( annElement );
+            break;
+        case Annotation::AInk:
+            annotation = new InkAnnotation( annElement );
+            break;
+        case Annotation::ACaret:
+            annotation = new CaretAnnotation( annElement );
+            break;
+    }
+
+    // return created annotation
+    return annotation;
+}
+
+void AnnotationUtils::storeAnnotation( const Annotation * ann, QDomElement & annElement,
+    QDomDocument & document )
+{
+    // save annotation's type as element's attribute
+    annElement.setAttribute( "type", (uint)ann->subType() );
+
+    // append all annotation data as children of this node
+    ann->store( annElement, document );
+}
+
+QDomElement AnnotationUtils::findChildElement( const QDomNode & parentNode,
+    const QString & name )
+{
+    // loop through the whole children and return a 'name' named element
+    QDomNode subNode = parentNode.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement element = subNode.toElement();
+        if ( element.tagName() == name )
+            return element;
+        subNode = subNode.nextSibling();
+    }
+    // if the name can't be found, return a dummy null element
+    return QDomElement();
+}
+//END AnnotationUtils implementation
+
+
+//BEGIN Annotation implementation
+AnnotationPrivate::AnnotationPrivate()
+    : flags( 0 ), revisionScope ( Annotation::Root ),
+    revisionType ( Annotation::None ), pdfAnnot ( 0 ), pdfPage ( 0 ),
+    parentDoc ( 0 )
+{
+}
+
+void AnnotationPrivate::addRevision( Annotation *ann, Annotation::RevScope scope, Annotation::RevType type )
+{
+    /* Since ownership stays with the caller, create an alias of ann */
+    revisions.append( ann->d_ptr->makeAlias() );
+
+    /* Set revision properties */
+    revisionScope = scope;
+    revisionType = type;
+}
+
+AnnotationPrivate::~AnnotationPrivate()
+{
+    // Delete all children revisions
+    qDeleteAll( revisions );
+
+    // Release Annot object
+    if (pdfAnnot)
+        pdfAnnot->decRefCnt();
+}
+
+void AnnotationPrivate::tieToNativeAnnot(Annot *ann, ::Page *page, Poppler::DocumentData * doc)
+{
+    if (pdfAnnot)
+    {
+        error(errIO, -1, "Annotation is already tied");
+        return;
+    }
+
+    pdfAnnot = ann;
+    pdfPage = page;
+    parentDoc = doc;
+
+    pdfAnnot->incRefCnt();
+}
+
+/* This method is called when a new annotation is created, after pdfAnnot and
+ * pdfPage have been set */
+void AnnotationPrivate::flushBaseAnnotationProperties()
+{
+    Q_ASSERT ( pdfPage );
+
+    Annotation *q = makeAlias(); // Setters are defined in the public class
+
+    // Since pdfAnnot has been set, this calls will write in the Annot object
+    q->setAuthor(author);
+    q->setContents(contents);
+    q->setUniqueName(uniqueName);
+    q->setModificationDate(modDate);
+    q->setCreationDate(creationDate);
+    q->setFlags(flags);
+    //q->setBoundary(boundary); -- already set by subclass-specific code
+    q->setStyle(style);
+    q->setPopup(popup);
+
+    // Flush revisions
+    foreach (Annotation *r, revisions)
+    {
+        // TODO: Flush revision
+        delete r; // Object is no longer needed
+    }
+
+    delete q;
+
+    // Clear some members to save memory
+    author.clear();
+    contents.clear();
+    uniqueName.clear();
+    revisions.clear();
+}
+
+// Returns matrix to convert from user space coords (oriented according to the
+// specified rotation) to normalized coords
+void AnnotationPrivate::fillNormalizationMTX(double MTX[6], int pageRotation) const
+{
+    Q_ASSERT ( pdfPage );
+
+    // build a normalized transform matrix for this page at 100% scale
+    GfxState * gfxState = new GfxState( 72.0, 72.0, pdfPage->getCropBox(), pageRotation, gTrue );
+    double * gfxCTM = gfxState->getCTM();
+
+    double w = pdfPage->getCropWidth();
+    double h = pdfPage->getCropHeight();
+
+    // Swap width and height if the page is rotated landscape or seascape
+    if ( pageRotation == 90 || pageRotation == 270 )
+    {
+        double t = w;
+        w = h;
+        h = t;
+    }
+
+    for ( int i = 0; i < 6; i+=2 )
+    {
+        MTX[i] = gfxCTM[i] / w;
+        MTX[i+1] = gfxCTM[i+1] / h;
+    }
+    delete gfxState;
+}
+
+// Returns matrix to convert from user space coords (i.e. those that are stored
+// in the PDF file) to normalized coords (i.e. those that we expose to clients).
+// This method also applies a rotation around the top-left corner if the
+// FixedRotation flag is set.
+void AnnotationPrivate::fillTransformationMTX(double MTX[6]) const
+{
+    Q_ASSERT ( pdfPage );
+    Q_ASSERT ( pdfAnnot );
+
+    const int pageRotate = pdfPage->getRotate();
+
+    if ( pageRotate == 0 || ( pdfAnnot->getFlags() & Annot::flagNoRotate ) == 0 )
+    {
+        // Use the normalization matrix for this page's rotation
+        fillNormalizationMTX( MTX, pageRotate );
+    }
+    else
+    {
+        // Clients expect coordinates relative to this page's rotation, but
+        // FixedRotation annotations internally use unrotated coordinates:
+        // construct matrix to both normalize and rotate coordinates using the
+        // top-left corner as rotation pivot
+
+        double MTXnorm[6];
+        fillNormalizationMTX( MTXnorm, pageRotate );
+
+        QTransform transform( MTXnorm[0], MTXnorm[1], MTXnorm[2],
+                              MTXnorm[3], MTXnorm[4], MTXnorm[5] );
+        transform.translate( +pdfAnnot->getXMin(), +pdfAnnot->getYMax() );
+        transform.rotate( pageRotate );
+        transform.translate( -pdfAnnot->getXMin(), -pdfAnnot->getYMax() );
+
+        MTX[0] = transform.m11();
+        MTX[1] = transform.m12();
+        MTX[2] = transform.m21();
+        MTX[3] = transform.m22();
+        MTX[4] = transform.dx();
+        MTX[5] = transform.dy();
+    }
+}
+
+QRectF AnnotationPrivate::fromPdfRectangle(const PDFRectangle &r) const
+{
+    double swp, MTX[6];
+    fillTransformationMTX(MTX);
+
+    QPointF p1, p2;
+    XPDFReader::transform( MTX, r.x1, r.y1, p1 );
+    XPDFReader::transform( MTX, r.x2, r.y2, p2 );
+
+    double tl_x = p1.x();
+    double tl_y = p1.y();
+    double br_x = p2.x();
+    double br_y = p2.y();
+
+    if (tl_x > br_x)
+    {
+        swp = tl_x;
+        tl_x = br_x;
+        br_x = swp;
+    }
+
+    if (tl_y > br_y)
+    {
+        swp = tl_y;
+        tl_y = br_y;
+        br_y = swp;
+    }
+
+    return QRectF( QPointF(tl_x,tl_y) , QPointF(br_x,br_y) );
+}
+
+// This function converts a boundary QRectF in normalized coords to a
+// PDFRectangle in user coords. If the FixedRotation flag is set, this function
+// also applies a rotation around the top-left corner: it's the inverse of
+// the transformation produced by fillTransformationMTX, but we can't use
+// fillTransformationMTX here because it relies on the native annotation
+// object's boundary rect to be already set up.
+PDFRectangle AnnotationPrivate::boundaryToPdfRectangle(const QRectF &r, int flags) const
+{
+    Q_ASSERT ( pdfPage );
+
+    const int pageRotate = pdfPage->getRotate();
+
+    double MTX[6];
+    fillNormalizationMTX( MTX, pageRotate );
+
+    double tl_x, tl_y, br_x, br_y, swp;
+    XPDFReader::invTransform( MTX, r.topLeft(), tl_x, tl_y );
+    XPDFReader::invTransform( MTX, r.bottomRight(), br_x, br_y );
+
+    if (tl_x > br_x)
+    {
+        swp = tl_x;
+        tl_x = br_x;
+        br_x = swp;
+    }
+
+    if (tl_y > br_y)
+    {
+        swp = tl_y;
+        tl_y = br_y;
+        br_y = swp;
+    }
+
+    const int rotationFixUp = ( flags & Annotation::FixedRotation ) ? pageRotate : 0;
+    const double width = br_x - tl_x;
+    const double height = br_y - tl_y;
+
+    if ( rotationFixUp == 0 )
+        return PDFRectangle(tl_x, tl_y, br_x, br_y);
+    else if ( rotationFixUp == 90 )
+        return PDFRectangle(tl_x, tl_y - width, tl_x + height, tl_y);
+    else if ( rotationFixUp == 180 )
+        return PDFRectangle(br_x, tl_y - height, br_x + width, tl_y);
+    else // rotationFixUp == 270
+        return PDFRectangle(br_x, br_y - width, br_x + height, br_y);
+}
+
+AnnotPath * AnnotationPrivate::toAnnotPath(const QLinkedList<QPointF> &list) const
+{
+    const int count = list.size();
+    AnnotCoord **ac = (AnnotCoord **) gmallocn(count, sizeof(AnnotCoord*));
+
+    double MTX[6];
+    fillTransformationMTX(MTX);
+
+    int pos = 0;
+    foreach (const QPointF &p, list)
+    {
+        double x, y;
+        XPDFReader::invTransform( MTX, p, x, y );
+        ac[pos++] = new AnnotCoord(x, y);
+    }
+
+    return new AnnotPath(ac, count);
+}
+
+QList<Annotation*> AnnotationPrivate::findAnnotations(::Page *pdfPage, DocumentData *doc, int parentID)
+{
+    Annots* annots = pdfPage->getAnnots();
+    const uint numAnnotations = annots->getNumAnnots();
+    if ( numAnnotations == 0 )
+    {
+        return QList<Annotation*>();
+    }
+
+    // Create Annotation objects and tie to their native Annot
+    QList<Annotation*> res;
+    for ( uint j = 0; j < numAnnotations; j++ )
+    {
+        // get the j-th annotation
+        Annot * ann = annots->getAnnot( j );
+        if ( !ann )
+        {
+            error(errInternal, -1, "Annot %u is null", j);
+            continue;
+        }
+
+        // Check parent annotation
+        AnnotMarkup * markupann = dynamic_cast< AnnotMarkup * >( ann );
+        if (!markupann)
+        {
+            // Assume it's a root annotation, and skip if user didn't request it
+            if (parentID != 0)
+                continue;
+        }
+        else if (markupann->getInReplyToID() != parentID)
+            continue;
+
+        /* Create Annotation of the right subclass */
+        Annotation * annotation = 0;
+        Annot::AnnotSubtype subType = ann->getType();
+
+        switch ( subType )
+        {
+            case Annot::typeText:
+                annotation = new TextAnnotation(TextAnnotation::Linked);
+                break;
+            case Annot::typeFreeText:
+                annotation = new TextAnnotation(TextAnnotation::InPlace);
+                break;
+            case Annot::typeLine:
+                annotation = new LineAnnotation(LineAnnotation::StraightLine);
+                break;
+            case Annot::typePolygon:
+            case Annot::typePolyLine:
+                annotation = new LineAnnotation(LineAnnotation::Polyline);
+                break;
+            case Annot::typeSquare:
+            case Annot::typeCircle:
+                annotation = new GeomAnnotation();
+                break;
+            case Annot::typeHighlight:
+            case Annot::typeUnderline:
+            case Annot::typeSquiggly:
+            case Annot::typeStrikeOut:
+                annotation = new HighlightAnnotation();
+                break;
+            case Annot::typeStamp:
+                annotation = new StampAnnotation();
+                break;
+            case Annot::typeInk:
+                annotation = new InkAnnotation();
+                break;
+            case Annot::typeLink: /* TODO: Move logic to getters */
+            {
+                // parse Link params
+                AnnotLink * linkann = static_cast< AnnotLink * >( ann );
+                LinkAnnotation * l = new LinkAnnotation();
+                annotation = l;
+
+                // -> hlMode
+                l->setLinkHighlightMode( (LinkAnnotation::HighlightMode)linkann->getLinkEffect() );
+
+                // -> link region
+                // TODO
+
+                // reading link action
+                if ( linkann->getAction() )
+                {
+                    Link * popplerLink = PageData::convertLinkActionToLink( linkann->getAction(), doc, QRectF() );
+                    if ( popplerLink )
+                    {
+                        l->setLinkDestination( popplerLink );
+                    }
+                }
+                break;
+            }
+            case Annot::typeCaret:
+                annotation = new CaretAnnotation();
+                break;
+            case Annot::typeFileAttachment: /* TODO: Move logic to getters */
+            {
+                AnnotFileAttachment * attachann = static_cast< AnnotFileAttachment * >( ann );
+                FileAttachmentAnnotation * f = new FileAttachmentAnnotation();
+                annotation = f;
+                // -> fileIcon
+                f->setFileIconName( QString::fromLatin1( attachann->getName()->getCString() ) );
+                // -> embeddedFile
+                FileSpec *filespec = new FileSpec( attachann->getFile() );
+                f->setEmbeddedFile( new EmbeddedFile( *new EmbeddedFileData( filespec ) ) );
+                break;
+            }
+            case Annot::typeSound: /* TODO: Move logic to getters */
+            {
+                AnnotSound * soundann = static_cast< AnnotSound * >( ann );
+                SoundAnnotation * s = new SoundAnnotation();
+                annotation = s;
+
+                // -> soundIcon
+                s->setSoundIconName( QString::fromLatin1( soundann->getName()->getCString() ) );
+                // -> sound
+                s->setSound( new SoundObject( soundann->getSound() ) );
+                break;
+            }
+            case Annot::typeMovie: /* TODO: Move logic to getters */
+            {
+                AnnotMovie * movieann = static_cast< AnnotMovie * >( ann );
+                MovieAnnotation * m = new MovieAnnotation();
+                annotation = m;
+
+                // -> movie
+                MovieObject *movie = new MovieObject( movieann );
+                m->setMovie( movie );
+                // -> movieTitle
+                GooString * movietitle = movieann->getTitle();
+                if ( movietitle )
+                    m->setMovieTitle( QString::fromLatin1( movietitle->getCString() ) );
+                break;
+            }
+            case Annot::typeScreen:
+            {
+                AnnotScreen * screenann = static_cast< AnnotScreen * >( ann );
+                if (!screenann->getAction())
+                  continue;
+                ScreenAnnotation * s = new ScreenAnnotation();
+                annotation = s;
+
+                // -> screen
+                Link * popplerLink = PageData::convertLinkActionToLink( screenann->getAction(), doc, QRectF() );
+                s->setAction( static_cast<Poppler::LinkRendition *>(popplerLink) );
+
+                // -> screenTitle
+                GooString * screentitle = screenann->getTitle();
+                if ( screentitle )
+                    s->setScreenTitle( UnicodeParsedString( screentitle ) );
+                break;
+            }
+            case Annot::typePopup:
+                continue; // popups are parsed by Annotation's window() getter
+            case Annot::typeUnknown:
+                continue; // special case for ignoring unknown annotations
+            case Annot::typeWidget:
+                annotation = new WidgetAnnotation();
+                break;
+            default:
+            {
+#define CASE_FOR_TYPE( thetype ) \
+                    case Annot::type ## thetype: \
+                        error(errUnimplemented, -1, "Annotation " #thetype " not supported"); \
+                        break;
+                switch ( subType )
+                {
+                    CASE_FOR_TYPE( PrinterMark )
+                    CASE_FOR_TYPE( TrapNet )
+                    CASE_FOR_TYPE( Watermark )
+                    CASE_FOR_TYPE( 3D )
+                    default: error(errUnimplemented, -1, "Annotation %u not supported", subType);
+                }
+                continue;
+#undef CASE_FOR_TYPE
+            }
+        }
+
+        annotation->d_ptr->tieToNativeAnnot(ann, pdfPage, doc);
+        res.append(annotation);
+    }
+
+    return res;
+}
+
+Ref AnnotationPrivate::pdfObjectReference() const
+{
+    if (pdfAnnot == 0)
+    {
+        const Ref invalid_ref = { -1, -1 };
+        return invalid_ref;
+    }
+
+    return pdfAnnot->getRef();
+}
+
+Link* AnnotationPrivate::additionalAction( Annotation::AdditionalActionType type ) const
+{
+    if ( pdfAnnot->getType() != Annot::typeScreen && pdfAnnot->getType() != Annot::typeWidget )
+        return 0;
+
+    Annot::AdditionalActionsType actionType = Annot::actionCursorEntering;
+    switch ( type )
+    {
+        case Annotation::CursorEnteringAction: actionType = Annot::actionCursorEntering; break;
+        case Annotation::CursorLeavingAction: actionType = Annot::actionCursorLeaving; break;
+        case Annotation::MousePressedAction: actionType = Annot::actionMousePressed; break;
+        case Annotation::MouseReleasedAction: actionType = Annot::actionMouseReleased; break;
+        case Annotation::FocusInAction: actionType = Annot::actionFocusIn; break;
+        case Annotation::FocusOutAction: actionType = Annot::actionFocusOut; break;
+        case Annotation::PageOpeningAction: actionType = Annot::actionPageOpening; break;
+        case Annotation::PageClosingAction: actionType = Annot::actionPageClosing; break;
+        case Annotation::PageVisibleAction: actionType = Annot::actionPageVisible; break;
+        case Annotation::PageInvisibleAction: actionType = Annot::actionPageInvisible; break;
+    }
+
+    ::LinkAction *linkAction = 0;
+    if ( pdfAnnot->getType() == Annot::typeScreen )
+        linkAction = static_cast<AnnotScreen*>( pdfAnnot )->getAdditionalAction( actionType );
+    else
+        linkAction = static_cast<AnnotWidget*>( pdfAnnot )->getAdditionalAction( actionType );
+
+    Link *link = 0;
+
+    if ( linkAction )
+        link = PageData::convertLinkActionToLink( linkAction, parentDoc, QRectF() );
+
+    return link;
+}
+
+void AnnotationPrivate::addAnnotationToPage(::Page *pdfPage, DocumentData *doc, const Annotation * ann)
+{
+    if (ann->d_ptr->pdfAnnot != 0)
+    {
+        error(errIO, -1, "Annotation is already tied");
+        return;
+    }
+
+    // Unimplemented annotations can't be created by the user because their ctor
+    // is private. Therefore, createNativeAnnot will never return 0
+    Annot *nativeAnnot = ann->d_ptr->createNativeAnnot(pdfPage, doc);
+    Q_ASSERT(nativeAnnot);
+    pdfPage->addAnnot(nativeAnnot);
+}
+
+void AnnotationPrivate::removeAnnotationFromPage(::Page *pdfPage, const Annotation * ann)
+{
+    if (ann->d_ptr->pdfAnnot == 0)
+    {
+        error(errIO, -1, "Annotation is not tied");
+        return;
+    }
+
+    if (ann->d_ptr->pdfPage != pdfPage)
+    {
+        error(errIO, -1, "Annotation doesn't belong to the specified page");
+        return;
+    }
+
+    // Remove annotation
+    pdfPage->removeAnnot(ann->d_ptr->pdfAnnot);
+
+    // Destroy object
+    delete ann;
+}
+
+class Annotation::Style::Private : public QSharedData
+{
+  public:
+    Private()
+        : opacity( 1.0 ), width( 1.0 ), lineStyle( Solid ), xCorners( 0.0 ),
+        yCorners( 0.0 ), lineEffect( NoEffect ), effectIntensity( 1.0 )
+        {
+            dashArray.resize(1);
+            dashArray[0] = 3;
+        }
+
+    QColor color;
+    double opacity;
+    double width;
+    Annotation::LineStyle lineStyle;
+    double xCorners;
+    double yCorners;
+    QVector<double> dashArray;
+    Annotation::LineEffect lineEffect;
+    double effectIntensity;
+};
+
+Annotation::Style::Style()
+    : d ( new Private )
+{
+}
+
+Annotation::Style::Style( const Style &other )
+    : d( other.d )
+{
+}
+
+Annotation::Style& Annotation::Style::operator=( const Style &other )
+{
+    if ( this != &other )
+        d = other.d;
+
+    return *this;
+}
+
+Annotation::Style::~Style()
+{
+}
+
+QColor Annotation::Style::color() const
+{
+    return d->color;
+}
+
+void Annotation::Style::setColor(const QColor &color)
+{
+    d->color = color;
+}
+
+double Annotation::Style::opacity() const
+{
+    return d->opacity;
+}
+
+void Annotation::Style::setOpacity(double opacity)
+{
+    d->opacity = opacity;
+}
+
+double Annotation::Style::width() const
+{
+    return d->width;
+}
+
+void Annotation::Style::setWidth(double width)
+{
+    d->width = width;
+}
+
+Annotation::LineStyle Annotation::Style::lineStyle() const
+{
+    return d->lineStyle;
+}
+
+void Annotation::Style::setLineStyle(Annotation::LineStyle style)
+{
+    d->lineStyle = style;
+}
+
+double Annotation::Style::xCorners() const
+{
+    return d->xCorners;
+}
+
+void Annotation::Style::setXCorners(double radius)
+{
+    d->xCorners = radius;
+}
+
+double Annotation::Style::yCorners() const
+{
+    return d->yCorners;
+}
+
+void Annotation::Style::setYCorners(double radius)
+{
+    d->yCorners = radius;
+}
+
+const QVector<double>& Annotation::Style::dashArray() const
+{
+    return d->dashArray;
+}
+
+void Annotation::Style::setDashArray(const QVector<double> &array)
+{
+    d->dashArray = array;
+}
+
+Annotation::LineEffect Annotation::Style::lineEffect() const
+{
+    return d->lineEffect;
+}
+
+void Annotation::Style::setLineEffect(Annotation::LineEffect effect)
+{
+    d->lineEffect = effect;
+}
+
+double Annotation::Style::effectIntensity() const
+{
+    return d->effectIntensity;
+}
+
+void Annotation::Style::setEffectIntensity(double intens)
+{
+    d->effectIntensity = intens;
+}
+
+class Annotation::Popup::Private : public QSharedData
+{
+  public:
+    Private()
+        : flags( -1 ) {}
+
+    int flags;
+    QRectF geometry;
+    QString title;
+    QString summary;
+    QString text;
+};
+
+Annotation::Popup::Popup()
+    : d ( new Private )
+{
+}
+
+Annotation::Popup::Popup( const Popup &other )
+    : d( other.d )
+{
+}
+
+Annotation::Popup& Annotation::Popup::operator=( const Popup &other )
+{
+    if ( this != &other )
+        d = other.d;
+
+    return *this;
+}
+
+Annotation::Popup::~Popup()
+{
+}
+
+int Annotation::Popup::flags() const
+{
+    return d->flags;
+}
+
+void Annotation::Popup::setFlags( int flags )
+{
+    d->flags = flags;
+}
+
+QRectF Annotation::Popup::geometry() const
+{
+    return d->geometry;
+}
+
+void Annotation::Popup::setGeometry( const QRectF &geom )
+{
+    d->geometry = geom;
+}
+
+QString Annotation::Popup::title() const
+{
+    return d->title;
+}
+
+void Annotation::Popup::setTitle( const QString &title )
+{
+    d->title = title;
+}
+
+QString Annotation::Popup::summary() const
+{
+    return d->summary;
+}
+
+void Annotation::Popup::setSummary( const QString &summary )
+{
+    d->summary = summary;
+}
+
+QString Annotation::Popup::text() const
+{
+    return d->text;
+}
+
+void Annotation::Popup::setText( const QString &text )
+{
+    d->text = text;
+}
+
+Annotation::Annotation( AnnotationPrivate &dd )
+    : d_ptr( &dd )
+{
+}
+
+Annotation::~Annotation()
+{
+}
+
+Annotation::Annotation( AnnotationPrivate &dd, const QDomNode &annNode )
+    : d_ptr( &dd )
+{
+    Q_D( Annotation );
+
+    // get the [base] element of the annotation node
+    QDomElement e = AnnotationUtils::findChildElement( annNode, "base" );
+    if ( e.isNull() )
+        return;
+
+    Style s;
+    Popup w;
+
+    // parse -contents- attributes
+    if ( e.hasAttribute( "author" ) )
+        setAuthor(e.attribute( "author" ));
+    if ( e.hasAttribute( "contents" ) )
+        setContents(e.attribute( "contents" ));
+    if ( e.hasAttribute( "uniqueName" ) )
+        setUniqueName(e.attribute( "uniqueName" ));
+    if ( e.hasAttribute( "modifyDate" ) )
+        setModificationDate(QDateTime::fromString( e.attribute( "modifyDate" ) ));
+    if ( e.hasAttribute( "creationDate" ) )
+        setCreationDate(QDateTime::fromString( e.attribute( "creationDate" ) ));
+
+    // parse -other- attributes
+    if ( e.hasAttribute( "flags" ) )
+        setFlags(e.attribute( "flags" ).toInt());
+    if ( e.hasAttribute( "color" ) )
+        s.setColor(QColor( e.attribute( "color" ) ));
+    if ( e.hasAttribute( "opacity" ) )
+        s.setOpacity(e.attribute( "opacity" ).toDouble());
+
+    // parse -the-subnodes- (describing Style, Window, Revision(s) structures)
+    // Note: all subnodes if present must be 'attributes complete'
+    QDomNode eSubNode = e.firstChild();
+    while ( eSubNode.isElement() )
+    {
+        QDomElement ee = eSubNode.toElement();
+        eSubNode = eSubNode.nextSibling();
+
+        // parse boundary
+        if ( ee.tagName() == "boundary" )
+        {
+            QRectF brect;
+            brect.setLeft(ee.attribute( "l" ).toDouble());
+            brect.setTop(ee.attribute( "t" ).toDouble());
+            brect.setRight(ee.attribute( "r" ).toDouble());
+            brect.setBottom(ee.attribute( "b" ).toDouble());
+            setBoundary(brect);
+        }
+        // parse penStyle if not default
+        else if ( ee.tagName() == "penStyle" )
+        {
+            s.setWidth(ee.attribute( "width" ).toDouble());
+            s.setLineStyle((LineStyle)ee.attribute( "style" ).toInt());
+            s.setXCorners(ee.attribute( "xcr" ).toDouble());
+            s.setYCorners(ee.attribute( "ycr" ).toDouble());
+
+            // Try to parse dash array (new format)
+            QVector<double> dashArray;
+
+            QDomNode eeSubNode = ee.firstChild();
+            while ( eeSubNode.isElement() )
+            {
+                QDomElement eee = eeSubNode.toElement();
+                eeSubNode = eeSubNode.nextSibling();
+
+                if ( eee.tagName() != "dashsegm" )
+                    continue;
+
+                dashArray.append(eee.attribute( "len" ).toDouble());
+            }
+
+            // If no segments were found use marks/spaces (old format)
+            if ( dashArray.size() == 0 )
+            {
+                dashArray.append(ee.attribute( "marks" ).toDouble());
+                dashArray.append(ee.attribute( "spaces" ).toDouble());
+            }
+
+            s.setDashArray(dashArray);
+        }
+        // parse effectStyle if not default
+        else if ( ee.tagName() == "penEffect" )
+        {
+            s.setLineEffect((LineEffect)ee.attribute( "effect" ).toInt());
+            s.setEffectIntensity(ee.attribute( "intensity" ).toDouble());
+        }
+        // parse window if present
+        else if ( ee.tagName() == "window" )
+        {
+            QRectF geom;
+            geom.setX(ee.attribute( "top" ).toDouble());
+            geom.setY(ee.attribute( "left" ).toDouble());
+
+            if (ee.hasAttribute("widthDouble"))
+                geom.setWidth(ee.attribute( "widthDouble" ).toDouble());
+            else
+                geom.setWidth(ee.attribute( "width" ).toDouble());
+
+            if (ee.hasAttribute("widthDouble"))
+                geom.setHeight(ee.attribute( "heightDouble" ).toDouble());
+            else
+                geom.setHeight(ee.attribute( "height" ).toDouble());
+
+            w.setGeometry(geom);
+
+            w.setFlags(ee.attribute( "flags" ).toInt());
+            w.setTitle(ee.attribute( "title" ));
+            w.setSummary(ee.attribute( "summary" ));
+            // parse window subnodes
+            QDomNode winNode = ee.firstChild();
+            for ( ; winNode.isElement(); winNode = winNode.nextSibling() )
+            {
+                QDomElement winElement = winNode.toElement();
+                if ( winElement.tagName() == "text" )
+                    w.setText(winElement.firstChild().toCDATASection().data());
+            }
+        }
+    }
+
+    setStyle(s);  // assign parsed style
+    setPopup(w); // assign parsed window
+
+    // get the [revisions] element of the annotation node
+    QDomNode revNode = annNode.firstChild();
+    for ( ; revNode.isElement(); revNode = revNode.nextSibling() )
+    {
+        QDomElement revElement = revNode.toElement();
+        if ( revElement.tagName() != "revision" )
+            continue;
+
+        Annotation *reply = AnnotationUtils::createAnnotation( revElement );
+
+        if (reply) // if annotation is valid, add as a revision of this annotation
+        {
+            RevScope scope = (RevScope)revElement.attribute( "revScope" ).toInt();
+            RevType type = (RevType)revElement.attribute( "revType" ).toInt();
+            d->addRevision(reply, scope, type);
+            delete reply;
+        }
+    }
+}
+
+void Annotation::storeBaseAnnotationProperties( QDomNode & annNode, QDomDocument & document ) const
+{
+    // create [base] element of the annotation node
+    QDomElement e = document.createElement( "base" );
+    annNode.appendChild( e );
+
+    const Style s = style();
+    const Popup w = popup();
+
+    // store -contents- attributes
+    if ( !author().isEmpty() )
+        e.setAttribute( "author", author() );
+    if ( !contents().isEmpty() )
+        e.setAttribute( "contents", contents() );
+    if ( !uniqueName().isEmpty() )
+        e.setAttribute( "uniqueName", uniqueName() );
+    if ( modificationDate().isValid() )
+        e.setAttribute( "modifyDate", modificationDate().toString() );
+    if ( creationDate().isValid() )
+        e.setAttribute( "creationDate", creationDate().toString() );
+
+    // store -other- attributes
+    if ( flags() )
+        e.setAttribute( "flags", flags() );
+    if ( s.color().isValid() )
+        e.setAttribute( "color", s.color().name() );
+    if ( s.opacity() != 1.0 )
+        e.setAttribute( "opacity", QString::number( s.opacity() ) );
+
+    // Sub-Node-1 - boundary
+    const QRectF brect = boundary();
+    QDomElement bE = document.createElement( "boundary" );
+    e.appendChild( bE );
+    bE.setAttribute( "l", QString::number( (double)brect.left() ) );
+    bE.setAttribute( "t", QString::number( (double)brect.top() ) );
+    bE.setAttribute( "r", QString::number( (double)brect.right() ) );
+    bE.setAttribute( "b", QString::number( (double)brect.bottom() ) );
+
+    // Sub-Node-2 - penStyle
+    const QVector<double> dashArray = s.dashArray();
+    if ( s.width() != 1 || s.lineStyle() != Solid || s.xCorners() != 0 ||
+         s.yCorners() != 0.0 || dashArray.size() != 1 || dashArray[0] != 3 )
+    {
+        QDomElement psE = document.createElement( "penStyle" );
+        e.appendChild( psE );
+        psE.setAttribute( "width", QString::number( s.width() ) );
+        psE.setAttribute( "style", (int)s.lineStyle() );
+        psE.setAttribute( "xcr", QString::number( s.xCorners() ) );
+        psE.setAttribute( "ycr", QString::number( s.yCorners() ) );
+
+        int marks = 3, spaces = 0; // Do not break code relying on marks/spaces
+        if (dashArray.size() != 0)
+            marks = (int)dashArray[0];
+        if (dashArray.size() > 1)
+            spaces = (int)dashArray[1];
+
+        psE.setAttribute( "marks", marks );
+        psE.setAttribute( "spaces", spaces );
+
+        foreach (double segm, dashArray)
+        {
+            QDomElement pattE = document.createElement( "dashsegm" );
+            pattE.setAttribute( "len", QString::number( segm ) );
+            psE.appendChild(pattE);
+        }
+    }
+
+    // Sub-Node-3 - penEffect
+    if ( s.lineEffect() != NoEffect || s.effectIntensity() != 1.0 )
+    {
+        QDomElement peE = document.createElement( "penEffect" );
+        e.appendChild( peE );
+        peE.setAttribute( "effect", (int)s.lineEffect() );
+        peE.setAttribute( "intensity", QString::number( s.effectIntensity() ) );
+    }
+
+    // Sub-Node-4 - window
+    if ( w.flags() != -1 || !w.title().isEmpty() || !w.summary().isEmpty() ||
+         !w.text().isEmpty() )
+    {
+        QDomElement wE = document.createElement( "window" );
+        const QRectF geom = w.geometry();
+        e.appendChild( wE );
+        wE.setAttribute( "flags", w.flags() );
+        wE.setAttribute( "top", QString::number( geom.x() ) );
+        wE.setAttribute( "left", QString::number( geom.y() ) );
+        wE.setAttribute( "width", (int)geom.width() );
+        wE.setAttribute( "height", (int)geom.height() );
+        wE.setAttribute( "widthDouble", QString::number( geom.width() ) );
+        wE.setAttribute( "heightDouble", QString::number( geom.height() ) );
+        wE.setAttribute( "title", w.title() );
+        wE.setAttribute( "summary", w.summary() );
+        // store window.text as a subnode, because we need escaped data
+        if ( !w.text().isEmpty() )
+        {
+            QDomElement escapedText = document.createElement( "text" );
+            wE.appendChild( escapedText );
+            QDomCDATASection textCData = document.createCDATASection( w.text() );
+            escapedText.appendChild( textCData );
+        }
+    }
+
+    const QList<Annotation*> revs = revisions();
+
+    // create [revision] element of the annotation node (if any)
+    if ( revs.isEmpty() )
+        return;
+
+    // add all revisions as children of revisions element
+    foreach (const Annotation *rev, revs)
+    {
+        QDomElement r = document.createElement( "revision" );
+        annNode.appendChild( r );
+        // set element attributes
+        r.setAttribute( "revScope", (int)rev->revisionScope() );
+        r.setAttribute( "revType", (int)rev->revisionType() );
+        // use revision as the annotation element, so fill it up
+        AnnotationUtils::storeAnnotation( rev, r, document );
+        delete rev;
+    }
+}
+
+QString Annotation::author() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->author;
+
+    const AnnotMarkup *markupann = dynamic_cast<const AnnotMarkup*>(d->pdfAnnot);
+    return markupann ? UnicodeParsedString( markupann->getLabel() ) : QString();
+}
+
+void Annotation::setAuthor( const QString &author )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->author = author;
+        return;
+    }
+
+    AnnotMarkup *markupann = dynamic_cast<AnnotMarkup*>(d->pdfAnnot);
+    if (markupann)
+    {
+        GooString *s = QStringToUnicodeGooString(author);
+        markupann->setLabel(s);
+        delete s;
+    }
+}
+
+QString Annotation::contents() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->contents;
+
+    return UnicodeParsedString( d->pdfAnnot->getContents() );
+}
+
+void Annotation::setContents( const QString &contents )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->contents = contents;
+        return;
+    }
+
+    GooString *s = QStringToUnicodeGooString(contents);
+    d->pdfAnnot->setContents(s);
+    delete s;
+}
+
+QString Annotation::uniqueName() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->uniqueName;
+
+    return UnicodeParsedString( d->pdfAnnot->getName() );
+}
+
+void Annotation::setUniqueName( const QString &uniqueName )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->uniqueName = uniqueName;
+        return;
+    }
+
+    QByteArray ascii = uniqueName.toLatin1();
+    GooString s(ascii.constData());
+    d->pdfAnnot->setName(&s);
+}
+
+QDateTime Annotation::modificationDate() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->modDate;
+
+    if ( d->pdfAnnot->getModified() )
+        return convertDate( d->pdfAnnot->getModified()->getCString() );
+    else
+        return QDateTime();
+}
+
+void Annotation::setModificationDate( const QDateTime &date )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->modDate = date;
+        return;
+    }
+
+#if 0 // TODO: Conversion routine is broken
+    if (d->pdfAnnot)
+    {
+        time_t t = date.toTime_t();
+        GooString *s = timeToDateString(&t);
+        d->pdfAnnot->setModified(s);
+        delete s;
+    }
+#endif
+}
+
+QDateTime Annotation::creationDate() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->creationDate;
+
+    const AnnotMarkup *markupann = dynamic_cast<const AnnotMarkup*>(d->pdfAnnot);
+
+    if (markupann && markupann->getDate())
+        return convertDate( markupann->getDate()->getCString() );
+
+    return modificationDate();
+}
+
+void Annotation::setCreationDate( const QDateTime &date )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->creationDate = date;
+        return;
+    }
+
+#if 0 // TODO: Conversion routine is broken
+    AnnotMarkup *markupann = dynamic_cast<AnnotMarkup*>(d->pdfAnnot);
+    if (markupann)
+    {
+        time_t t = date.toTime_t();
+        GooString *s = timeToDateString(&t);
+        markupann->setDate(s);
+        delete s;
+    }
+#endif
+}
+
+static int fromPdfFlags(int flags)
+{
+    int qtflags = 0;
+
+    if ( flags & Annot::flagHidden )
+        qtflags |= Annotation::Hidden;
+    if ( flags & Annot::flagNoZoom )
+        qtflags |= Annotation::FixedSize;
+    if ( flags & Annot::flagNoRotate )
+        qtflags |= Annotation::FixedRotation;
+    if ( !( flags & Annot::flagPrint ) )
+        qtflags |= Annotation::DenyPrint;
+    if ( flags & Annot::flagReadOnly )
+        qtflags |= (Annotation::DenyWrite | Annotation::DenyDelete);
+    if ( flags & Annot::flagLocked )
+        qtflags |= Annotation::DenyDelete;
+    if ( flags & Annot::flagToggleNoView )
+        qtflags |= Annotation::ToggleHidingOnMouse;
+
+    return qtflags;
+}
+
+static int toPdfFlags(int qtflags)
+{
+    int flags = 0;
+
+    if ( qtflags & Annotation::Hidden )
+        flags |= Annot::flagHidden;
+    if ( qtflags & Annotation::FixedSize )
+        flags |= Annot::flagNoZoom;
+    if ( qtflags & Annotation::FixedRotation )
+        flags |= Annot::flagNoRotate;
+    if ( !( qtflags & Annotation::DenyPrint ) )
+        flags |= Annot::flagPrint;
+    if ( qtflags & Annotation::DenyWrite )
+        flags |= Annot::flagReadOnly;
+    if ( qtflags & Annotation::DenyDelete )
+        flags |= Annot::flagLocked;
+    if ( qtflags & Annotation::ToggleHidingOnMouse )
+        flags |= Annot::flagToggleNoView;
+
+    return flags;
+}
+
+int Annotation::flags() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->flags;
+
+    return fromPdfFlags( d->pdfAnnot->getFlags() );
+}
+
+void Annotation::setFlags( int flags )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->flags = flags;
+        return;
+    }
+
+    d->pdfAnnot->setFlags(toPdfFlags( flags ));
+}
+
+QRectF Annotation::boundary() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->boundary;
+
+    const PDFRectangle * rect = d->pdfAnnot->getRect();
+    return d->fromPdfRectangle( *rect );
+}
+
+void Annotation::setBoundary( const QRectF &boundary )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->boundary = boundary;
+        return;
+    }
+
+    PDFRectangle rect = d->boundaryToPdfRectangle( boundary, flags() );
+    d->pdfAnnot->setRect(&rect);
+}
+
+Annotation::Style Annotation::style() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->style;
+
+    Style s;
+    s.setColor(convertAnnotColor( d->pdfAnnot->getColor() ));
+
+    const AnnotMarkup *markupann = dynamic_cast<const AnnotMarkup*>(d->pdfAnnot);
+    if (markupann)
+        s.setOpacity( markupann->getOpacity() );
+
+    const AnnotBorder *border = d->pdfAnnot->getBorder();
+    if (border)
+    {
+        if ( border->getType() == AnnotBorder::typeArray )
+        {
+            const AnnotBorderArray *border_array = static_cast<const AnnotBorderArray*>(border);
+            s.setXCorners( border_array->getHorizontalCorner() );
+            s.setYCorners( border_array->getVerticalCorner() );
+        }
+
+        s.setWidth( border->getWidth() );
+        s.setLineStyle((Annotation::LineStyle)( 1 << border->getStyle() ));
+
+        const int dashArrLen = border->getDashLength();
+        const double* dashArrData = border->getDash();
+        QVector<double> dashArrVect( dashArrLen );
+        for (int i = 0; i < dashArrLen; ++i)
+            dashArrVect[i] = dashArrData[i];
+        s.setDashArray(dashArrVect);
+    }
+
+    AnnotBorderEffect *border_effect;
+    switch (d->pdfAnnot->getType())
+    {
+        case Annot::typeFreeText:
+            border_effect = static_cast<AnnotFreeText*>(d->pdfAnnot)->getBorderEffect();
+            break;
+        case Annot::typeSquare:
+        case Annot::typeCircle:
+            border_effect = static_cast<AnnotGeometry*>(d->pdfAnnot)->getBorderEffect();
+            break;
+        default:
+            border_effect = 0;
+    }
+    if (border_effect)
+    {
+        s.setLineEffect( (Annotation::LineEffect)border_effect->getEffectType() );
+        s.setEffectIntensity( border_effect->getIntensity() );
+    }
+
+    return s;
+}
+
+void Annotation::setStyle( const Annotation::Style& style )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->style = style;
+        return;
+    }
+
+    d->pdfAnnot->setColor(convertQColor( style.color() ));
+
+    AnnotMarkup *markupann = dynamic_cast<AnnotMarkup*>(d->pdfAnnot);
+    if (markupann)
+        markupann->setOpacity( style.opacity() );
+
+    AnnotBorderArray * border = new AnnotBorderArray();
+    border->setWidth( style.width() );
+    border->setHorizontalCorner( style.xCorners() );
+    border->setVerticalCorner( style.yCorners() );
+    d->pdfAnnot->setBorder(border);
+}
+
+Annotation::Popup Annotation::popup() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->popup;
+
+    Popup w;
+    AnnotPopup *popup = 0;
+    int flags = -1; // Not initialized
+
+    const AnnotMarkup *markupann = dynamic_cast<const AnnotMarkup*>(d->pdfAnnot);
+    if (markupann)
+    {
+        popup = markupann->getPopup();
+        w.setSummary(UnicodeParsedString( markupann->getSubject() ));
+    }
+
+    if (popup)
+    {
+        flags = fromPdfFlags( popup->getFlags() ) & ( Annotation::Hidden |
+                Annotation::FixedSize | Annotation::FixedRotation );
+
+        if (!popup->getOpen())
+            flags |= Annotation::Hidden;
+
+        const PDFRectangle * rect = popup->getRect();
+        w.setGeometry( d->fromPdfRectangle( *rect ) );
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeText)
+    {
+        const AnnotText * textann = static_cast<const AnnotText*>(d->pdfAnnot);
+
+        // Text annotations default to same rect as annotation
+        if (flags == -1)
+        {
+            flags = 0;
+            w.setGeometry( boundary() );
+        }
+
+        // If text is not 'opened', force window hiding. if the window
+        // was parsed from popup, the flag should already be set
+        if ( !textann->getOpen() && flags != -1 )
+            flags |= Annotation::Hidden;
+    }
+
+    w.setFlags(flags);
+
+    return w;
+}
+
+void Annotation::setPopup( const Annotation::Popup& popup )
+{
+    Q_D( Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->popup = popup;
+        return;
+    }
+
+#if 0 /* TODO: Remove old popup and add AnnotPopup to page */
+    AnnotMarkup *markupann = dynamic_cast<AnnotMarkup*>(d->pdfAnnot);
+    if (!markupann)
+        return;
+
+    // Create a new AnnotPopup and assign it to pdfAnnot
+    PDFRectangle rect = d->toPdfRectangle( popup.geometry() );
+    AnnotPopup * p = new AnnotPopup( d->pdfPage->getDoc(), &rect );
+    p->setOpen( !(popup.flags() & Annotation::Hidden) );
+    if (!popup.summary().isEmpty())
+    {
+        GooString *s = QStringToUnicodeGooString(popup.summary());
+        markupann->setLabel(s);
+        delete s;
+    }
+    markupann->setPopup(p);
+#endif
+}
+
+Annotation::RevScope Annotation::revisionScope() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->revisionScope;
+
+    const AnnotMarkup *markupann = dynamic_cast<const AnnotMarkup*>(d->pdfAnnot);
+
+    if (markupann && markupann->getInReplyToID() != 0)
+    {
+        switch (markupann->getReplyTo())
+        {
+            case AnnotMarkup::replyTypeR:
+                return Annotation::Reply;
+            case AnnotMarkup::replyTypeGroup:
+                return Annotation::Group;
+        }
+    }
+
+    return Annotation::Root; // It's not a revision
+}
+
+Annotation::RevType Annotation::revisionType() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+        return d->revisionType;
+
+    const AnnotText *textann = dynamic_cast<const AnnotText*>(d->pdfAnnot);
+
+    if (textann && textann->getInReplyToID() != 0)
+    {
+        switch (textann->getState())
+        {
+            case AnnotText::stateMarked:
+                return Annotation::Marked;
+            case AnnotText::stateUnmarked:
+                return Annotation::Unmarked;
+            case AnnotText::stateAccepted:
+                return Annotation::Accepted;
+            case AnnotText::stateRejected:
+                return Annotation::Rejected;
+            case AnnotText::stateCancelled:
+                return Annotation::Cancelled;
+            case AnnotText::stateCompleted:
+                return Annotation::Completed;
+            default:
+                break;
+        }
+    }
+
+    return Annotation::None;
+}
+
+QList<Annotation*> Annotation::revisions() const
+{
+    Q_D( const Annotation );
+
+    if (!d->pdfAnnot)
+    {
+        /* Return aliases, whose ownership goes to the caller */
+        QList<Annotation*> res;
+        foreach (Annotation *rev, d->revisions)
+            res.append( rev->d_ptr->makeAlias() );
+        return res;
+    }
+
+    /* If the annotation doesn't live in a object on its own (eg bug51361), it
+     * has no ref, therefore it can't have revisions */
+    if ( !d->pdfAnnot->getHasRef() )
+        return QList<Annotation*>();
+
+    return AnnotationPrivate::findAnnotations( d->pdfPage, d->parentDoc, d->pdfAnnot->getId() );
+}
+
+//END Annotation implementation
+
+
+/** TextAnnotation [Annotation] */
+class TextAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        TextAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        TextAnnotation::TextType textType;
+        QString textIcon;
+        QFont textFont;
+        int inplaceAlign; // 0:left, 1:center, 2:right
+        QVector<QPointF> inplaceCallout;
+        TextAnnotation::InplaceIntent inplaceIntent;
+
+        // Helper
+        static GooString * toAppearanceString(const QFont &font);
+};
+
+TextAnnotationPrivate::TextAnnotationPrivate()
+    : AnnotationPrivate(), textType( TextAnnotation::Linked ),
+    textIcon( "Note" ), inplaceAlign( 0 ),
+    inplaceIntent( TextAnnotation::Unknown )
+{
+}
+
+Annotation * TextAnnotationPrivate::makeAlias()
+{
+    return new TextAnnotation(*this);
+}
+
+GooString * TextAnnotationPrivate::toAppearanceString(const QFont &font)
+{
+    GooString * s = GooString::format("/Invalid_font {0:d} Tf", font.pointSize());
+    // TODO: Font family, style (bold, italic, ...) and pointSize as float
+    return s;
+}
+
+Annot* TextAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    // Setters are defined in the public class
+    TextAnnotation *q = static_cast<TextAnnotation*>( makeAlias() );
+
+    // Set page and contents
+    pdfPage = destPage;
+    parentDoc = doc;
+
+    // Set pdfAnnot
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    if (textType == TextAnnotation::Linked)
+    {
+        pdfAnnot = new AnnotText(destPage->getDoc(), &rect);
+    }
+    else
+    {
+        GooString * da = toAppearanceString(textFont);
+        pdfAnnot = new AnnotFreeText(destPage->getDoc(), &rect, da);
+        delete da;
+    }
+
+    // Set properties
+    flushBaseAnnotationProperties();
+    q->setTextIcon(textIcon);
+    q->setInplaceAlign(inplaceAlign);
+    q->setCalloutPoints(inplaceCallout);
+    q->setInplaceIntent(inplaceIntent);
+
+    delete q;
+
+    inplaceCallout.clear(); // Free up memory
+
+    return pdfAnnot;
+}
+
+TextAnnotation::TextAnnotation( TextAnnotation::TextType type )
+    : Annotation( *new TextAnnotationPrivate() )
+{
+    setTextType( type );
+}
+
+TextAnnotation::TextAnnotation(TextAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+TextAnnotation::TextAnnotation( const QDomNode & node )
+    : Annotation( *new TextAnnotationPrivate, node )
+{
+    // loop through the whole children looking for a 'text' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "text" )
+            continue;
+
+        // parse the attributes
+        if ( e.hasAttribute( "type" ) )
+            setTextType((TextAnnotation::TextType)e.attribute( "type" ).toInt());
+        if ( e.hasAttribute( "icon" ) )
+            setTextIcon(e.attribute( "icon" ));
+        if ( e.hasAttribute( "font" ) )
+        {
+            QFont font;
+            font.fromString( e.attribute( "font" ) );
+            setTextFont(font);
+        }
+        if ( e.hasAttribute( "align" ) )
+            setInplaceAlign(e.attribute( "align" ).toInt());
+        if ( e.hasAttribute( "intent" ) )
+            setInplaceIntent((TextAnnotation::InplaceIntent)e.attribute( "intent" ).toInt());
+
+        // parse the subnodes
+        QDomNode eSubNode = e.firstChild();
+        while ( eSubNode.isElement() )
+        {
+            QDomElement ee = eSubNode.toElement();
+            eSubNode = eSubNode.nextSibling();
+
+            if ( ee.tagName() == "escapedText" )
+            {
+                setContents(ee.firstChild().toCDATASection().data());
+            }
+            else if ( ee.tagName() == "callout" )
+            {
+                QVector<QPointF> points(3);
+                points[0] = QPointF(ee.attribute( "ax" ).toDouble(),
+                                    ee.attribute( "ay" ).toDouble());
+                points[1] = QPointF(ee.attribute( "bx" ).toDouble(),
+                                    ee.attribute( "by" ).toDouble());
+                points[2] = QPointF(ee.attribute( "cx" ).toDouble(),
+                                    ee.attribute( "cy" ).toDouble());
+                setCalloutPoints(points);
+            }
+        }
+
+        // loading complete
+        break;
+    }
+}
+
+TextAnnotation::~TextAnnotation()
+{
+}
+
+void TextAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [text] element
+    QDomElement textElement = document.createElement( "text" );
+    node.appendChild( textElement );
+
+    // store the optional attributes
+    if ( textType() != Linked )
+        textElement.setAttribute( "type", (int)textType() );
+    if ( textIcon() != "Note" )
+        textElement.setAttribute( "icon", textIcon() );
+    if ( inplaceAlign() )
+        textElement.setAttribute( "align", inplaceAlign() );
+    if ( inplaceIntent() != Unknown )
+        textElement.setAttribute( "intent", (int)inplaceIntent() );
+
+    textElement.setAttribute( "font", textFont().toString() );
+
+    // Sub-Node-1 - escapedText
+    if ( !contents().isEmpty() )
+    {
+        QDomElement escapedText = document.createElement( "escapedText" );
+        textElement.appendChild( escapedText );
+        QDomCDATASection textCData = document.createCDATASection( contents() );
+        escapedText.appendChild( textCData );
+    }
+
+    // Sub-Node-2 - callout
+    if ( calloutPoint(0).x() != 0.0 )
+    {
+        QDomElement calloutElement = document.createElement( "callout" );
+        textElement.appendChild( calloutElement );
+        calloutElement.setAttribute( "ax", QString::number( calloutPoint(0).x() ) );
+        calloutElement.setAttribute( "ay", QString::number( calloutPoint(0).y() ) );
+        calloutElement.setAttribute( "bx", QString::number( calloutPoint(1).x() ) );
+        calloutElement.setAttribute( "by", QString::number( calloutPoint(1).y() ) );
+        calloutElement.setAttribute( "cx", QString::number( calloutPoint(2).x() ) );
+        calloutElement.setAttribute( "cy", QString::number( calloutPoint(2).y() ) );
+    }
+}
+
+Annotation::SubType TextAnnotation::subType() const
+{
+    return AText;
+}
+
+TextAnnotation::TextType TextAnnotation::textType() const
+{
+    Q_D( const TextAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->textType;
+
+    return d->pdfAnnot->getType() == Annot::typeText ?
+        TextAnnotation::Linked : TextAnnotation::InPlace;
+}
+
+void TextAnnotation::setTextType( TextAnnotation::TextType type )
+{
+    Q_D( TextAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->textType = type;
+        return;
+    }
+
+    // Type cannot be changed if annotation is already tied
+}
+
+QString TextAnnotation::textIcon() const
+{
+    Q_D( const TextAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->textIcon;
+
+    if (d->pdfAnnot->getType() == Annot::typeText)
+    {
+        const AnnotText * textann = static_cast<const AnnotText*>(d->pdfAnnot);
+        return QString::fromLatin1( textann->getIcon()->getCString() );
+    }
+
+    return QString();
+}
+
+void TextAnnotation::setTextIcon( const QString &icon )
+{
+    Q_D( TextAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->textIcon = icon;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeText)
+    {
+        AnnotText * textann = static_cast<AnnotText*>(d->pdfAnnot);
+        QByteArray encoded = icon.toLatin1();
+        GooString s(encoded.constData());
+        textann->setIcon(&s);
+    }
+}
+
+QFont TextAnnotation::textFont() const
+{
+    Q_D( const TextAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->textFont;
+
+    QFont font;
+
+    if (d->pdfAnnot->getType() == Annot::typeFreeText)
+    {
+        const AnnotFreeText * ftextann = static_cast<const AnnotFreeText*>(d->pdfAnnot);
+        const GooString * da = ftextann->getAppearanceString();
+        if (da)
+        {
+            // At the moment, only font size is parsed
+            QString style = QString::fromLatin1( da->getCString() );
+            QRegExp rx("(\\d+)(\\.\\d*)? Tf");
+            if (rx.indexIn(style) != -1)
+                font.setPointSize( rx.cap(1).toInt() );
+            // TODO: Other properties
+        }
+    }
+
+    return font;
+}
+
+void TextAnnotation::setTextFont( const QFont &font )
+{
+    Q_D( TextAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->textFont = font;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() != Annot::typeFreeText)
+        return;
+
+    AnnotFreeText * ftextann = static_cast<AnnotFreeText*>(d->pdfAnnot);
+    GooString * da = TextAnnotationPrivate::toAppearanceString(font);
+    ftextann->setAppearanceString(da);
+    delete da;
+}
+
+int TextAnnotation::inplaceAlign() const
+{
+    Q_D( const TextAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->inplaceAlign;
+
+    if (d->pdfAnnot->getType() == Annot::typeFreeText)
+    {
+        const AnnotFreeText * ftextann = static_cast<const AnnotFreeText*>(d->pdfAnnot);
+        return ftextann->getQuadding();
+    }
+
+    return 0;
+}
+
+void TextAnnotation::setInplaceAlign( int align )
+{
+    Q_D( TextAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->inplaceAlign = align;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeFreeText)
+    {
+        AnnotFreeText * ftextann = static_cast<AnnotFreeText*>(d->pdfAnnot);
+        ftextann->setQuadding((AnnotFreeText::AnnotFreeTextQuadding)align);
+    }
+}
+
+QPointF TextAnnotation::calloutPoint( int id ) const
+{
+    const QVector<QPointF> points = calloutPoints();
+    if ( id < 0 || id >= points.size() )
+        return QPointF();
+    else
+        return points[id];
+}
+
+QVector<QPointF> TextAnnotation::calloutPoints() const
+{
+    Q_D( const TextAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->inplaceCallout;
+
+    if (d->pdfAnnot->getType() == Annot::typeText)
+        return QVector<QPointF>();
+
+    const AnnotFreeText * ftextann = static_cast<const AnnotFreeText*>(d->pdfAnnot);
+    const AnnotCalloutLine *callout = ftextann->getCalloutLine();
+
+    if (!callout)
+        return QVector<QPointF>();
+
+    double MTX[6];
+    d->fillTransformationMTX(MTX);
+
+    const AnnotCalloutMultiLine * callout_v6 = dynamic_cast<const AnnotCalloutMultiLine*>(callout);
+    QVector<QPointF> res(callout_v6 ? 3 : 2);
+    XPDFReader::transform(MTX, callout->getX1(), callout->getY1(), res[0]);
+    XPDFReader::transform(MTX, callout->getX2(), callout->getY2(), res[1]);
+    if (callout_v6)
+        XPDFReader::transform(MTX, callout_v6->getX3(), callout_v6->getY3(), res[2]);
+    return res;
+}
+
+void TextAnnotation::setCalloutPoints( const QVector<QPointF> &points )
+{
+    Q_D( TextAnnotation );
+    if (!d->pdfAnnot)
+    {
+        d->inplaceCallout = points;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() != Annot::typeFreeText)
+        return;
+
+    AnnotFreeText * ftextann = static_cast<AnnotFreeText*>(d->pdfAnnot);
+    const int count = points.size();
+
+    if (count == 0)
+    {
+        ftextann->setCalloutLine(0);
+        return;
+    }
+
+    if (count != 2 && count != 3)
+    {
+        error(errSyntaxError, -1, "Expected zero, two or three points for callout");
+        return;
+    }
+
+    AnnotCalloutLine *callout;
+    double x1, y1, x2, y2;
+    double MTX[6];
+    d->fillTransformationMTX(MTX);
+
+    XPDFReader::invTransform( MTX, points[0], x1, y1 );
+    XPDFReader::invTransform( MTX, points[1], x2, y2 );
+    if (count == 3)
+    {
+        double x3, y3;
+        XPDFReader::invTransform( MTX, points[2], x3, y3 );
+        callout = new AnnotCalloutMultiLine(x1, y1, x2, y2, x3, y3);
+    }
+    else
+    {
+        callout = new AnnotCalloutLine(x1, y1, x2, y2);
+    }
+
+    ftextann->setCalloutLine(callout);
+    delete callout;
+}
+
+TextAnnotation::InplaceIntent TextAnnotation::inplaceIntent() const
+{
+    Q_D( const TextAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->inplaceIntent;
+
+    if (d->pdfAnnot->getType() == Annot::typeFreeText)
+    {
+        const AnnotFreeText * ftextann = static_cast<const AnnotFreeText*>(d->pdfAnnot);
+        return (TextAnnotation::InplaceIntent)ftextann->getIntent();
+    }
+
+    return TextAnnotation::Unknown;
+}
+
+void TextAnnotation::setInplaceIntent( TextAnnotation::InplaceIntent intent )
+{
+    Q_D( TextAnnotation );
+
+    if (d->pdfAnnot)
+    {
+        d->inplaceIntent = intent;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeFreeText)
+    {
+        AnnotFreeText * ftextann = static_cast<AnnotFreeText*>(d->pdfAnnot);
+        ftextann->setIntent((AnnotFreeText::AnnotFreeTextIntent)intent);
+    }
+}
+
+
+/** LineAnnotation [Annotation] */
+class LineAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        LineAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields (note uses border for rendering style)
+        QLinkedList<QPointF> linePoints;
+        LineAnnotation::TermStyle lineStartStyle;
+        LineAnnotation::TermStyle lineEndStyle;
+        bool lineClosed : 1;  // (if true draw close shape)
+        bool lineShowCaption : 1;
+        LineAnnotation::LineType lineType;
+        QColor lineInnerColor;
+        double lineLeadingFwdPt;
+        double lineLeadingBackPt;
+        LineAnnotation::LineIntent lineIntent;
+};
+
+LineAnnotationPrivate::LineAnnotationPrivate()
+    : AnnotationPrivate(), lineStartStyle( LineAnnotation::None ),
+    lineEndStyle( LineAnnotation::None ), lineClosed( false ),
+    lineShowCaption( false ), lineLeadingFwdPt( 0 ),
+    lineLeadingBackPt( 0 ), lineIntent( LineAnnotation::Unknown )
+{
+}
+
+Annotation * LineAnnotationPrivate::makeAlias()
+{
+    return new LineAnnotation(*this);
+}
+
+Annot* LineAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    // Setters are defined in the public class
+    LineAnnotation *q = static_cast<LineAnnotation*>( makeAlias() );
+
+    // Set page and document
+    pdfPage = destPage;
+    parentDoc = doc;
+
+    // Set pdfAnnot
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    if (lineType == LineAnnotation::StraightLine)
+    {
+        pdfAnnot = new AnnotLine(doc->doc, &rect);
+    }
+    else
+    {
+        pdfAnnot = new AnnotPolygon(doc->doc, &rect,
+                lineClosed ? Annot::typePolygon : Annot::typePolyLine );
+    }
+
+    // Set properties
+    flushBaseAnnotationProperties();
+    q->setLinePoints(linePoints);
+    q->setLineStartStyle(lineStartStyle);
+    q->setLineEndStyle(lineEndStyle);
+    q->setLineInnerColor(lineInnerColor);
+    q->setLineLeadingForwardPoint(lineLeadingFwdPt);
+    q->setLineLeadingBackPoint(lineLeadingBackPt);
+    q->setLineShowCaption(lineShowCaption);
+    q->setLineIntent(lineIntent);
+
+    delete q;
+
+    linePoints.clear(); // Free up memory
+
+    return pdfAnnot;
+}
+
+LineAnnotation::LineAnnotation( LineAnnotation::LineType type )
+    : Annotation( *new LineAnnotationPrivate() )
+{
+    setLineType(type);
+}
+
+LineAnnotation::LineAnnotation(LineAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+LineAnnotation::LineAnnotation( const QDomNode & node )
+    : Annotation( *new LineAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'line' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "line" )
+            continue;
+
+        // parse the attributes
+        if ( e.hasAttribute( "startStyle" ) )
+            setLineStartStyle((LineAnnotation::TermStyle)e.attribute( "startStyle" ).toInt());
+        if ( e.hasAttribute( "endStyle" ) )
+            setLineEndStyle((LineAnnotation::TermStyle)e.attribute( "endStyle" ).toInt());
+        if ( e.hasAttribute( "closed" ) )
+            setLineClosed(e.attribute( "closed" ).toInt());
+        if ( e.hasAttribute( "innerColor" ) )
+            setLineInnerColor(QColor( e.attribute( "innerColor" ) ));
+        if ( e.hasAttribute( "leadFwd" ) )
+            setLineLeadingForwardPoint(e.attribute( "leadFwd" ).toDouble());
+        if ( e.hasAttribute( "leadBack" ) )
+            setLineLeadingBackPoint(e.attribute( "leadBack" ).toDouble());
+        if ( e.hasAttribute( "showCaption" ) )
+            setLineShowCaption(e.attribute( "showCaption" ).toInt());
+        if ( e.hasAttribute( "intent" ) )
+            setLineIntent((LineAnnotation::LineIntent)e.attribute( "intent" ).toInt());
+
+        // parse all 'point' subnodes
+        QLinkedList<QPointF> points;
+        QDomNode pointNode = e.firstChild();
+        while ( pointNode.isElement() )
+        {
+            QDomElement pe = pointNode.toElement();
+            pointNode = pointNode.nextSibling();
+
+            if ( pe.tagName() != "point" )
+                continue;
+
+            QPointF p(pe.attribute( "x", "0.0" ).toDouble(), pe.attribute( "y", "0.0" ).toDouble());
+            points.append( p );
+        }
+        setLinePoints(points);
+        setLineType(points.size() == 2 ? StraightLine : Polyline);
+
+        // loading complete
+        break;
+    }
+}
+
+LineAnnotation::~LineAnnotation()
+{
+}
+
+void LineAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [line] element
+    QDomElement lineElement = document.createElement( "line" );
+    node.appendChild( lineElement );
+
+    // store the attributes
+    if ( lineStartStyle() != None )
+        lineElement.setAttribute( "startStyle", (int)lineStartStyle() );
+    if ( lineEndStyle() != None )
+        lineElement.setAttribute( "endStyle", (int)lineEndStyle() );
+    if ( isLineClosed() )
+        lineElement.setAttribute( "closed", isLineClosed() );
+    if ( lineInnerColor().isValid() )
+        lineElement.setAttribute( "innerColor", lineInnerColor().name() );
+    if ( lineLeadingForwardPoint() != 0.0 )
+        lineElement.setAttribute( "leadFwd", QString::number( lineLeadingForwardPoint() ) );
+    if ( lineLeadingBackPoint() != 0.0 )
+        lineElement.setAttribute( "leadBack", QString::number( lineLeadingBackPoint() ) );
+    if ( lineShowCaption() )
+        lineElement.setAttribute( "showCaption", lineShowCaption() );
+    if ( lineIntent() != Unknown )
+        lineElement.setAttribute( "intent", lineIntent() );
+
+    // append the list of points
+    const QLinkedList<QPointF> points = linePoints();
+    if ( points.count() > 1 )
+    {
+        QLinkedList<QPointF>::const_iterator it = points.begin(), end = points.end();
+        while ( it != end )
+        {
+            const QPointF & p = *it;
+            QDomElement pElement = document.createElement( "point" );
+            lineElement.appendChild( pElement );
+            pElement.setAttribute( "x", QString::number( p.x() ) );
+            pElement.setAttribute( "y", QString::number( p.y() ) );
+            ++it;
+        }
+    }
+}
+
+Annotation::SubType LineAnnotation::subType() const
+{
+    return ALine;
+}
+
+LineAnnotation::LineType LineAnnotation::lineType() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineType;
+
+    return (d->pdfAnnot->getType() == Annot::typeLine) ?
+        LineAnnotation::StraightLine : LineAnnotation::Polyline;
+}
+
+void LineAnnotation::setLineType( LineAnnotation::LineType type )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineType = type;
+        return;
+    }
+
+    // Type cannot be changed if annotation is already tied
+}
+
+QLinkedList<QPointF> LineAnnotation::linePoints() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->linePoints;
+
+    double MTX[6];
+    d->fillTransformationMTX(MTX);
+
+    QLinkedList<QPointF> res;
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        QPointF p;
+        XPDFReader::transform(MTX, lineann->getX1(), lineann->getY1(), p);
+        res.append(p);
+        XPDFReader::transform(MTX, lineann->getX2(), lineann->getY2(), p);
+        res.append(p);
+    }
+    else
+    {
+        const AnnotPolygon * polyann = static_cast<const AnnotPolygon*>(d->pdfAnnot);
+        const AnnotPath * vertices = polyann->getVertices();
+
+        for (int i = 0; i < vertices->getCoordsLength(); ++i)
+        {
+            QPointF p;
+            XPDFReader::transform(MTX, vertices->getX(i), vertices->getY(i), p);
+            res.append(p);
+        }
+    }
+
+    return res;
+}
+
+void LineAnnotation::setLinePoints( const QLinkedList<QPointF> &points )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->linePoints = points;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        if (points.size() != 2)
+        {
+            error(errSyntaxError, -1, "Expected two points for a straight line");
+            return;
+        }
+        double x1, y1, x2, y2;
+        double MTX[6];
+        d->fillTransformationMTX(MTX);
+        XPDFReader::invTransform( MTX, points.first(), x1, y1 );
+        XPDFReader::invTransform( MTX, points.last(), x2, y2 );
+        lineann->setVertices(x1, y1, x2, y2);
+    }
+    else
+    {
+        AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
+        AnnotPath * p = d->toAnnotPath(points);
+        polyann->setVertices(p);
+        delete p;
+    }
+}
+
+LineAnnotation::TermStyle LineAnnotation::lineStartStyle() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineStartStyle;
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        return (LineAnnotation::TermStyle)lineann->getStartStyle();
+    }
+    else
+    {
+        const AnnotPolygon * polyann = static_cast<const AnnotPolygon*>(d->pdfAnnot);
+        return (LineAnnotation::TermStyle)polyann->getStartStyle();
+    }
+}
+
+void LineAnnotation::setLineStartStyle( LineAnnotation::TermStyle style )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineStartStyle = style;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        lineann->setStartEndStyle((AnnotLineEndingStyle)style, lineann->getEndStyle());
+    }
+    else
+    {
+        AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
+        polyann->setStartEndStyle((AnnotLineEndingStyle)style, polyann->getEndStyle());
+    }
+}
+
+LineAnnotation::TermStyle LineAnnotation::lineEndStyle() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineEndStyle;
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        return (LineAnnotation::TermStyle)lineann->getEndStyle();
+    }
+    else
+    {
+        const AnnotPolygon * polyann = static_cast<const AnnotPolygon*>(d->pdfAnnot);
+        return (LineAnnotation::TermStyle)polyann->getEndStyle();
+    }
+}
+
+void LineAnnotation::setLineEndStyle( LineAnnotation::TermStyle style )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineEndStyle = style;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        lineann->setStartEndStyle(lineann->getStartStyle(), (AnnotLineEndingStyle)style);
+    }
+    else
+    {
+        AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
+        polyann->setStartEndStyle(polyann->getStartStyle(), (AnnotLineEndingStyle)style);
+    }
+}
+
+bool LineAnnotation::isLineClosed() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineClosed;
+
+    return d->pdfAnnot->getType() == Annot::typePolygon;
+}
+
+void LineAnnotation::setLineClosed( bool closed )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineClosed = closed;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() != Annot::typeLine)
+    {
+        AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
+
+        // Set new subtype and switch intent if necessary
+        if (closed)
+        {
+            polyann->setType(Annot::typePolygon);
+            if (polyann->getIntent() == AnnotPolygon::polylineDimension)
+                polyann->setIntent( AnnotPolygon::polygonDimension );
+        }
+        else
+        {
+            polyann->setType(Annot::typePolyLine);
+            if (polyann->getIntent() == AnnotPolygon::polygonDimension)
+                polyann->setIntent( AnnotPolygon::polylineDimension );
+        }
+    }
+}
+
+QColor LineAnnotation::lineInnerColor() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineInnerColor;
+
+    AnnotColor * c;
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        c = lineann->getInteriorColor();
+    }
+    else
+    {
+        const AnnotPolygon * polyann = static_cast<const AnnotPolygon*>(d->pdfAnnot);
+        c = polyann->getInteriorColor();
+    }
+
+    return convertAnnotColor(c);
+}
+
+void LineAnnotation::setLineInnerColor( const QColor &color )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineInnerColor = color;
+        return;
+    }
+
+    AnnotColor * c = convertQColor(color);
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        lineann->setInteriorColor(c);
+    }
+    else
+    {
+        AnnotPolygon *polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
+        polyann->setInteriorColor(c);
+    }
+}
+
+double LineAnnotation::lineLeadingForwardPoint() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineLeadingFwdPt;
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        return lineann->getLeaderLineLength();
+    }
+
+    return 0;
+}
+
+void LineAnnotation::setLineLeadingForwardPoint( double point )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineLeadingFwdPt = point;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        lineann->setLeaderLineLength(point);
+    }
+}
+
+double LineAnnotation::lineLeadingBackPoint() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineLeadingBackPt;
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        return lineann->getLeaderLineExtension();
+    }
+
+    return 0;
+}
+
+void LineAnnotation::setLineLeadingBackPoint( double point )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineLeadingBackPt = point;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        lineann->setLeaderLineExtension(point);
+    }
+}
+
+bool LineAnnotation::lineShowCaption() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineShowCaption;
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        return lineann->getCaption();
+    }
+
+    return false;
+}
+
+void LineAnnotation::setLineShowCaption( bool show )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineShowCaption = show;
+        return;
+    }
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine *lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        lineann->setCaption(show);
+    }
+}
+
+LineAnnotation::LineIntent LineAnnotation::lineIntent() const
+{
+    Q_D( const LineAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->lineIntent;
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        const AnnotLine * lineann = static_cast<const AnnotLine*>(d->pdfAnnot);
+        return (LineAnnotation::LineIntent)( lineann->getIntent() + 1 );
+    }
+    else
+    {
+        const AnnotPolygon * polyann = static_cast<const AnnotPolygon*>(d->pdfAnnot);
+        if ( polyann->getIntent() == AnnotPolygon::polygonCloud )
+            return LineAnnotation::PolygonCloud;
+        else // AnnotPolygon::polylineDimension, AnnotPolygon::polygonDimension
+            return LineAnnotation::Dimension;
+    }
+}
+
+void LineAnnotation::setLineIntent( LineAnnotation::LineIntent intent )
+{
+    Q_D( LineAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->lineIntent = intent;
+        return;
+    }
+
+    if ( intent == LineAnnotation::Unknown )
+        return; // Do not set (actually, it should clear the property)
+
+    if (d->pdfAnnot->getType() == Annot::typeLine)
+    {
+        AnnotLine * lineann = static_cast<AnnotLine*>(d->pdfAnnot);
+        lineann->setIntent((AnnotLine::AnnotLineIntent)( intent - 1 ));
+    }
+    else
+    {
+        AnnotPolygon * polyann = static_cast<AnnotPolygon*>(d->pdfAnnot);
+        if ( intent == LineAnnotation::PolygonCloud)
+            polyann->setIntent( AnnotPolygon::polygonCloud );
+        else // LineAnnotation::Dimension
+        {
+            if ( d->pdfAnnot->getType() == Annot::typePolygon )
+                polyann->setIntent( AnnotPolygon::polygonDimension );
+            else // Annot::typePolyLine
+                polyann->setIntent( AnnotPolygon::polylineDimension );
+        }
+    }
+}
+
+
+/** GeomAnnotation [Annotation] */
+class GeomAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        GeomAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields (note uses border for rendering style)
+        GeomAnnotation::GeomType geomType;
+        QColor geomInnerColor;
+};
+
+GeomAnnotationPrivate::GeomAnnotationPrivate()
+    : AnnotationPrivate(), geomType( GeomAnnotation::InscribedSquare )
+{
+}
+
+Annotation * GeomAnnotationPrivate::makeAlias()
+{
+    return new GeomAnnotation(*this);
+}
+
+Annot* GeomAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    // Setters are defined in the public class
+    GeomAnnotation *q = static_cast<GeomAnnotation*>( makeAlias() );
+
+    // Set page and document
+    pdfPage = destPage;
+    parentDoc = doc;
+
+    Annot::AnnotSubtype type;
+    if (geomType == GeomAnnotation::InscribedSquare)
+        type = Annot::typeSquare;
+    else // GeomAnnotation::InscribedCircle
+        type = Annot::typeCircle;
+
+    // Set pdfAnnot
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    pdfAnnot = new AnnotGeometry(destPage->getDoc(), &rect, type);
+
+    // Set properties
+    flushBaseAnnotationProperties();
+    q->setGeomInnerColor(geomInnerColor);
+
+    delete q;
+    return pdfAnnot;
+}
+
+GeomAnnotation::GeomAnnotation()
+    : Annotation( *new GeomAnnotationPrivate() )
+{}
+
+GeomAnnotation::GeomAnnotation(GeomAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+GeomAnnotation::GeomAnnotation( const QDomNode & node )
+    : Annotation( *new GeomAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'geom' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "geom" )
+            continue;
+
+        // parse the attributes
+        if ( e.hasAttribute( "type" ) )
+            setGeomType((GeomAnnotation::GeomType)e.attribute( "type" ).toInt());
+        if ( e.hasAttribute( "color" ) )
+            setGeomInnerColor(QColor( e.attribute( "color" ) ));
+
+        // loading complete
+        break;
+    }
+}
+
+GeomAnnotation::~GeomAnnotation()
+{
+}
+
+void GeomAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [geom] element
+    QDomElement geomElement = document.createElement( "geom" );
+    node.appendChild( geomElement );
+
+    // append the optional attributes
+    if ( geomType() != InscribedSquare )
+        geomElement.setAttribute( "type", (int)geomType() );
+    if ( geomInnerColor().isValid() )
+        geomElement.setAttribute( "color", geomInnerColor().name() );
+}
+
+Annotation::SubType GeomAnnotation::subType() const
+{
+    return AGeom;
+}
+
+GeomAnnotation::GeomType GeomAnnotation::geomType() const
+{
+    Q_D( const GeomAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->geomType;
+
+    if (d->pdfAnnot->getType() == Annot::typeSquare)
+        return GeomAnnotation::InscribedSquare;
+    else // Annot::typeCircle
+        return GeomAnnotation::InscribedCircle;
+}
+
+void GeomAnnotation::setGeomType( GeomAnnotation::GeomType type )
+{
+    Q_D( GeomAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->geomType = type;
+        return;
+    }
+
+    AnnotGeometry * geomann = static_cast<AnnotGeometry*>(d->pdfAnnot);
+    if (type == GeomAnnotation::InscribedSquare)
+        geomann->setType(Annot::typeSquare);
+    else // GeomAnnotation::InscribedCircle
+        geomann->setType(Annot::typeCircle);
+}
+
+QColor GeomAnnotation::geomInnerColor() const
+{
+    Q_D( const GeomAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->geomInnerColor;
+
+    const AnnotGeometry * geomann = static_cast<const AnnotGeometry*>(d->pdfAnnot);
+    return convertAnnotColor( geomann->getInteriorColor() );
+}
+
+void GeomAnnotation::setGeomInnerColor( const QColor &color )
+{
+    Q_D( GeomAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->geomInnerColor = color;
+        return;
+    }
+
+    AnnotGeometry * geomann = static_cast<AnnotGeometry*>(d->pdfAnnot);
+    geomann->setInteriorColor(convertQColor( color ));
+}
+
+
+/** HighlightAnnotation [Annotation] */
+class HighlightAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        HighlightAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        HighlightAnnotation::HighlightType highlightType;
+        QList< HighlightAnnotation::Quad > highlightQuads; // not empty
+
+        // helpers
+        static Annot::AnnotSubtype toAnnotSubType( HighlightAnnotation::HighlightType type );
+        QList< HighlightAnnotation::Quad > fromQuadrilaterals(AnnotQuadrilaterals *quads) const;
+        AnnotQuadrilaterals * toQuadrilaterals(const QList< HighlightAnnotation::Quad > &quads) const;
+};
+
+HighlightAnnotationPrivate::HighlightAnnotationPrivate()
+    : AnnotationPrivate(), highlightType( HighlightAnnotation::Highlight )
+{
+}
+
+Annotation * HighlightAnnotationPrivate::makeAlias()
+{
+    return new HighlightAnnotation(*this);
+}
+
+Annot::AnnotSubtype HighlightAnnotationPrivate::toAnnotSubType( HighlightAnnotation::HighlightType type )
+{
+    switch (type)
+    {
+        default: // HighlightAnnotation::Highlight:
+            return Annot::typeHighlight;
+        case HighlightAnnotation::Underline:
+            return Annot::typeUnderline;
+        case HighlightAnnotation::Squiggly:
+            return Annot::typeSquiggly;
+        case HighlightAnnotation::StrikeOut:
+            return Annot::typeStrikeOut;
+    }
+}
+
+QList< HighlightAnnotation::Quad > HighlightAnnotationPrivate::fromQuadrilaterals(AnnotQuadrilaterals *hlquads) const
+{
+    QList< HighlightAnnotation::Quad > quads;
+
+    if ( !hlquads || !hlquads->getQuadrilateralsLength() )
+        return quads;
+    const int quadsCount = hlquads->getQuadrilateralsLength();
+
+    double MTX[6];
+    fillTransformationMTX(MTX);
+
+    for (int q = 0; q < quadsCount; ++q)
+    {
+        HighlightAnnotation::Quad quad;
+        XPDFReader::transform( MTX, hlquads->getX1( q ), hlquads->getY1( q ), quad.points[ 0 ] );
+        XPDFReader::transform( MTX, hlquads->getX2( q ), hlquads->getY2( q ), quad.points[ 1 ] );
+        XPDFReader::transform( MTX, hlquads->getX3( q ), hlquads->getY3( q ), quad.points[ 2 ] );
+        XPDFReader::transform( MTX, hlquads->getX4( q ), hlquads->getY4( q ), quad.points[ 3 ] );
+        // ### PDF1.6 specs says that point are in ccw order, but in fact
+        // points 3 and 4 are swapped in every PDF around!
+        QPointF tmpPoint = quad.points[ 2 ];
+        quad.points[ 2 ] = quad.points[ 3 ];
+        quad.points[ 3 ] = tmpPoint;
+        // initialize other properties and append quad
+        quad.capStart = true;       // unlinked quads are always capped
+        quad.capEnd = true;         // unlinked quads are always capped
+        quad.feather = 0.1;         // default feather
+        quads.append( quad );
+    }
+
+    return quads;
+}
+
+AnnotQuadrilaterals * HighlightAnnotationPrivate::toQuadrilaterals(const QList< HighlightAnnotation::Quad > &quads) const
+{
+    const int count = quads.size();
+    AnnotQuadrilaterals::AnnotQuadrilateral **ac =
+        (AnnotQuadrilaterals::AnnotQuadrilateral**)
+            gmallocn( count, sizeof(AnnotQuadrilaterals::AnnotQuadrilateral*) );
+
+    double MTX[6];
+    fillTransformationMTX(MTX);
+
+    int pos = 0;
+    foreach (const HighlightAnnotation::Quad &q, quads)
+    {
+        double x1, y1, x2, y2, x3, y3, x4, y4;
+        XPDFReader::invTransform( MTX, q.points[0], x1, y1 );
+        XPDFReader::invTransform( MTX, q.points[1], x2, y2 );
+        // Swap points 3 and 4 (see HighlightAnnotationPrivate::fromQuadrilaterals)
+        XPDFReader::invTransform( MTX, q.points[3], x3, y3 );
+        XPDFReader::invTransform( MTX, q.points[2], x4, y4 );
+        ac[pos++] = new AnnotQuadrilaterals::AnnotQuadrilateral(x1, y1, x2, y2, x3, y3, x4, y4);
+    }
+
+    return new AnnotQuadrilaterals(ac, count);
+}
+
+Annot* HighlightAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    // Setters are defined in the public class
+    HighlightAnnotation *q = static_cast<HighlightAnnotation*>( makeAlias() );
+
+    // Set page and document
+    pdfPage = destPage;
+    parentDoc = doc;
+
+    // Set pdfAnnot
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    pdfAnnot = new AnnotTextMarkup(destPage->getDoc(), &rect, toAnnotSubType(highlightType));
+
+    // Set properties
+    flushBaseAnnotationProperties();
+    q->setHighlightQuads(highlightQuads);
+
+    highlightQuads.clear(); // Free up memory
+
+    delete q;
+
+    return pdfAnnot;
+}
+
+HighlightAnnotation::HighlightAnnotation()
+    : Annotation( *new HighlightAnnotationPrivate() )
+{}
+
+HighlightAnnotation::HighlightAnnotation(HighlightAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+HighlightAnnotation::HighlightAnnotation( const QDomNode & node )
+    : Annotation( *new HighlightAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'hl' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "hl" )
+            continue;
+
+        // parse the attributes
+        if ( e.hasAttribute( "type" ) )
+            setHighlightType((HighlightAnnotation::HighlightType)e.attribute( "type" ).toInt());
+
+        // parse all 'quad' subnodes
+        QList<HighlightAnnotation::Quad> quads;
+        QDomNode quadNode = e.firstChild();
+        for ( ; quadNode.isElement(); quadNode = quadNode.nextSibling() )
+        {
+            QDomElement qe = quadNode.toElement();
+            if ( qe.tagName() != "quad" )
+                continue;
+
+            Quad q;
+            q.points[0].setX(qe.attribute( "ax", "0.0" ).toDouble());
+            q.points[0].setY(qe.attribute( "ay", "0.0" ).toDouble());
+            q.points[1].setX(qe.attribute( "bx", "0.0" ).toDouble());
+            q.points[1].setY(qe.attribute( "by", "0.0" ).toDouble());
+            q.points[2].setX(qe.attribute( "cx", "0.0" ).toDouble());
+            q.points[2].setY(qe.attribute( "cy", "0.0" ).toDouble());
+            q.points[3].setX(qe.attribute( "dx", "0.0" ).toDouble());
+            q.points[3].setY(qe.attribute( "dy", "0.0" ).toDouble());
+            q.capStart = qe.hasAttribute( "start" );
+            q.capEnd = qe.hasAttribute( "end" );
+            q.feather = qe.attribute( "feather", "0.1" ).toDouble();
+            quads.append( q );
+        }
+        setHighlightQuads(quads);
+
+        // loading complete
+        break;
+    }
+}
+
+HighlightAnnotation::~HighlightAnnotation()
+{
+}
+
+void HighlightAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [hl] element
+    QDomElement hlElement = document.createElement( "hl" );
+    node.appendChild( hlElement );
+
+    // append the optional attributes
+    if ( highlightType() != Highlight )
+        hlElement.setAttribute( "type", (int)highlightType() );
+
+    const QList<HighlightAnnotation::Quad> quads = highlightQuads();
+    if ( quads.count() < 1 )
+        return;
+    // append highlight quads, all children describe quads
+    QList< HighlightAnnotation::Quad >::const_iterator it = quads.begin(), end = quads.end();
+    for ( ; it != end; ++it )
+    {
+        QDomElement quadElement = document.createElement( "quad" );
+        hlElement.appendChild( quadElement );
+        const Quad & q = *it;
+        quadElement.setAttribute( "ax", QString::number( q.points[0].x() ) );
+        quadElement.setAttribute( "ay", QString::number( q.points[0].y() ) );
+        quadElement.setAttribute( "bx", QString::number( q.points[1].x() ) );
+        quadElement.setAttribute( "by", QString::number( q.points[1].y() ) );
+        quadElement.setAttribute( "cx", QString::number( q.points[2].x() ) );
+        quadElement.setAttribute( "cy", QString::number( q.points[2].y() ) );
+        quadElement.setAttribute( "dx", QString::number( q.points[3].x() ) );
+        quadElement.setAttribute( "dy", QString::number( q.points[3].y() ) );
+        if ( q.capStart )
+            quadElement.setAttribute( "start", 1 );
+        if ( q.capEnd )
+            quadElement.setAttribute( "end", 1 );
+        quadElement.setAttribute( "feather", QString::number( q.feather ) );
+    }
+}
+
+Annotation::SubType HighlightAnnotation::subType() const
+{
+    return AHighlight;
+}
+
+HighlightAnnotation::HighlightType HighlightAnnotation::highlightType() const
+{
+    Q_D( const HighlightAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->highlightType;
+
+    Annot::AnnotSubtype subType = d->pdfAnnot->getType();
+
+    if ( subType == Annot::typeHighlight )
+        return HighlightAnnotation::Highlight;
+    else if ( subType == Annot::typeUnderline )
+        return HighlightAnnotation::Underline;
+    else if ( subType == Annot::typeSquiggly )
+        return HighlightAnnotation::Squiggly;
+    else // Annot::typeStrikeOut
+        return HighlightAnnotation::StrikeOut;
+}
+
+void HighlightAnnotation::setHighlightType( HighlightAnnotation::HighlightType type )
+{
+    Q_D( HighlightAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->highlightType = type;
+        return;
+    }
+
+    AnnotTextMarkup * hlann = static_cast<AnnotTextMarkup*>(d->pdfAnnot);
+    hlann->setType(HighlightAnnotationPrivate::toAnnotSubType( type ));
+}
+
+QList< HighlightAnnotation::Quad > HighlightAnnotation::highlightQuads() const
+{
+    Q_D( const HighlightAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->highlightQuads;
+
+    const AnnotTextMarkup * hlann = static_cast<AnnotTextMarkup*>(d->pdfAnnot);
+    return d->fromQuadrilaterals( hlann->getQuadrilaterals() );
+}
+
+void HighlightAnnotation::setHighlightQuads( const QList< HighlightAnnotation::Quad > &quads )
+{
+    Q_D( HighlightAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->highlightQuads = quads;
+        return;
+    }
+
+    AnnotTextMarkup * hlann = static_cast<AnnotTextMarkup*>(d->pdfAnnot);
+    AnnotQuadrilaterals * quadrilaterals = d->toQuadrilaterals(quads);
+    hlann->setQuadrilaterals(quadrilaterals);
+    delete quadrilaterals;
+}
+
+
+/** StampAnnotation [Annotation] */
+class StampAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        StampAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        QString stampIconName;
+};
+
+StampAnnotationPrivate::StampAnnotationPrivate()
+    : AnnotationPrivate(), stampIconName( "Draft" )
+{
+}
+
+Annotation * StampAnnotationPrivate::makeAlias()
+{
+    return new StampAnnotation(*this);
+}
+
+Annot* StampAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    StampAnnotation *q = static_cast<StampAnnotation*>( makeAlias() );
+
+    // Set page and document
+    pdfPage = destPage;
+    parentDoc = doc;
+
+    // Set pdfAnnot
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    pdfAnnot = new AnnotStamp(destPage->getDoc(), &rect);
+
+    // Set properties
+    flushBaseAnnotationProperties();
+    q->setStampIconName(stampIconName);
+
+    delete q;
+
+    stampIconName.clear(); // Free up memory
+
+    return pdfAnnot;
+}
+
+StampAnnotation::StampAnnotation()
+    : Annotation( *new StampAnnotationPrivate() )
+{}
+
+StampAnnotation::StampAnnotation(StampAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+StampAnnotation::StampAnnotation( const QDomNode & node )
+    : Annotation( *new StampAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'stamp' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "stamp" )
+            continue;
+
+        // parse the attributes
+        if ( e.hasAttribute( "icon" ) )
+            setStampIconName(e.attribute( "icon" ));
+
+        // loading complete
+        break;
+    }
+}
+
+StampAnnotation::~StampAnnotation()
+{
+}
+
+void StampAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [stamp] element
+    QDomElement stampElement = document.createElement( "stamp" );
+    node.appendChild( stampElement );
+
+    // append the optional attributes
+    if ( stampIconName() != "Draft" )
+        stampElement.setAttribute( "icon", stampIconName() );
+}
+
+Annotation::SubType StampAnnotation::subType() const
+{
+    return AStamp;
+}
+
+QString StampAnnotation::stampIconName() const
+{
+    Q_D( const StampAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->stampIconName;
+
+    const AnnotStamp * stampann = static_cast<const AnnotStamp*>(d->pdfAnnot);
+    return QString::fromLatin1( stampann->getIcon()->getCString() );
+}
+
+void StampAnnotation::setStampIconName( const QString &name )
+{
+    Q_D( StampAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->stampIconName = name;
+        return;
+    }
+
+    AnnotStamp * stampann = static_cast<AnnotStamp*>(d->pdfAnnot);
+    QByteArray encoded = name.toLatin1();
+    GooString s(encoded.constData());
+    stampann->setIcon(&s);
+}
+
+/** InkAnnotation [Annotation] */
+class InkAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        InkAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        QList< QLinkedList<QPointF> > inkPaths;
+
+        // helper
+        AnnotPath **toAnnotPaths(const QList< QLinkedList<QPointF> > &inkPaths);
+};
+
+InkAnnotationPrivate::InkAnnotationPrivate()
+    : AnnotationPrivate()
+{
+}
+
+Annotation * InkAnnotationPrivate::makeAlias()
+{
+    return new InkAnnotation(*this);
+}
+
+// Note: Caller is required to delete array elements and the array itself after use
+AnnotPath **InkAnnotationPrivate::toAnnotPaths(const QList< QLinkedList<QPointF> > &inkPaths)
+{
+    const int pathsNumber = inkPaths.size();
+    AnnotPath **res = new AnnotPath*[pathsNumber];
+    for (int i = 0; i < pathsNumber; ++i)
+        res[i] = toAnnotPath( inkPaths[i] );
+    return res;
+}
+
+Annot* InkAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    // Setters are defined in the public class
+    InkAnnotation *q = static_cast<InkAnnotation*>( makeAlias() );
+
+    // Set page and document
+    pdfPage = destPage;
+    parentDoc = doc;
+
+    // Set pdfAnnot
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    pdfAnnot = new AnnotInk(destPage->getDoc(), &rect);
+
+    // Set properties
+    flushBaseAnnotationProperties();
+    q->setInkPaths(inkPaths);
+
+    inkPaths.clear(); // Free up memory
+
+    delete q;
+
+    return pdfAnnot;
+}
+
+InkAnnotation::InkAnnotation()
+    : Annotation( *new InkAnnotationPrivate() )
+{}
+
+InkAnnotation::InkAnnotation(InkAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+InkAnnotation::InkAnnotation( const QDomNode & node )
+    : Annotation( *new InkAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'ink' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "ink" )
+            continue;
+
+        // parse the 'path' subnodes
+        QList< QLinkedList<QPointF> > paths;
+        QDomNode pathNode = e.firstChild();
+        while ( pathNode.isElement() )
+        {
+            QDomElement pathElement = pathNode.toElement();
+            pathNode = pathNode.nextSibling();
+
+            if ( pathElement.tagName() != "path" )
+                continue;
+
+            // build each path parsing 'point' subnodes
+            QLinkedList<QPointF> path;
+            QDomNode pointNode = pathElement.firstChild();
+            while ( pointNode.isElement() )
+            {
+                QDomElement pointElement = pointNode.toElement();
+                pointNode = pointNode.nextSibling();
+
+                if ( pointElement.tagName() != "point" )
+                    continue;
+
+                QPointF p(pointElement.attribute( "x", "0.0" ).toDouble(), pointElement.attribute( "y", "0.0" ).toDouble());
+                path.append( p );
+            }
+
+            // add the path to the path list if it contains at least 2 nodes
+            if ( path.count() >= 2 )
+                paths.append( path );
+        }
+        setInkPaths(paths);
+
+        // loading complete
+        break;
+    }
+}
+
+InkAnnotation::~InkAnnotation()
+{
+}
+
+void InkAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [ink] element
+    QDomElement inkElement = document.createElement( "ink" );
+    node.appendChild( inkElement );
+
+    // append the optional attributes
+    const QList< QLinkedList<QPointF> > paths = inkPaths();
+    if ( paths.count() < 1 )
+        return;
+    QList< QLinkedList<QPointF> >::const_iterator pIt = paths.begin(), pEnd = paths.end();
+    for ( ; pIt != pEnd; ++pIt )
+    {
+        QDomElement pathElement = document.createElement( "path" );
+        inkElement.appendChild( pathElement );
+        const QLinkedList<QPointF> & path = *pIt;
+        QLinkedList<QPointF>::const_iterator iIt = path.begin(), iEnd = path.end();
+        for ( ; iIt != iEnd; ++iIt )
+        {
+            const QPointF & point = *iIt;
+            QDomElement pointElement = document.createElement( "point" );
+            pathElement.appendChild( pointElement );
+            pointElement.setAttribute( "x", QString::number( point.x() ) );
+            pointElement.setAttribute( "y", QString::number( point.y() ) );
+        }
+    }
+}
+
+Annotation::SubType InkAnnotation::subType() const
+{
+    return AInk;
+}
+
+QList< QLinkedList<QPointF> > InkAnnotation::inkPaths() const
+{
+    Q_D( const InkAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->inkPaths;
+
+    const AnnotInk * inkann = static_cast<const AnnotInk *>(d->pdfAnnot);
+
+    const AnnotPath * const* paths = inkann->getInkList();
+    if ( !paths || !inkann->getInkListLength() )
+        return QList< QLinkedList<QPointF> >();
+
+    double MTX[6];
+    d->fillTransformationMTX(MTX);
+
+    const int pathsNumber = inkann->getInkListLength();
+    QList< QLinkedList<QPointF> > inkPaths;
+    for (int m = 0; m < pathsNumber; ++m)
+    {
+        // transform each path in a list of normalized points ..
+        QLinkedList<QPointF> localList;
+        const AnnotPath * path = paths[ m ];
+        const int pointsNumber = path ? path->getCoordsLength() : 0;
+        for (int n = 0; n < pointsNumber; ++n)
+        {
+            QPointF point;
+            XPDFReader::transform(MTX, path->getX(n), path->getY(n), point);
+            localList.append(point);
+        }
+        // ..and add it to the annotation
+        inkPaths.append( localList );
+    }
+    return inkPaths;
+}
+
+void InkAnnotation::setInkPaths( const QList< QLinkedList<QPointF> > &paths )
+{
+    Q_D( InkAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->inkPaths = paths;
+        return;
+    }
+
+    AnnotInk * inkann = static_cast<AnnotInk*>(d->pdfAnnot);
+    AnnotPath **annotpaths = d->toAnnotPaths(paths);
+    const int pathsNumber = paths.size();
+    inkann->setInkList(annotpaths, pathsNumber);
+
+    for (int i = 0; i < pathsNumber; ++i)
+        delete annotpaths[i];
+    delete[] annotpaths;
+}
+
+
+/** LinkAnnotation [Annotation] */
+class LinkAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        LinkAnnotationPrivate();
+        ~LinkAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        Link * linkDestination;
+        LinkAnnotation::HighlightMode linkHLMode;
+        QPointF linkRegion[4];
+};
+
+LinkAnnotationPrivate::LinkAnnotationPrivate()
+    : AnnotationPrivate(), linkDestination( 0 ), linkHLMode( LinkAnnotation::Invert )
+{
+}
+
+LinkAnnotationPrivate::~LinkAnnotationPrivate()
+{
+    delete linkDestination;
+}
+
+Annotation * LinkAnnotationPrivate::makeAlias()
+{
+    return new LinkAnnotation(*this);
+}
+
+Annot* LinkAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    return 0; // Not implemented
+}
+
+LinkAnnotation::LinkAnnotation()
+    : Annotation( *new LinkAnnotationPrivate() )
+{}
+
+LinkAnnotation::LinkAnnotation(LinkAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+LinkAnnotation::LinkAnnotation( const QDomNode & node )
+    : Annotation( *new LinkAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'link' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "link" )
+            continue;
+
+        // parse the attributes
+        if ( e.hasAttribute( "hlmode" ) )
+            setLinkHighlightMode((LinkAnnotation::HighlightMode)e.attribute( "hlmode" ).toInt());
+
+        // parse all 'quad' subnodes
+        QDomNode quadNode = e.firstChild();
+        for ( ; quadNode.isElement(); quadNode = quadNode.nextSibling() )
+        {
+            QDomElement qe = quadNode.toElement();
+            if ( qe.tagName() == "quad" )
+            {
+                setLinkRegionPoint(0, QPointF(qe.attribute( "ax", "0.0" ).toDouble(),
+                                              qe.attribute( "ay", "0.0" ).toDouble()));
+                setLinkRegionPoint(1, QPointF(qe.attribute( "bx", "0.0" ).toDouble(),
+                                              qe.attribute( "by", "0.0" ).toDouble()));
+                setLinkRegionPoint(2, QPointF(qe.attribute( "cx", "0.0" ).toDouble(),
+                                              qe.attribute( "cy", "0.0" ).toDouble()));
+                setLinkRegionPoint(3, QPointF(qe.attribute( "dx", "0.0" ).toDouble(),
+                                              qe.attribute( "dy", "0.0" ).toDouble()));
+            }
+            else if ( qe.tagName() == "link" )
+            {
+                QString type = qe.attribute( "type" );
+                if ( type == "GoTo" )
+                {
+                    Poppler::LinkGoto * go = new Poppler::LinkGoto( QRect(), qe.attribute( "filename" ), LinkDestination( qe.attribute( "destination" ) ) );
+                    setLinkDestination(go);
+                }
+                else if ( type == "Exec" )
+                {
+                    Poppler::LinkExecute * exec = new Poppler::LinkExecute( QRect(), qe.attribute( "filename" ), qe.attribute( "parameters" ) );
+                    setLinkDestination(exec);
+                }
+                else if ( type == "Browse" )
+                {
+                    Poppler::LinkBrowse * browse = new Poppler::LinkBrowse( QRect(), qe.attribute( "url" ) );
+                    setLinkDestination(browse);
+                }
+                else if ( type == "Action" )
+                {
+                    Poppler::LinkAction::ActionType act;
+                    QString actString = qe.attribute( "action" );
+                    bool found = true;
+                    if ( actString == "PageFirst" )
+                        act = Poppler::LinkAction::PageFirst;
+                    else if ( actString == "PagePrev" )
+                        act = Poppler::LinkAction::PagePrev;
+                    else if ( actString == "PageNext" )
+                        act = Poppler::LinkAction::PageNext;
+                    else if ( actString == "PageLast" )
+                        act = Poppler::LinkAction::PageLast;
+                    else if ( actString == "HistoryBack" )
+                        act = Poppler::LinkAction::HistoryBack;
+                    else if ( actString == "HistoryForward" )
+                        act = Poppler::LinkAction::HistoryForward;
+                    else if ( actString == "Quit" )
+                        act = Poppler::LinkAction::Quit;
+                    else if ( actString == "Presentation" )
+                        act = Poppler::LinkAction::Presentation;
+                    else if ( actString == "EndPresentation" )
+                        act = Poppler::LinkAction::EndPresentation;
+                    else if ( actString == "Find" )
+                        act = Poppler::LinkAction::Find;
+                    else if ( actString == "GoToPage" )
+                        act = Poppler::LinkAction::GoToPage;
+                    else if ( actString == "Close" )
+                        act = Poppler::LinkAction::Close;
+                    else if ( actString == "Print" )
+                        act = Poppler::LinkAction::Print;
+                    else
+                        found = false;
+                    if (found)
+                    {
+                        Poppler::LinkAction * action = new Poppler::LinkAction( QRect(), act );
+                        setLinkDestination(action);
+                    }
+                }
+#if 0
+                else if ( type == "Movie" )
+                {
+                    Poppler::LinkMovie * movie = new Poppler::LinkMovie( QRect() );
+                    setLinkDestination(movie);
+                }
+#endif
+            }
+        }
+
+        // loading complete
+        break;
+    }
+}
+
+LinkAnnotation::~LinkAnnotation()
+{
+}
+
+void LinkAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [hl] element
+    QDomElement linkElement = document.createElement( "link" );
+    node.appendChild( linkElement );
+
+    // append the optional attributes
+    if ( linkHighlightMode() != Invert )
+        linkElement.setAttribute( "hlmode", (int)linkHighlightMode() );
+
+    // saving region
+    QDomElement quadElement = document.createElement( "quad" );
+    linkElement.appendChild( quadElement );
+    quadElement.setAttribute( "ax", QString::number( linkRegionPoint(0).x() ) );
+    quadElement.setAttribute( "ay", QString::number( linkRegionPoint(0).y() ) );
+    quadElement.setAttribute( "bx", QString::number( linkRegionPoint(1).x() ) );
+    quadElement.setAttribute( "by", QString::number( linkRegionPoint(1).y() ) );
+    quadElement.setAttribute( "cx", QString::number( linkRegionPoint(2).x() ) );
+    quadElement.setAttribute( "cy", QString::number( linkRegionPoint(2).y() ) );
+    quadElement.setAttribute( "dx", QString::number( linkRegionPoint(3).x() ) );
+    quadElement.setAttribute( "dy", QString::number( linkRegionPoint(3).y() ) );
+
+    // saving link
+    QDomElement hyperlinkElement = document.createElement( "link" );
+    linkElement.appendChild( hyperlinkElement );
+    if ( linkDestination() )
+    {
+        switch( linkDestination()->linkType() )
+        {
+            case Poppler::Link::Goto:
+            {
+                Poppler::LinkGoto * go = static_cast< Poppler::LinkGoto * >( linkDestination() );
+                hyperlinkElement.setAttribute( "type", "GoTo" );
+                hyperlinkElement.setAttribute( "filename", go->fileName() );
+                hyperlinkElement.setAttribute( "destionation", go->destination().toString() );
+                break;
+            }
+            case Poppler::Link::Execute:
+            {
+                Poppler::LinkExecute * exec = static_cast< Poppler::LinkExecute * >( linkDestination() );
+                hyperlinkElement.setAttribute( "type", "Exec" );
+                hyperlinkElement.setAttribute( "filename", exec->fileName() );
+                hyperlinkElement.setAttribute( "parameters", exec->parameters() );
+                break;
+            }
+            case Poppler::Link::Browse:
+            {
+                Poppler::LinkBrowse * browse = static_cast< Poppler::LinkBrowse * >( linkDestination() );
+                hyperlinkElement.setAttribute( "type", "Browse" );
+                hyperlinkElement.setAttribute( "url", browse->url() );
+                break;
+            }
+            case Poppler::Link::Action:
+            {
+                Poppler::LinkAction * action = static_cast< Poppler::LinkAction * >( linkDestination() );
+                hyperlinkElement.setAttribute( "type", "Action" );
+                switch ( action->actionType() )
+                {
+                    case Poppler::LinkAction::PageFirst:
+                        hyperlinkElement.setAttribute( "action", "PageFirst" );
+                        break;
+                    case Poppler::LinkAction::PagePrev:
+                        hyperlinkElement.setAttribute( "action", "PagePrev" );
+                        break;
+                    case Poppler::LinkAction::PageNext:
+                        hyperlinkElement.setAttribute( "action", "PageNext" );
+                        break;
+                    case Poppler::LinkAction::PageLast:
+                        hyperlinkElement.setAttribute( "action", "PageLast" );
+                        break;
+                    case Poppler::LinkAction::HistoryBack:
+                        hyperlinkElement.setAttribute( "action", "HistoryBack" );
+                        break;
+                    case Poppler::LinkAction::HistoryForward:
+                        hyperlinkElement.setAttribute( "action", "HistoryForward" );
+                        break;
+                    case Poppler::LinkAction::Quit:
+                        hyperlinkElement.setAttribute( "action", "Quit" );
+                        break;
+                    case Poppler::LinkAction::Presentation:
+                        hyperlinkElement.setAttribute( "action", "Presentation" );
+                        break;
+                    case Poppler::LinkAction::EndPresentation:
+                        hyperlinkElement.setAttribute( "action", "EndPresentation" );
+                        break;
+                    case Poppler::LinkAction::Find:
+                        hyperlinkElement.setAttribute( "action", "Find" );
+                        break;
+                    case Poppler::LinkAction::GoToPage:
+                        hyperlinkElement.setAttribute( "action", "GoToPage" );
+                        break;
+                    case Poppler::LinkAction::Close:
+                        hyperlinkElement.setAttribute( "action", "Close" );
+                        break;
+                    case Poppler::LinkAction::Print:
+                        hyperlinkElement.setAttribute( "action", "Print" );
+                        break;
+                }
+                break;
+            }
+            case Poppler::Link::Movie:
+            {
+                hyperlinkElement.setAttribute( "type", "Movie" );
+                break;
+            }
+            case Poppler::Link::Rendition:
+            {
+                hyperlinkElement.setAttribute( "type", "Rendition" );
+                break;
+            }
+            case Poppler::Link::Sound:
+            {
+                // FIXME: implement me
+                break;
+            }
+            case Poppler::Link::None:
+                break;
+        }
+    }
+}
+
+Annotation::SubType LinkAnnotation::subType() const
+{
+    return ALink;
+}
+
+Link* LinkAnnotation::linkDestination() const
+{
+    Q_D( const LinkAnnotation );
+    return d->linkDestination;
+}
+
+void LinkAnnotation::setLinkDestination( Link *link )
+{
+    Q_D( LinkAnnotation );
+    delete d->linkDestination;
+    d->linkDestination = link;
+}
+
+LinkAnnotation::HighlightMode LinkAnnotation::linkHighlightMode() const
+{
+    Q_D( const LinkAnnotation );
+    return d->linkHLMode;
+}
+
+void LinkAnnotation::setLinkHighlightMode( LinkAnnotation::HighlightMode mode )
+{
+    Q_D( LinkAnnotation );
+    d->linkHLMode = mode;
+}
+
+QPointF LinkAnnotation::linkRegionPoint( int id ) const
+{
+    if ( id < 0 || id >= 4 )
+        return QPointF();
+
+    Q_D( const LinkAnnotation );
+    return d->linkRegion[id];
+}
+
+void LinkAnnotation::setLinkRegionPoint( int id, const QPointF &point )
+{
+    if ( id < 0 || id >= 4 )
+        return;
+
+    Q_D( LinkAnnotation );
+    d->linkRegion[id] = point;
+}
+
+/** CaretAnnotation [Annotation] */
+class CaretAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        CaretAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        CaretAnnotation::CaretSymbol symbol;
+};
+
+static QString caretSymbolToString( CaretAnnotation::CaretSymbol symbol )
+{
+    switch ( symbol )
+    {
+        case CaretAnnotation::None:
+            return QString::fromLatin1( "None" );
+        case CaretAnnotation::P:
+            return QString::fromLatin1( "P" );
+    }
+    return QString();
+}
+
+static CaretAnnotation::CaretSymbol caretSymbolFromString( const QString &symbol )
+{
+    if ( symbol == QLatin1String( "None" ) )
+        return CaretAnnotation::None;
+    else if ( symbol == QLatin1String( "P" ) )
+        return CaretAnnotation::P;
+    return CaretAnnotation::None;
+}
+
+CaretAnnotationPrivate::CaretAnnotationPrivate()
+    : AnnotationPrivate(), symbol( CaretAnnotation::None )
+{
+}
+
+Annotation * CaretAnnotationPrivate::makeAlias()
+{
+    return new CaretAnnotation(*this);
+}
+
+Annot* CaretAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    // Setters are defined in the public class
+    CaretAnnotation *q = static_cast<CaretAnnotation*>( makeAlias() );
+
+    // Set page and document
+    pdfPage = destPage;
+    parentDoc = doc;
+
+    // Set pdfAnnot
+    PDFRectangle rect = boundaryToPdfRectangle(boundary, flags);
+    pdfAnnot = new AnnotCaret(destPage->getDoc(), &rect);
+
+    // Set properties
+    flushBaseAnnotationProperties();
+    q->setCaretSymbol(symbol);
+
+    delete q;
+    return pdfAnnot;
+}
+
+CaretAnnotation::CaretAnnotation()
+    : Annotation( *new CaretAnnotationPrivate() )
+{
+}
+
+CaretAnnotation::CaretAnnotation(CaretAnnotationPrivate &dd)
+    : Annotation( dd )
+{
+}
+
+CaretAnnotation::CaretAnnotation( const QDomNode & node )
+    : Annotation( *new CaretAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'caret' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "caret" )
+            continue;
+
+        // parse the attributes
+        if ( e.hasAttribute( "symbol" ) )
+            setCaretSymbol(caretSymbolFromString( e.attribute( "symbol" ) ));
+
+        // loading complete
+        break;
+    }
+}
+
+CaretAnnotation::~CaretAnnotation()
+{
+}
+
+void CaretAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [caret] element
+    QDomElement caretElement = document.createElement( "caret" );
+    node.appendChild( caretElement );
+
+    // append the optional attributes
+    if ( caretSymbol() != CaretAnnotation::None )
+        caretElement.setAttribute( "symbol", caretSymbolToString( caretSymbol() ) );
+}
+
+Annotation::SubType CaretAnnotation::subType() const
+{
+    return ACaret;
+}
+
+CaretAnnotation::CaretSymbol CaretAnnotation::caretSymbol() const
+{
+    Q_D( const CaretAnnotation );
+
+    if (!d->pdfAnnot)
+        return d->symbol;
+
+    const AnnotCaret * caretann = static_cast<const AnnotCaret *>(d->pdfAnnot);
+    return (CaretAnnotation::CaretSymbol)caretann->getSymbol();
+}
+
+void CaretAnnotation::setCaretSymbol( CaretAnnotation::CaretSymbol symbol )
+{
+    Q_D( CaretAnnotation );
+
+    if (!d->pdfAnnot)
+    {
+        d->symbol = symbol;
+        return;
+    }
+
+    AnnotCaret * caretann = static_cast<AnnotCaret *>(d->pdfAnnot);
+    caretann->setSymbol((AnnotCaret::AnnotCaretSymbol)symbol);
+}
+
+/** FileAttachmentAnnotation [Annotation] */
+class FileAttachmentAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        FileAttachmentAnnotationPrivate();
+        ~FileAttachmentAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        QString icon;
+        EmbeddedFile *embfile;
+};
+
+FileAttachmentAnnotationPrivate::FileAttachmentAnnotationPrivate()
+    : AnnotationPrivate(), icon( "PushPin" ), embfile( 0 )
+{
+}
+
+FileAttachmentAnnotationPrivate::~FileAttachmentAnnotationPrivate()
+{
+    delete embfile;
+}
+
+Annotation * FileAttachmentAnnotationPrivate::makeAlias()
+{
+    return new FileAttachmentAnnotation(*this);
+}
+
+Annot* FileAttachmentAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    return 0; // Not implemented
+}
+
+FileAttachmentAnnotation::FileAttachmentAnnotation()
+    : Annotation( *new FileAttachmentAnnotationPrivate() )
+{
+}
+
+FileAttachmentAnnotation::FileAttachmentAnnotation(FileAttachmentAnnotationPrivate &dd)
+    : Annotation( dd )
+{
+}
+
+FileAttachmentAnnotation::FileAttachmentAnnotation( const QDomNode & node )
+    : Annotation( *new FileAttachmentAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'fileattachment' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "fileattachment" )
+            continue;
+
+        // loading complete
+        break;
+    }
+}
+
+FileAttachmentAnnotation::~FileAttachmentAnnotation()
+{
+}
+
+void FileAttachmentAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [fileattachment] element
+    QDomElement fileAttachmentElement = document.createElement( "fileattachment" );
+    node.appendChild( fileAttachmentElement );
+}
+
+Annotation::SubType FileAttachmentAnnotation::subType() const
+{
+    return AFileAttachment;
+}
+
+QString FileAttachmentAnnotation::fileIconName() const
+{
+    Q_D( const FileAttachmentAnnotation );
+    return d->icon;
+}
+
+void FileAttachmentAnnotation::setFileIconName( const QString &icon )
+{
+    Q_D( FileAttachmentAnnotation );
+    d->icon = icon;
+}
+
+EmbeddedFile* FileAttachmentAnnotation::embeddedFile() const
+{
+    Q_D( const FileAttachmentAnnotation );
+    return d->embfile;
+}
+
+void FileAttachmentAnnotation::setEmbeddedFile( EmbeddedFile *ef )
+{
+    Q_D( FileAttachmentAnnotation );
+    d->embfile = ef;
+}
+
+/** SoundAnnotation [Annotation] */
+class SoundAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        SoundAnnotationPrivate();
+        ~SoundAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        QString icon;
+        SoundObject *sound;
+};
+
+SoundAnnotationPrivate::SoundAnnotationPrivate()
+    : AnnotationPrivate(), icon( "Speaker" ), sound( 0 )
+{
+}
+
+SoundAnnotationPrivate::~SoundAnnotationPrivate()
+{
+    delete sound;
+}
+
+Annotation * SoundAnnotationPrivate::makeAlias()
+{
+    return new SoundAnnotation(*this);
+}
+
+Annot* SoundAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    return 0; // Not implemented
+}
+
+SoundAnnotation::SoundAnnotation()
+    : Annotation( *new SoundAnnotationPrivate() )
+{
+}
+
+SoundAnnotation::SoundAnnotation(SoundAnnotationPrivate &dd)
+    : Annotation( dd )
+{
+}
+
+SoundAnnotation::SoundAnnotation( const QDomNode & node )
+    : Annotation( *new SoundAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'sound' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "sound" )
+            continue;
+
+        // loading complete
+        break;
+    }
+}
+
+SoundAnnotation::~SoundAnnotation()
+{
+}
+
+void SoundAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [sound] element
+    QDomElement soundElement = document.createElement( "sound" );
+    node.appendChild( soundElement );
+}
+
+Annotation::SubType SoundAnnotation::subType() const
+{
+    return ASound;
+}
+
+QString SoundAnnotation::soundIconName() const
+{
+    Q_D( const SoundAnnotation );
+    return d->icon;
+}
+
+void SoundAnnotation::setSoundIconName( const QString &icon )
+{
+    Q_D( SoundAnnotation );
+    d->icon = icon;
+}
+
+SoundObject* SoundAnnotation::sound() const
+{
+    Q_D( const SoundAnnotation );
+    return d->sound;
+}
+
+void SoundAnnotation::setSound( SoundObject *s )
+{
+    Q_D( SoundAnnotation );
+    d->sound = s;
+}
+
+/** MovieAnnotation [Annotation] */
+class MovieAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        MovieAnnotationPrivate();
+        ~MovieAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        MovieObject *movie;
+        QString title;
+};
+
+MovieAnnotationPrivate::MovieAnnotationPrivate()
+    : AnnotationPrivate(), movie( 0 )
+{
+}
+
+MovieAnnotationPrivate::~MovieAnnotationPrivate()
+{
+    delete movie;
+}
+
+Annotation * MovieAnnotationPrivate::makeAlias()
+{
+    return new MovieAnnotation(*this);
+}
+
+Annot* MovieAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    return 0; // Not implemented
+}
+
+MovieAnnotation::MovieAnnotation()
+    : Annotation( *new MovieAnnotationPrivate() )
+{
+}
+
+MovieAnnotation::MovieAnnotation(MovieAnnotationPrivate &dd)
+    : Annotation( dd )
+{
+}
+
+MovieAnnotation::MovieAnnotation( const QDomNode & node )
+    : Annotation( *new MovieAnnotationPrivate(), node )
+{
+    // loop through the whole children looking for a 'movie' element
+    QDomNode subNode = node.firstChild();
+    while( subNode.isElement() )
+    {
+        QDomElement e = subNode.toElement();
+        subNode = subNode.nextSibling();
+        if ( e.tagName() != "movie" )
+            continue;
+
+        // loading complete
+        break;
+    }
+}
+
+MovieAnnotation::~MovieAnnotation()
+{
+}
+
+void MovieAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [movie] element
+    QDomElement movieElement = document.createElement( "movie" );
+    node.appendChild( movieElement );
+}
+
+Annotation::SubType MovieAnnotation::subType() const
+{
+    return AMovie;
+}
+
+MovieObject* MovieAnnotation::movie() const
+{
+    Q_D( const MovieAnnotation );
+    return d->movie;
+}
+
+void MovieAnnotation::setMovie( MovieObject *movie )
+{
+    Q_D( MovieAnnotation );
+    d->movie = movie;
+}
+
+QString MovieAnnotation::movieTitle() const
+{
+    Q_D( const MovieAnnotation );
+    return d->title;
+}
+
+void MovieAnnotation::setMovieTitle( const QString &title )
+{
+    Q_D( MovieAnnotation );
+    d->title = title;
+}
+
+/** ScreenAnnotation [Annotation] */
+class ScreenAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        ScreenAnnotationPrivate();
+        ~ScreenAnnotationPrivate();
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+
+        // data fields
+        LinkRendition *action;
+        QString title;
+};
+
+ScreenAnnotationPrivate::ScreenAnnotationPrivate()
+    : AnnotationPrivate(), action( 0 )
+{
+}
+
+ScreenAnnotationPrivate::~ScreenAnnotationPrivate()
+{
+    delete action;
+}
+
+ScreenAnnotation::ScreenAnnotation(ScreenAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+Annotation * ScreenAnnotationPrivate::makeAlias()
+{
+    return new ScreenAnnotation(*this);
+}
+
+Annot* ScreenAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    return 0; // Not implemented
+}
+
+ScreenAnnotation::ScreenAnnotation()
+    : Annotation( *new ScreenAnnotationPrivate() )
+{
+}
+
+ScreenAnnotation::~ScreenAnnotation()
+{
+}
+
+void ScreenAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [screen] element
+    QDomElement screenElement = document.createElement( "screen" );
+    node.appendChild( screenElement );
+}
+
+Annotation::SubType ScreenAnnotation::subType() const
+{
+    return AScreen;
+}
+
+LinkRendition* ScreenAnnotation::action() const
+{
+    Q_D( const ScreenAnnotation );
+    return d->action;
+}
+
+void ScreenAnnotation::setAction( LinkRendition *action )
+{
+    Q_D( ScreenAnnotation );
+    d->action = action;
+}
+
+QString ScreenAnnotation::screenTitle() const
+{
+    Q_D( const ScreenAnnotation );
+    return d->title;
+}
+
+void ScreenAnnotation::setScreenTitle( const QString &title )
+{
+    Q_D( ScreenAnnotation );
+    d->title = title;
+}
+
+Link* ScreenAnnotation::additionalAction( AdditionalActionType type ) const
+{
+    Q_D( const ScreenAnnotation );
+    return d->additionalAction( type );
+}
+
+/** WidgetAnnotation [Annotation] */
+class WidgetAnnotationPrivate : public AnnotationPrivate
+{
+    public:
+        Annotation * makeAlias();
+        Annot* createNativeAnnot(::Page *destPage, DocumentData *doc);
+};
+
+Annotation * WidgetAnnotationPrivate::makeAlias()
+{
+    return new WidgetAnnotation(*this);
+}
+
+Annot* WidgetAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc)
+{
+    return 0; // Not implemented
+}
+
+WidgetAnnotation::WidgetAnnotation(WidgetAnnotationPrivate &dd)
+    : Annotation( dd )
+{}
+
+WidgetAnnotation::WidgetAnnotation()
+    : Annotation( *new WidgetAnnotationPrivate() )
+{
+}
+
+WidgetAnnotation::~WidgetAnnotation()
+{
+}
+
+void WidgetAnnotation::store( QDomNode & node, QDomDocument & document ) const
+{
+    // store base annotation properties
+    storeBaseAnnotationProperties( node, document );
+
+    // create [widget] element
+    QDomElement widgetElement = document.createElement( "widget" );
+    node.appendChild( widgetElement );
+}
+
+Annotation::SubType WidgetAnnotation::subType() const
+{
+    return AWidget;
+}
+
+Link* WidgetAnnotation::additionalAction( AdditionalActionType type ) const
+{
+    Q_D( const WidgetAnnotation );
+    return d->additionalAction( type );
+}
+
+//BEGIN utility annotation functions
+QColor convertAnnotColor( AnnotColor *color )
+{
+    if ( !color )
+        return QColor();
+
+    QColor newcolor;
+    const double *color_data = color->getValues();
+    switch ( color->getSpace() )
+    {
+        case AnnotColor::colorTransparent: // = 0,
+            newcolor = Qt::transparent;
+            break;
+        case AnnotColor::colorGray: // = 1,
+            newcolor.setRgbF( color_data[0], color_data[0], color_data[0] );
+            break;
+        case AnnotColor::colorRGB: // = 3,
+            newcolor.setRgbF( color_data[0], color_data[1], color_data[2] );
+            break;
+        case AnnotColor::colorCMYK: // = 4
+            newcolor.setCmykF( color_data[0], color_data[1], color_data[2], color_data[3] );
+            break;
+    }
+    return newcolor;
+}
+
+AnnotColor* convertQColor( const QColor &c )
+{
+    if (!c.isValid() || c.alpha() == 0)
+        return new AnnotColor(); // Transparent
+    else
+        return new AnnotColor(c.redF(), c.greenF(), c.blueF());
+}
+//END utility annotation functions
+
+}
diff --git a/qt5/src/poppler-annotation.h b/qt5/src/poppler-annotation.h
new file mode 100644
index 00000000..bbcb9de0
--- /dev/null
+++ b/qt5/src/poppler-annotation.h
@@ -0,0 +1,1030 @@
+/* poppler-annotation.h: qt interface to poppler
+ * Copyright (C) 2006-2008, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2006, 2008 Pino Toscano <pino@kde.org>
+ * Copyright (C) 2007, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2010, Philip Lorenz <lorenzph+freedesktop@gmail.com>
+ * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
+ * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
+ * Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2013, Anthony Granger <grangeranthony@gmail.com>
+ * Adapting code from
+ *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _POPPLER_ANNOTATION_H_
+#define _POPPLER_ANNOTATION_H_
+
+#include <QtCore/QDateTime>
+#include <QtCore/QSharedDataPointer>
+#include <QtCore/QLinkedList>
+#include <QtCore/QList>
+#include <QtCore/QPointF>
+#include <QtCore/QRectF>
+#include <QtCore/QVector>
+#include <QtGui/QColor>
+#include <QtGui/QFont>
+#include <QtXml/QDomDocument>
+#include "poppler-export.h"
+
+namespace Poppler {
+
+class Annotation;
+class AnnotationPrivate;
+class TextAnnotationPrivate;
+class LineAnnotationPrivate;
+class GeomAnnotationPrivate;
+class HighlightAnnotationPrivate;
+class StampAnnotationPrivate;
+class InkAnnotationPrivate;
+class LinkAnnotationPrivate;
+class CaretAnnotationPrivate;
+class FileAttachmentAnnotationPrivate;
+class SoundAnnotationPrivate;
+class MovieAnnotationPrivate;
+class ScreenAnnotationPrivate;
+class WidgetAnnotationPrivate;
+class EmbeddedFile;
+class Link;
+class SoundObject;
+class MovieObject;
+class LinkRendition;
+class Page;
+
+/**
+ * \short Helper class for (recursive) Annotation retrieval/storage.
+ *
+ */
+class POPPLER_QT5_EXPORT AnnotationUtils
+{
+    public:
+        /**
+         * Restore an Annotation (with revisions if needed) from the DOM
+         * element \p annElement.
+         * \returns a pointer to the complete Annotation or 0 if element is
+         * invalid.
+         */
+        static Annotation * createAnnotation( const QDomElement & annElement );
+
+        /**
+         * Save the Annotation \p ann as a child of \p annElement taking
+         * care of saving all revisions if \p ann has any.
+         */
+        static void storeAnnotation( const Annotation * ann,
+            QDomElement & annElement, QDomDocument & document );
+
+        /**
+         * Returns an element called \p name from the direct children of
+         * \p parentNode or a null element if not found.
+         */
+        static QDomElement findChildElement( const QDomNode & parentNode,
+            const QString & name );
+};
+
+
+/**
+ * \short Annotation class holding properties shared by all annotations.
+ *
+ * An Annotation is an object (text note, highlight, sound, popup window, ..)
+ * contained by a Page in the document.
+ *
+ * \warning Different Annotation objects might point to the same annotation.
+ *
+ * \section annotCreation How to add annotations
+ *
+ * Create an Annotation object of the desired subclass (for example
+ * TextAnnotation) and set its properties:
+ * @code
+ * Poppler::TextAnnotation* myann = new Poppler::TextAnnotation(Poppler::TextAnnotation::InPlace);
+ * myann->setBoundary(QRectF(0.1, 0.1, 0.2, 0.2)); // normalized coordinates: (0,0) is top-left, (1,1) is bottom-right
+ * myann->setContents("Hello, world!");
+ * @endcode
+ * \note Always set a boundary rectangle, or nothing will be shown!
+ *
+ * Obtain a pointer to the Page where you want to add the annotation (refer to
+ * \ref req for instructions) and add the annotation:
+ * @code
+ * Poppler::Page* mypage = ...;
+ * mypage->addAnnotation(myann);
+ * @endcode
+ *
+ * You can keep on editing the annotation after it has been added to the page:
+ * @code
+ * myann->setContents("World, hello!"); // Let's change text...
+ * myann->setAuthor("Your name here");  // ...and set an author too
+ * @endcode
+ *
+ * When you're done with editing the annotation, you must destroy the Annotation
+ * object:
+ * @code
+ * delete myann;
+ * @endcode
+ *
+ * Use the PDFConverter class to save the modified document.
+ *
+ * \section annotFixedRotation FixedRotation flag specifics
+ *
+ * According to the PDF specification, annotations whose
+ * Annotation::FixedRotation flag is set must always be shown in their original
+ * orientation, no matter what the current rendering rotation or the page's
+ * Page::orientation() values are. In comparison with regular annotations, such
+ * annotations should therefore be transformed by an extra rotation at rendering
+ * time to "undo" such context-related rotations, which is equal to
+ * <code>-(rendering_rotation + page_orientation)</code>. The rotation pivot
+ * is the top-left corner of the boundary rectangle.
+ *
+ * In practice, %Poppler's \ref Page::renderToImage only "unrotates" the
+ * page orientation, and does <b>not</b> unrotate the rendering rotation.
+ * This ensures consistent renderings at different Page::Rotation values:
+ * annotations are always positioned as if they were being positioned at the
+ * default page orientation.
+ *
+ * Just like regular annotations, %Poppler Qt4 exposes normalized coordinates
+ * relative to the page's default orientation. However, behind the scenes, the
+ * coordinate system is different and %Poppler transparently transforms each
+ * shape. If you never call either Annotation::setFlags or
+ * Annotation::setBoundary, you don't need to worry about this; but if you do
+ * call them, then you need to adhere to the following rules:
+ *  - Whenever you toggle the Annotation::FixedRotation flag, you <b>must</b>
+ *    set again the boundary rectangle first, and then you <b>must</b> set
+ *    again any other geometry-related property.
+ *  - Whenever you modify the boundary rectangle of an annotation whose
+ *    Annotation::FixedRotation flag is set, you <b>must</b> set again any other
+ *    geometry-related property.
+ *
+ * These two rules are necessary to make %Poppler's transparent coordinate
+ * conversion work properly.
+ */
+class POPPLER_QT5_EXPORT Annotation
+{
+  friend class AnnotationUtils;
+  friend class LinkMovie;
+  friend class LinkRendition;
+
+  public:
+    // enum definitions
+    /**
+     * Annotation subclasses
+     *
+     * \sa subType()
+     */
+    // WARNING!!! oKular uses that very same values so if you change them notify the author!
+    enum SubType
+    {
+        AText = 1,            ///< TextAnnotation
+        ALine = 2,            ///< LineAnnotation
+        AGeom = 3,            ///< GeomAnnotation
+        AHighlight = 4,       ///< HighlightAnnotation
+        AStamp = 5,           ///< StampAnnotation
+        AInk = 6,             ///< InkAnnotation
+        ALink = 7,            ///< LinkAnnotation
+        ACaret = 8,           ///< CaretAnnotation
+        AFileAttachment = 9,  ///< FileAttachmentAnnotation
+        ASound = 10,          ///< SoundAnnotation
+        AMovie = 11,          ///< MovieAnnotation
+        AScreen = 12,         ///< ScreenAnnotation \since 0.20
+        AWidget = 13,         ///< WidgetAnnotation \since 0.22
+        A_BASE = 0
+    };
+
+    /**
+     * Annotation flags
+     *
+     * They can be OR'd together (e.g. Annotation::FixedRotation | Annotation::DenyPrint).
+     *
+     * \sa flags(), setFlags(int)
+     */
+    // NOTE: Only flags that are known to work are documented
+    enum Flag
+    {
+        Hidden = 1,                ///< Do not display or print the annotation
+        FixedSize = 2,
+        FixedRotation = 4,         ///< Do not rotate the annotation according to page orientation and rendering rotation \warning Extra care is needed with this flag: see \ref annotFixedRotation
+        DenyPrint = 8,             ///< Do not print the annotation
+        DenyWrite = 16,
+        DenyDelete = 32,
+        ToggleHidingOnMouse = 64,
+        External = 128
+    };
+
+    enum LineStyle { Solid = 1, Dashed = 2, Beveled = 4, Inset = 8, Underline = 16 };
+    enum LineEffect { NoEffect = 1, Cloudy = 2};
+    enum RevScope { Root = 0 /** \since 0.20 */, Reply = 1, Group = 2, Delete = 4 };
+    enum RevType { None = 1,  Marked = 2, Unmarked = 4,  Accepted = 8, Rejected = 16, Cancelled = 32, Completed = 64 };
+
+    /**
+     * Returns the author of the annotation.
+     */
+    QString author() const;
+    /**
+     * Sets a new author for the annotation.
+     */
+    void setAuthor( const QString &author );
+
+    QString contents() const;
+    void setContents( const QString &contents );
+
+    /**
+     * Returns the unique name (ID) of the annotation.
+     */
+    QString uniqueName() const;
+    /**
+     * Sets a new unique name for the annotation.
+     *
+     * \note no check of the new uniqueName is done
+     */
+    void setUniqueName( const QString &uniqueName );
+
+    QDateTime modificationDate() const;
+    void setModificationDate( const QDateTime &date );
+
+    QDateTime creationDate() const;
+    void setCreationDate( const QDateTime &date );
+
+    /**
+     * Returns this annotation's flags
+     *
+     * \sa Flag, setFlags(int)
+     */
+    int flags() const;
+    /**
+     * Sets this annotation's flags
+     *
+     * \sa Flag, flags(), \ref annotFixedRotation
+     */
+    void setFlags( int flags );
+
+    /**
+     * Returns this annotation's boundary rectangle in normalized coordinates
+     *
+     * \sa setBoundary(const QRectF&)
+     */
+    QRectF boundary() const;
+    /**
+     * Sets this annotation's boundary rectangle
+     *
+     * The boundary rectangle is the smallest rectangle that contains the
+     * annotation.
+     *
+     * \warning This property is mandatory: you must always set this.
+     *
+     * \sa boundary(), \ref annotFixedRotation
+     */
+    void setBoundary( const QRectF &boundary );
+
+    /**
+     * \short Container class for Annotation style information
+     *
+     * \since 0.20
+     */
+    class POPPLER_QT5_EXPORT Style
+    {
+      public:
+        Style();
+        Style( const Style &other );
+        Style& operator=( const Style &other );
+        ~Style();
+
+        // appearance properties
+        QColor color() const;                     // black
+        void setColor(const QColor &color);
+        double opacity() const;                   // 1.0
+        void setOpacity(double opacity);
+
+        // pen properties
+        double width() const;                     // 1.0
+        void setWidth(double width);
+        LineStyle lineStyle() const;              // LineStyle::Solid
+        void setLineStyle(LineStyle style);
+        double xCorners() const;                  // 0.0
+        void setXCorners(double radius);
+        double yCorners() const;                  // 0.0
+        void setYCorners(double radius);
+        const QVector<double>& dashArray() const; // [ 3 ]
+        void setDashArray(const QVector<double> &array);
+
+        // pen effects
+        LineEffect lineEffect() const;            // LineEffect::NoEffect
+        void setLineEffect(LineEffect effect);
+        double effectIntensity() const;           // 1.0
+        void setEffectIntensity(double intens);
+
+      private:
+        class Private;
+        QSharedDataPointer<Private> d;
+    };
+
+    /// \since 0.20
+    Style style() const;
+    /// \since 0.20
+    void setStyle( const Style& style );
+
+    /**
+     * \short Container class for Annotation pop-up window information
+     *
+     * \since 0.20
+     */
+    class POPPLER_QT5_EXPORT Popup
+    {
+      public:
+        Popup();
+        Popup( const Popup &other );
+        Popup& operator=( const Popup &other );
+        ~Popup();
+
+        // window state (Hidden, FixedRotation, Deny* flags allowed)
+        int flags() const;       // -1 (never initialized) -> 0 (if inited and shown)
+        void setFlags( int flags );
+
+        // geometric properties
+        QRectF geometry() const; // no default
+        void setGeometry( const QRectF &geom );
+
+        // window contens/override properties
+        QString title() const;   // '' text in the titlebar (overrides author)
+        void setTitle( const QString &title );
+        QString summary() const; // '' short description (displayed if not empty)
+        void setSummary( const QString &summary );
+        QString text() const;    // '' text for the window (overrides annot->contents)
+        void setText( const QString &text );
+
+      private:
+        class Private;
+        QSharedDataPointer<Private> d;
+    };
+
+    /// \since 0.20
+    Popup popup() const;
+    /// \warning Currently does nothing \since 0.20
+    void setPopup( const Popup& popup );
+
+    /// \since 0.20
+    RevScope revisionScope() const; // Root
+
+    /// \since 0.20
+    RevType revisionType() const;   // None
+
+    /**
+     * Returns the revisions of this annotation
+     *
+     * \note The caller owns the returned annotations and they should
+     *       be deleted when no longer required.
+     *
+     * \since 0.20
+     */
+    QList<Annotation*> revisions() const;
+
+    /**
+     * The type of the annotation.
+     */
+    virtual SubType subType() const = 0;
+
+    /**
+     * Destructor.
+     */
+    virtual ~Annotation();
+
+    /**
+     * Describes the flags from an annotations 'AA' dictionary.
+     *
+     * This flag is used by the additionalAction() method for ScreenAnnotation
+     * and WidgetAnnotation.
+     *
+     * \since 0.22
+     */
+    enum AdditionalActionType
+    {
+        CursorEnteringAction, ///< Performed when the cursor enters the annotation's active area
+        CursorLeavingAction,  ///< Performed when the cursor exists the annotation's active area
+        MousePressedAction,   ///< Performed when the mouse button is pressed inside the annotation's active area
+        MouseReleasedAction,  ///< Performed when the mouse button is released inside the annotation's active area
+        FocusInAction,        ///< Performed when the annotation receives the input focus
+        FocusOutAction,       ///< Performed when the annotation loses the input focus
+        PageOpeningAction,    ///< Performed when the page containing the annotation is opened
+        PageClosingAction,    ///< Performed when the page containing the annotation is closed
+        PageVisibleAction,    ///< Performed when the page containing the annotation becomes visible
+        PageInvisibleAction   ///< Performed when the page containing the annotation becomes invisible
+    };
+
+  protected:
+    /// \cond PRIVATE
+    Annotation( AnnotationPrivate &dd );
+    Annotation( AnnotationPrivate &dd, const QDomNode &description );
+    void storeBaseAnnotationProperties( QDomNode & parentNode, QDomDocument & document ) const;
+    Q_DECLARE_PRIVATE( Annotation )
+    QExplicitlySharedDataPointer<AnnotationPrivate> d_ptr;
+    /// \endcond
+
+  private:
+    virtual void store( QDomNode & parentNode, QDomDocument & document ) const = 0;
+    Q_DISABLE_COPY( Annotation )
+};
+
+/**
+ * \short Annotation containing text.
+ *
+ * A text annotation is an object showing some text directly on the page, or
+ * linked to the contents using an icon shown on a page.
+ */
+class POPPLER_QT5_EXPORT TextAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    // local enums
+    enum TextType { Linked, InPlace };
+    enum InplaceIntent { Unknown, Callout, TypeWriter };
+
+    TextAnnotation( TextType type );
+    virtual ~TextAnnotation();
+    virtual SubType subType() const;
+
+    /**
+       The type of text annotation represented by this object
+    */
+    TextType textType() const;
+
+    /**
+       The name of the icon for this text annotation.
+
+       Standard names for text annotation icons are:
+       - Comment
+       - Help
+       - Insert
+       - Key
+       - NewParagraph
+       - Note (this is the default icon to use)
+       - Paragraph
+    */
+    QString textIcon() const;
+
+    /**
+       Set the name of the icon to use for this text annotation.
+
+       \sa textIcon for the list of standard names
+    */
+    void setTextIcon( const QString &icon );
+
+    QFont textFont() const;
+    void setTextFont( const QFont &font );
+
+    int inplaceAlign() const;
+    void setInplaceAlign( int align );
+
+    QPointF calloutPoint( int id ) const;
+    /// \since 0.20
+    QVector<QPointF> calloutPoints() const;
+    /// \since 0.20
+    void setCalloutPoints( const QVector<QPointF> &points );
+
+    InplaceIntent inplaceIntent() const;
+    void setInplaceIntent( InplaceIntent intent );
+
+  private:
+    TextAnnotation( const QDomNode &node );
+    TextAnnotation( TextAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    void setTextType( TextType type );
+    Q_DECLARE_PRIVATE( TextAnnotation )
+    Q_DISABLE_COPY( TextAnnotation )
+};
+
+/**
+ * \short Polygon/polyline annotation.
+ *
+ * This annotation represents a polygon (or polyline) to be drawn on a page.
+ */
+class POPPLER_QT5_EXPORT LineAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    // local enums
+    /// \since 0.20
+    enum LineType { StraightLine, Polyline };
+    enum TermStyle { Square, Circle, Diamond, OpenArrow, ClosedArrow, None,
+                     Butt, ROpenArrow, RClosedArrow, Slash };
+    enum LineIntent { Unknown, Arrow, Dimension, PolygonCloud };
+
+    /// \since 0.20
+    LineAnnotation( LineType type );
+    virtual ~LineAnnotation();
+    virtual SubType subType() const;
+
+    /// \since 0.20
+    LineType lineType() const;
+
+    QLinkedList<QPointF> linePoints() const;
+    void setLinePoints( const QLinkedList<QPointF> &points );
+
+    TermStyle lineStartStyle() const;
+    void setLineStartStyle( TermStyle style );
+
+    TermStyle lineEndStyle() const;
+    void setLineEndStyle( TermStyle style );
+
+    bool isLineClosed() const;
+    void setLineClosed( bool closed );
+
+    QColor lineInnerColor() const;
+    void setLineInnerColor( const QColor &color );
+
+    double lineLeadingForwardPoint() const;
+    void setLineLeadingForwardPoint( double point );
+
+    double lineLeadingBackPoint() const;
+    void setLineLeadingBackPoint( double point );
+
+    bool lineShowCaption() const;
+    void setLineShowCaption( bool show );
+
+    LineIntent lineIntent() const;
+    void setLineIntent( LineIntent intent );
+
+  private:
+    LineAnnotation( const QDomNode &node );
+    LineAnnotation( LineAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    void setLineType( LineType type );
+    Q_DECLARE_PRIVATE( LineAnnotation )
+    Q_DISABLE_COPY( LineAnnotation )
+};
+
+/**
+ * \short Geometric annotation.
+ *
+ * The geometric annotation represents a geometric figure, like a rectangle or
+ * an ellipse.
+ */
+class POPPLER_QT5_EXPORT GeomAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    GeomAnnotation();
+    virtual ~GeomAnnotation();
+    virtual SubType subType() const;
+
+    // common enums
+    enum GeomType { InscribedSquare, InscribedCircle };
+
+    GeomType geomType() const;
+    void setGeomType( GeomType style );
+
+    QColor geomInnerColor() const;
+    void setGeomInnerColor( const QColor &color );
+
+  private:
+    GeomAnnotation( const QDomNode &node );
+    GeomAnnotation( GeomAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( GeomAnnotation )
+    Q_DISABLE_COPY( GeomAnnotation )
+};
+
+/**
+ * \short Text highlight annotation.
+ *
+ * The higlight annotation represents some areas of text being "highlighted".
+ */
+class POPPLER_QT5_EXPORT HighlightAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    HighlightAnnotation();
+    virtual ~HighlightAnnotation();
+    virtual SubType subType() const;
+
+    /**
+       The type of highlight
+    */
+    enum HighlightType { Highlight, ///< highlighter pen style annotation
+			 Squiggly,  ///< jagged or squiggly underline
+			 Underline, ///< straight line underline
+			 StrikeOut  ///< straight line through-line
+    };
+
+    /**
+       Structure corresponding to a QuadPoints array. This matches a
+       quadrilateral that describes the area around a word (or set of
+       words) that are to be highlighted.
+    */
+    struct Quad
+    {
+        QPointF         points[4];          // 8 valid coords
+        bool            capStart;           // false (vtx 1-4) [K]
+        bool            capEnd;             // false (vtx 2-3) [K]
+        double          feather;            // 0.1 (in range 0..1) [K]
+    };
+
+    /**
+       The type (style) of highlighting to use for this area
+       or these areas.
+    */
+    HighlightType highlightType() const;
+
+    /**
+       Set the type of highlighting to use for the given area
+       or areas.
+    */
+    void setHighlightType( HighlightType type );
+
+    /**
+       The list of areas to highlight.
+    */
+    QList< Quad > highlightQuads() const;
+
+    /**
+       Set the areas to highlight.
+    */
+    void setHighlightQuads( const QList< Quad > &quads );
+
+  private:
+    HighlightAnnotation( const QDomNode &node );
+    HighlightAnnotation( HighlightAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( HighlightAnnotation )
+    Q_DISABLE_COPY( HighlightAnnotation )
+};
+
+/**
+ * \short Stamp annotation.
+ *
+ * A simple annotation drawing a stamp on a page.
+ */
+class POPPLER_QT5_EXPORT StampAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    StampAnnotation();
+    virtual ~StampAnnotation();
+    virtual SubType subType() const;
+
+    /**
+       The name of the icon for this stamp annotation.
+
+       Standard names for stamp annotation icons are:
+       - Approved
+       - AsIs
+       - Confidential
+       - Departmental
+       - Draft (this is the default icon type)
+       - Experimental
+       - Expired
+       - Final
+       - ForComment
+       - ForPublicRelease
+       - NotApproved
+       - NotForPublicRelease
+       - Sold
+       - TopSecret
+    */
+    QString stampIconName() const;
+
+    /**
+       Set the icon type for this stamp annotation.
+
+       \sa stampIconName for the list of standard icon names
+    */
+    void setStampIconName( const QString &name );
+
+  private:
+    StampAnnotation( const QDomNode &node );
+    StampAnnotation( StampAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( StampAnnotation )
+    Q_DISABLE_COPY( StampAnnotation )
+};
+
+/**
+ * \short Ink Annotation.
+ *
+ * Annotation representing an ink path on a page.
+ */
+class POPPLER_QT5_EXPORT InkAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    InkAnnotation();
+    virtual ~InkAnnotation();
+    virtual SubType subType() const;
+
+    QList< QLinkedList<QPointF> > inkPaths() const;
+    void setInkPaths( const QList< QLinkedList<QPointF> > &paths );
+
+  private:
+    InkAnnotation( const QDomNode &node );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    InkAnnotation(InkAnnotationPrivate &dd);
+    Q_DECLARE_PRIVATE( InkAnnotation )
+    Q_DISABLE_COPY( InkAnnotation )
+};
+
+class POPPLER_QT5_EXPORT LinkAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    virtual ~LinkAnnotation();
+    virtual SubType subType() const;
+
+    // local enums
+    enum HighlightMode { None, Invert, Outline, Push };
+
+    /** \since 0.20 */
+    Link* linkDestination() const;
+    void setLinkDestination( Link *link );
+
+    HighlightMode linkHighlightMode() const;
+    void setLinkHighlightMode( HighlightMode mode );
+
+    QPointF linkRegionPoint( int id ) const;
+    void setLinkRegionPoint( int id, const QPointF &point );
+
+  private:
+    LinkAnnotation();
+    LinkAnnotation( const QDomNode &node );
+    LinkAnnotation( LinkAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( LinkAnnotation )
+    Q_DISABLE_COPY( LinkAnnotation )
+};
+
+/**
+ * \short Caret annotation.
+ *
+ * The caret annotation represents a symbol to indicate the presence of text.
+ */
+class POPPLER_QT5_EXPORT CaretAnnotation : public Annotation
+{
+  friend class AnnotationUtils;
+  friend class AnnotationPrivate;
+
+  public:
+    CaretAnnotation();
+    virtual ~CaretAnnotation();
+    virtual SubType subType() const;
+
+    /**
+     * The symbols for the caret annotation.
+     */
+    enum CaretSymbol { None, P };
+
+    CaretSymbol caretSymbol() const;
+    void setCaretSymbol( CaretSymbol symbol );
+
+  private:
+    CaretAnnotation( const QDomNode &node );
+    CaretAnnotation( CaretAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( CaretAnnotation )
+    Q_DISABLE_COPY( CaretAnnotation )
+};
+
+/**
+ * \short File attachment annotation.
+ *
+ * The file attachment annotation represents a file embedded in the document.
+ *
+ * \since 0.10
+ */
+class POPPLER_QT5_EXPORT FileAttachmentAnnotation : public Annotation
+{
+  friend class AnnotationPrivate;
+
+  public:
+    virtual ~FileAttachmentAnnotation();
+    virtual SubType subType() const;
+
+    /**
+     * Returns the name of the icon of this annotation.
+     */
+    QString fileIconName() const;
+    /**
+     * Sets a new name for the icon of this annotation.
+     */
+    void setFileIconName( const QString &icon );
+
+    /**
+     * Returns the EmbeddedFile of this annotation.
+     */
+    EmbeddedFile* embeddedFile() const;
+    /**
+     * Sets a new EmbeddedFile for this annotation.
+     *
+     * \note FileAttachmentAnnotation takes ownership of the object
+     */
+    void setEmbeddedFile( EmbeddedFile *ef );
+
+  private:
+    FileAttachmentAnnotation();
+    FileAttachmentAnnotation( const QDomNode &node );
+    FileAttachmentAnnotation( FileAttachmentAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( FileAttachmentAnnotation )
+    Q_DISABLE_COPY( FileAttachmentAnnotation )
+};
+
+/**
+ * \short Sound annotation.
+ *
+ * The sound annotation represents a sound to be played when activated.
+ *
+ * \since 0.10
+ */
+class POPPLER_QT5_EXPORT SoundAnnotation : public Annotation
+{
+  friend class AnnotationPrivate;
+
+  public:
+    virtual ~SoundAnnotation();
+    virtual SubType subType() const;
+
+    /**
+     * Returns the name of the icon of this annotation.
+     */
+    QString soundIconName() const;
+    /**
+     * Sets a new name for the icon of this annotation.
+     */
+    void setSoundIconName( const QString &icon );
+
+    /**
+     * Returns the SoundObject of this annotation.
+     */
+    SoundObject* sound() const;
+    /**
+     * Sets a new SoundObject for this annotation.
+     *
+     * \note SoundAnnotation takes ownership of the object
+     */
+    void setSound( SoundObject *ef );
+
+  private:
+    SoundAnnotation();
+    SoundAnnotation( const QDomNode &node );
+    SoundAnnotation( SoundAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( SoundAnnotation )
+    Q_DISABLE_COPY( SoundAnnotation )
+};
+
+/**
+ * \short Movie annotation.
+ *
+ * The movie annotation represents a movie to be played when activated.
+ *
+ * \since 0.10
+ */
+class POPPLER_QT5_EXPORT MovieAnnotation : public Annotation
+{
+  friend class AnnotationPrivate;
+
+  public:
+    virtual ~MovieAnnotation();
+    virtual SubType subType() const;
+
+    /**
+     * Returns the MovieObject of this annotation.
+     */
+    MovieObject* movie() const;
+    /**
+     * Sets a new MovieObject for this annotation.
+     *
+     * \note MovieAnnotation takes ownership of the object
+     */
+    void setMovie( MovieObject *movie );
+
+    /**
+     * Returns the title of the movie of this annotation.
+     */
+    QString movieTitle() const;
+    /**
+     * Sets a new title for the movie of this annotation.
+     */
+    void setMovieTitle( const QString &title );
+
+  private:
+    MovieAnnotation();
+    MovieAnnotation( const QDomNode &node );
+    MovieAnnotation( MovieAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const;
+    Q_DECLARE_PRIVATE( MovieAnnotation )
+    Q_DISABLE_COPY( MovieAnnotation )
+};
+
+/**
+ * \short Screen annotation.
+ *
+ * The screen annotation represents a screen to be played when activated.
+ *
+ * \since 0.20
+ */
+class POPPLER_QT5_EXPORT ScreenAnnotation : public Annotation
+{
+  friend class AnnotationPrivate;
+
+  public:
+    virtual ~ScreenAnnotation();
+
+    virtual SubType subType() const;
+
+    /**
+     * Returns the LinkRendition of this annotation.
+     */
+    LinkRendition* action() const;
+
+    /**
+     * Sets a new LinkRendition for this annotation.
+     *
+     * \note ScreenAnnotation takes ownership of the object
+     */
+    void setAction( LinkRendition *action );
+
+    /**
+     * Returns the title of the screen of this annotation.
+     */
+    QString screenTitle() const;
+
+    /**
+     * Sets a new title for the screen of this annotation.
+     */
+    void setScreenTitle( const QString &title );
+
+    /**
+     * Returns the additional action of the given @p type fo the annotation or
+     * @c 0 if no action has been defined.
+     *
+     * \since 0.22
+     */
+    Link* additionalAction( AdditionalActionType type ) const;
+
+  private:
+    ScreenAnnotation();
+    ScreenAnnotation( ScreenAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const; // stub
+    Q_DECLARE_PRIVATE( ScreenAnnotation )
+    Q_DISABLE_COPY( ScreenAnnotation )
+};
+
+/**
+ * \short Widget annotation.
+ *
+ * The widget annotation represents a widget (form field) on a page.
+ *
+ * \note This class is just provided for consistency of the annotation API,
+ *       use the FormField classes to get all the form-related information.
+ *
+ * \since 0.22
+ */
+class POPPLER_QT5_EXPORT WidgetAnnotation : public Annotation
+{
+  friend class AnnotationPrivate;
+
+  public:
+    virtual ~WidgetAnnotation();
+
+    virtual SubType subType() const;
+
+    /**
+     * Returns the additional action of the given @p type fo the annotation or
+     * @c 0 if no action has been defined.
+     *
+     * \since 0.22
+     */
+    Link* additionalAction( AdditionalActionType type ) const;
+
+  private:
+    WidgetAnnotation();
+    WidgetAnnotation( WidgetAnnotationPrivate &dd );
+    virtual void store( QDomNode &parentNode, QDomDocument &document ) const; // stub
+    Q_DECLARE_PRIVATE( WidgetAnnotation )
+    Q_DISABLE_COPY( WidgetAnnotation )
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-base-converter.cc b/qt5/src/poppler-base-converter.cc
new file mode 100644
index 00000000..20f8f3e9
--- /dev/null
+++ b/qt5/src/poppler-base-converter.cc
@@ -0,0 +1,105 @@
+/* poppler-base-converter.cc: qt interface to poppler
+ * Copyright (C) 2007, 2009, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include "poppler-converter-private.h"
+
+#include <QtCore/QFile>
+
+namespace Poppler {
+
+BaseConverterPrivate::BaseConverterPrivate()
+	: document(0), iodev(0), ownIodev(true)
+{
+}
+
+BaseConverterPrivate::~BaseConverterPrivate()
+{
+}
+
+QIODevice* BaseConverterPrivate::openDevice()
+{
+	if (!iodev)
+	{
+		Q_ASSERT(!outputFileName.isEmpty());
+		QFile *f = new QFile(outputFileName);
+		iodev = f;
+		ownIodev = true;
+	}
+	Q_ASSERT(iodev);
+	if (!iodev->isOpen())
+	{
+		if (!iodev->open(QIODevice::WriteOnly))
+		{
+			if (ownIodev)
+			{
+				delete iodev;
+				iodev = 0;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+	}
+	return iodev;
+}
+
+void BaseConverterPrivate::closeDevice()
+{
+	if (ownIodev)
+	{
+		iodev->close();
+		delete iodev;
+		iodev = 0;
+	}
+}
+
+
+BaseConverter::BaseConverter(BaseConverterPrivate &dd)
+	: d_ptr(&dd)
+{
+}
+
+BaseConverter::~BaseConverter()
+{
+	delete d_ptr;
+}
+
+void BaseConverter::setOutputFileName(const QString &outputFileName)
+{
+	Q_D(BaseConverter);
+	d->outputFileName = outputFileName;
+}
+
+void BaseConverter::setOutputDevice(QIODevice *device)
+{
+	Q_D(BaseConverter);
+	d->iodev = device;
+	d->ownIodev = false;
+}
+
+BaseConverter::Error BaseConverter::lastError() const
+{
+	Q_D(const BaseConverter);
+	return d->lastError;
+}
+
+}
diff --git a/qt5/src/poppler-converter-private.h b/qt5/src/poppler-converter-private.h
new file mode 100644
index 00000000..1340d354
--- /dev/null
+++ b/qt5/src/poppler-converter-private.h
@@ -0,0 +1,49 @@
+/* poppler-converter-private.h: Qt interface to poppler
+ * Copyright (C) 2007, 2009, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef POPPLER_QT5_CONVERTER_PRIVATE_H
+#define POPPLER_QT5_CONVERTER_PRIVATE_H
+
+#include <QtCore/QString>
+
+class QIODevice;
+
+namespace Poppler {
+
+class DocumentData;
+
+class BaseConverterPrivate
+{
+	public:
+		BaseConverterPrivate();
+		virtual ~BaseConverterPrivate();
+
+		QIODevice* openDevice();
+		void closeDevice();
+
+		DocumentData *document;
+		QString outputFileName;
+		QIODevice *iodev;
+		bool ownIodev : 1;
+		BaseConverter::Error lastError;
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc
new file mode 100644
index 00000000..af1804ee
--- /dev/null
+++ b/qt5/src/poppler-document.cc
@@ -0,0 +1,660 @@
+/* poppler-document.cc: qt interface to poppler
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005, 2008, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2005-2010, 2012, 2013, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2006-2010, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2010, 2011 Hib Eris <hib@hiberis.nl>
+ * Copyright (C) 2012 Koji Otani <sho@bbr.jp>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include <config.h>
+#include <ErrorCodes.h>
+#include <GlobalParams.h>
+#include <Outline.h>
+#include <PDFDoc.h>
+#include <Stream.h>
+#include <Catalog.h>
+#include <DateInfo.h>
+#include <GfxState.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QByteArray>
+
+#include "poppler-private.h"
+#include "poppler-page-private.h"
+
+#if defined(USE_CMS)
+#if defined(USE_LCMS1)
+#include <lcms.h>
+#else
+#include <lcms2.h>
+#endif
+#endif
+
+namespace Poppler {
+
+  int DocumentData::count = 0;
+
+  Document *Document::load(const QString &filePath, const QByteArray &ownerPassword,
+			   const QByteArray &userPassword)
+    {
+	DocumentData *doc = new DocumentData(filePath, 
+					     new GooString(ownerPassword.data()),
+					     new GooString(userPassword.data()));
+	return DocumentData::checkDocument(doc);
+    }
+
+    Document *Document::loadFromData(const QByteArray &fileContents,
+			      const QByteArray &ownerPassword,
+			      const QByteArray &userPassword)
+    {
+	// create stream
+	DocumentData *doc = new DocumentData(fileContents,
+					     new GooString(ownerPassword.data()),
+					     new GooString(userPassword.data()));
+	return DocumentData::checkDocument(doc);
+    }
+    
+    Document *DocumentData::checkDocument(DocumentData *doc)
+    {
+	Document *pdoc;
+	if (doc->doc->isOk() || doc->doc->getErrorCode() == errEncrypted) {
+		pdoc = new Document(doc);
+		if (doc->doc->getErrorCode() == errEncrypted)
+			pdoc->m_doc->locked = true;
+		else
+		{
+			pdoc->m_doc->locked = false;
+			pdoc->m_doc->fillMembers();
+		}
+		return pdoc;
+	}
+	else
+	{
+		delete doc;
+	}
+	return NULL;
+    }
+
+    Document::Document(DocumentData *dataA)
+    {
+	m_doc = dataA;
+    }
+
+    Document::~Document()
+    {
+	delete m_doc;
+    }
+
+    Page *Document::page(int index) const
+    {
+	Page *page = new Page(m_doc, index);
+	if (page->m_page->page == NULL) {
+	  delete page;
+	  return NULL;
+	}
+
+	return page;
+    }
+
+    bool Document::isLocked() const
+    {
+	return m_doc->locked;
+    }
+
+    bool Document::unlock(const QByteArray &ownerPassword,
+			  const QByteArray &userPassword)
+    {
+	if (m_doc->locked) {
+	    /* racier then it needs to be */
+	    DocumentData *doc2;
+	    if (!m_doc->fileContents.isEmpty())
+	    {
+		doc2 = new DocumentData(m_doc->fileContents,
+					new GooString(ownerPassword.data()),
+					new GooString(userPassword.data()));
+	    }
+	    else
+	    {
+		doc2 = new DocumentData(m_doc->m_filePath,
+					new GooString(ownerPassword.data()),
+					new GooString(userPassword.data()));
+	    }
+	    if (!doc2->doc->isOk()) {
+		delete doc2;
+	    } else {
+		delete m_doc;
+		m_doc = doc2;
+		m_doc->locked = false;
+		m_doc->fillMembers();
+	    }
+	}
+	return m_doc->locked;
+    }
+
+    Document::PageMode Document::pageMode() const
+    {
+	switch (m_doc->doc->getCatalog()->getPageMode()) {
+	case Catalog::pageModeNone:
+	    return UseNone;
+	case Catalog::pageModeOutlines:
+	    return UseOutlines;
+	case Catalog::pageModeThumbs:
+	    return UseThumbs;
+	case Catalog::pageModeFullScreen:
+	    return FullScreen;
+	case Catalog::pageModeOC:
+	    return UseOC;
+	case Catalog::pageModeAttach:
+	    return UseAttach;
+	default:
+	    return UseNone;
+	}
+    }
+
+    Document::PageLayout Document::pageLayout() const
+    {
+	switch (m_doc->doc->getCatalog()->getPageLayout()) {
+	case Catalog::pageLayoutNone:
+	    return NoLayout;
+	case Catalog::pageLayoutSinglePage:
+	    return SinglePage;
+	case Catalog::pageLayoutOneColumn:
+	    return OneColumn;
+	case Catalog::pageLayoutTwoColumnLeft:
+	    return TwoColumnLeft;
+	case Catalog::pageLayoutTwoColumnRight:
+	    return TwoColumnRight;
+	case Catalog::pageLayoutTwoPageLeft:
+	    return TwoPageLeft;
+	case Catalog::pageLayoutTwoPageRight:
+	    return TwoPageRight;
+	default:
+	    return NoLayout;
+	}
+    }
+
+    int Document::numPages() const
+    {
+	return m_doc->doc->getNumPages();
+    }
+
+    QList<FontInfo> Document::fonts() const
+    {
+	QList<FontInfo> ourList;
+	FontIterator it( 0, m_doc );
+	while ( it.hasNext() )
+	{
+		ourList += it.next();
+	}
+	return ourList;
+    }
+
+    QList<EmbeddedFile*> Document::embeddedFiles() const
+    {
+	return m_doc->m_embeddedFiles;
+    }
+
+    FontIterator* Document::newFontIterator( int startPage ) const
+    {
+	return new FontIterator( startPage, m_doc );
+    }
+
+    QByteArray Document::fontData(const FontInfo &fi) const
+    {
+	QByteArray result;
+	if (fi.isEmbedded())
+	{
+		Object refObj, strObj;
+		XRef *xref = m_doc->doc->getXRef()->copy();
+
+		refObj.initRef(fi.m_data->embRef.num, fi.m_data->embRef.gen);
+		refObj.fetch(xref, &strObj);
+		refObj.free();
+		if (strObj.isStream())
+		{
+			int c;
+			strObj.streamReset();
+			while ((c = strObj.streamGetChar()) != EOF)
+			{
+				result.append((char)c);
+			}
+			strObj.streamClose();
+		}
+		strObj.free();
+		delete xref;
+	}
+	return result;
+    }
+
+    /* borrowed from kpdf */
+    QString Document::info( const QString & type ) const
+    {
+	// [Albert] Code adapted from pdfinfo.cc on xpdf
+	Object info;
+	if ( m_doc->locked )
+	    return QString();
+
+	QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy());
+	xref->getDocInfo(&info);
+	if ( !info.isDict() )
+	    return QString();
+
+	QString result;
+	Object obj;
+	GooString *s1;
+	Dict *infoDict = info.getDict();
+
+	if ( infoDict->lookup( type.toLatin1().data(), &obj )->isString() )
+	{
+	    s1 = obj.getString();
+	    result = UnicodeParsedString(s1);
+	    obj.free();
+	    info.free();
+	    return result;
+	}
+	obj.free();
+	info.free();
+	return QString();
+    }
+
+    QStringList Document::infoKeys() const
+    {
+	QStringList keys;
+
+	Object info;
+	if ( m_doc->locked )
+	    return QStringList();
+
+	QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy());
+	xref->getDocInfo(&info);
+	if ( !info.isDict() )
+	    return QStringList();
+
+	Dict *infoDict = info.getDict();
+	// somehow iterate over keys in infoDict
+	for( int i=0; i < infoDict->getLength(); ++i ) {
+	    keys.append( QString::fromLatin1(infoDict->getKey(i)) );
+	}
+
+	info.free();
+	return keys;
+    }
+
+    /* borrowed from kpdf */
+    QDateTime Document::date( const QString & type ) const
+    {
+	// [Albert] Code adapted from pdfinfo.cc on xpdf
+	if ( m_doc->locked )
+	    return QDateTime();
+
+	Object info;
+	QScopedPointer<XRef> xref(m_doc->doc->getXRef()->copy());
+	xref->getDocInfo(&info);
+	if ( !info.isDict() ) {
+	    info.free();
+	    return QDateTime();
+	}
+
+	Object obj;
+	Dict *infoDict = info.getDict();
+	QDateTime result;
+
+	if ( infoDict->lookup( type.toLatin1().data(), &obj )->isString() )
+	{
+	    char *aux = obj.getString()->getCString();
+	    result = Poppler::convertDate(aux);
+	}
+	obj.free();
+	info.free();
+	return result;
+    }
+
+    bool Document::isEncrypted() const
+    {
+	return m_doc->doc->isEncrypted();
+    }
+
+    bool Document::isLinearized() const
+    {
+	return m_doc->doc->isLinearized();
+    }
+
+    bool Document::okToPrint() const
+    {
+	return m_doc->doc->okToPrint();
+    }
+
+    bool Document::okToPrintHighRes() const
+    {
+	return m_doc->doc->okToPrintHighRes();
+    }
+
+    bool Document::okToChange() const
+    {
+	return m_doc->doc->okToChange();
+    }
+
+    bool Document::okToCopy() const
+    {
+	return m_doc->doc->okToCopy();
+    }
+
+    bool Document::okToAddNotes() const
+    {
+	return m_doc->doc->okToAddNotes();
+    }
+
+    bool Document::okToFillForm() const
+    {
+	return m_doc->doc->okToFillForm();
+    }
+
+    bool Document::okToCreateFormFields() const
+    {
+	return ( okToFillForm() && okToChange() );
+    }
+
+    bool Document::okToExtractForAccessibility() const
+    {
+	return m_doc->doc->okToAccessibility();
+    }
+
+    bool Document::okToAssemble() const
+    {
+	return m_doc->doc->okToAssemble();
+    }
+
+    void Document::getPdfVersion(int *major, int *minor) const
+    {
+	if (major)
+	    *major = m_doc->doc->getPDFMajorVersion();
+	if (minor)
+	    *minor = m_doc->doc->getPDFMinorVersion();
+    }
+
+    Page *Document::page(const QString &label) const
+    {
+	GooString label_g(label.toLatin1().data());
+	int index;
+
+	if (!m_doc->doc->getCatalog()->labelToIndex (&label_g, &index))
+	    return NULL;
+
+	return page(index);
+    }
+
+    bool Document::hasEmbeddedFiles() const
+    {
+	return (!(0 == m_doc->doc->getCatalog()->numEmbeddedFiles()));
+    }
+    
+    QDomDocument *Document::toc() const
+    {
+        Outline * outline = m_doc->doc->getOutline();
+        if ( !outline )
+            return NULL;
+
+        GooList * items = outline->getItems();
+        if ( !items || items->getLength() < 1 )
+            return NULL;
+
+        QDomDocument *toc = new QDomDocument();
+        if ( items->getLength() > 0 )
+           m_doc->addTocChildren( toc, toc, items );
+
+        return toc;
+    }
+
+    LinkDestination *Document::linkDestination( const QString &name )
+    {
+        GooString * namedDest = QStringToGooString( name );
+        LinkDestinationData ldd(NULL, namedDest, m_doc, false);
+        LinkDestination *ld = new LinkDestination(ldd);
+        delete namedDest;
+        return ld;
+    }
+    
+    void Document::setPaperColor(const QColor &color)
+    {
+        m_doc->setPaperColor(color);
+    }
+    
+    void Document::setColorDisplayProfile(void* outputProfileA)
+    {
+#if defined(USE_CMS)
+        GfxColorSpace::setDisplayProfile((cmsHPROFILE)outputProfileA);
+#else
+        Q_UNUSED(outputProfileA);
+#endif
+    }
+
+    void Document::setColorDisplayProfileName(const QString &name)
+    {
+#if defined(USE_CMS)
+        GooString *profileName = QStringToGooString( name );
+        GfxColorSpace::setDisplayProfileName(profileName);
+        delete profileName;
+#else
+        Q_UNUSED(name);
+#endif
+    }
+
+    void* Document::colorRgbProfile() const
+    {
+#if defined(USE_CMS)
+        return (void*)GfxColorSpace::getRGBProfile();
+#else
+        return NULL;
+#endif
+    }
+
+    void* Document::colorDisplayProfile() const
+    {
+#if defined(USE_CMS)
+       return (void*)GfxColorSpace::getDisplayProfile();
+#else
+       return NULL;
+#endif
+    }
+
+    QColor Document::paperColor() const
+    {
+    	return m_doc->paperColor;
+    }
+
+    void Document::setRenderBackend( Document::RenderBackend backend )
+    {
+        // no need to delete the outputdev as for the moment we always create a splash one
+        // as the arthur one does not allow "precaching" due to it's signature
+        // delete m_doc->m_outputDev;
+        // m_doc->m_outputDev = NULL;
+        m_doc->m_backend = backend;
+    }
+
+    Document::RenderBackend Document::renderBackend() const
+    {
+        return m_doc->m_backend;
+    }
+
+    QSet<Document::RenderBackend> Document::availableRenderBackends()
+    {
+        QSet<Document::RenderBackend> ret;
+#if defined(HAVE_SPLASH)
+        ret << Document::SplashBackend;
+#endif
+        ret << Document::ArthurBackend;
+        return ret;
+    }
+
+    void Document::setRenderHint( Document::RenderHint hint, bool on )
+    {
+        const bool touchesOverprinting = hint & Document::OverprintPreview;
+        
+        int hintForOperation = hint;
+        if (touchesOverprinting && !isOverprintPreviewAvailable())
+            hintForOperation = hintForOperation & ~(int)Document::OverprintPreview;
+
+        if ( on )
+            m_doc->m_hints |= hintForOperation;
+        else
+            m_doc->m_hints &= ~hintForOperation;
+
+    }
+
+    Document::RenderHints Document::renderHints() const
+    {
+        return Document::RenderHints( m_doc->m_hints );
+    }
+
+    PSConverter *Document::psConverter() const
+    {
+        return new PSConverter(m_doc);
+    }
+
+    PDFConverter *Document::pdfConverter() const
+    {
+        return new PDFConverter(m_doc);
+    }
+
+    QString Document::metadata() const
+    {
+        QString result;
+        Catalog *catalog = m_doc->doc->getCatalog();
+        if (catalog && catalog->isOk())
+        {
+            GooString *s = catalog->readMetadata();
+            if (s) result = UnicodeParsedString(s);
+            delete s;
+        }
+        return result;
+    }
+
+    bool Document::hasOptionalContent() const
+    {
+        return ( m_doc->doc->getOptContentConfig() && m_doc->doc->getOptContentConfig()->hasOCGs() );
+    }
+
+    OptContentModel *Document::optionalContentModel()
+    {
+        if (m_doc->m_optContentModel.isNull()) {
+	    m_doc->m_optContentModel = new OptContentModel(m_doc->doc->getOptContentConfig(), 0);
+	}
+        return (OptContentModel *)m_doc->m_optContentModel;
+    }
+
+    QStringList Document::scripts() const
+    {
+        Catalog *catalog = m_doc->doc->getCatalog();
+        const int numScripts = catalog->numJS();
+        QStringList scripts;
+        for (int i = 0; i < numScripts; ++i) {
+            GooString *s = catalog->getJS(i);
+            if (s) {
+                scripts.append(UnicodeParsedString(s));
+                delete s;
+            }
+        }
+        return scripts;
+    }
+
+    bool Document::getPdfId(QByteArray *permanentId, QByteArray *updateId) const
+    {
+        GooString gooPermanentId;
+        GooString gooUpdateId;
+
+        if (!m_doc->doc->getID(permanentId ? &gooPermanentId : 0, updateId ? &gooUpdateId : 0))
+            return false;
+
+        if (permanentId)
+            *permanentId = gooPermanentId.getCString();
+        if (updateId)
+            *updateId = gooUpdateId.getCString();
+
+        return true;
+    }
+
+    Document::FormType Document::formType() const
+    {
+        switch ( m_doc->doc->getCatalog()->getFormType() )
+        {
+            case Catalog::NoForm:
+                return Document::NoForm;
+            case Catalog::AcroForm:
+                return Document::AcroForm;
+            case Catalog::XfaForm:
+                return Document::XfaForm;
+        }
+
+        return Document::NoForm; // make gcc happy
+    }
+
+    QDateTime convertDate( char *dateString )
+    {
+        int year, mon, day, hour, min, sec, tzHours, tzMins;
+        char tz;
+
+        if ( parseDateString( dateString, &year, &mon, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins ) )
+        {
+            QDate d( year, mon, day );
+            QTime t( hour, min, sec );
+            if ( d.isValid() && t.isValid() ) {
+                QDateTime dt( d, t, Qt::UTC );
+                if ( tz ) {
+                    // then we have some form of timezone
+                    if ( 'Z' == tz  ) {
+                        // We are already at UTC
+                    } else if ( '+' == tz ) {
+                        // local time is ahead of UTC
+                        dt = dt.addSecs(-1*((tzHours*60)+tzMins)*60);
+                    } else if ( '-' == tz ) {
+                        // local time is behind UTC
+                        dt = dt.addSecs(((tzHours*60)+tzMins)*60);
+                    } else {
+                        qWarning("unexpected tz val");
+                    }
+                }
+		return dt;
+            }
+        }
+        return QDateTime();
+    }
+
+    bool isCmsAvailable()
+    {
+#if defined(USE_CMS)
+        return true;
+#else
+        return false;
+#endif
+    }
+
+    bool isOverprintPreviewAvailable() {
+#if defined(SPLASH_CMYK)
+        return true;
+#else
+        return false;
+#endif
+   }
+
+}
+
diff --git a/qt5/src/poppler-embeddedfile-private.h b/qt5/src/poppler-embeddedfile-private.h
new file mode 100644
index 00000000..ff1388ec
--- /dev/null
+++ b/qt5/src/poppler-embeddedfile-private.h
@@ -0,0 +1,42 @@
+/* poppler-embeddedfile-private.h: Qt interface to poppler
+ * Copyright (C) 2005, 2008, 2009, 2012, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2008, 2011, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef POPPLER_EMBEDDEDFILE_PRIVATE_H
+#define POPPLER_EMBEDDEDFILE_PRIVATE_H
+
+class FileSpec;
+
+namespace Poppler
+{
+
+class EmbeddedFileData
+{
+public:
+	EmbeddedFileData(FileSpec *fs);
+	~EmbeddedFileData();
+    
+	EmbFile *embFile() const;
+
+	FileSpec *filespec;
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-embeddedfile.cc b/qt5/src/poppler-embeddedfile.cc
new file mode 100644
index 00000000..d042be90
--- /dev/null
+++ b/qt5/src/poppler-embeddedfile.cc
@@ -0,0 +1,135 @@
+/* poppler-document.cc: qt interface to poppler
+ * Copyright (C) 2005, 2008, 2009, 2012, 2013, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2008, 2011, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
+
+#include "Object.h"
+#include "Stream.h"
+#include "Catalog.h"
+#include "FileSpec.h"
+
+#include "poppler-private.h"
+#include "poppler-embeddedfile-private.h"
+
+namespace Poppler
+{
+
+EmbeddedFileData::EmbeddedFileData(FileSpec *fs)
+	: filespec(fs)
+{
+}
+
+EmbeddedFileData::~EmbeddedFileData()
+{
+	delete filespec;
+}
+
+EmbFile *EmbeddedFileData::embFile() const
+{
+	return filespec->isOk() ? filespec->getEmbeddedFile() : NULL;
+}
+
+
+EmbeddedFile::EmbeddedFile(EmbFile *embfile)
+	: m_embeddedFile(0)
+{
+	assert(!"You must not use this private constructor!");
+}
+
+EmbeddedFile::EmbeddedFile(EmbeddedFileData &dd)
+	: m_embeddedFile(&dd)
+{
+}
+
+EmbeddedFile::~EmbeddedFile()
+{
+	delete m_embeddedFile;
+}
+
+QString EmbeddedFile::name() const
+{
+	GooString *goo = m_embeddedFile->filespec->getFileName();
+	return goo ? UnicodeParsedString(goo) : QString();
+}
+
+QString EmbeddedFile::description() const
+{
+	GooString *goo = m_embeddedFile->filespec->getDescription();
+	return goo ? UnicodeParsedString(goo) : QString();
+}
+
+int EmbeddedFile::size() const
+{
+	return m_embeddedFile->embFile() ? m_embeddedFile->embFile()->size() : -1;
+}
+
+QDateTime EmbeddedFile::modDate() const
+{
+	GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->modDate() : NULL;
+	return goo ? convertDate(goo->getCString()) : QDateTime();
+}
+
+QDateTime EmbeddedFile::createDate() const
+{
+	GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->createDate() : NULL;
+	return goo ? convertDate(goo->getCString()) : QDateTime();
+}
+
+QByteArray EmbeddedFile::checksum() const
+{
+	GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->checksum() : NULL;
+	return goo ? QByteArray::fromRawData(goo->getCString(), goo->getLength()) : QByteArray();
+}
+
+QString EmbeddedFile::mimeType() const
+{
+	GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->mimeType() : NULL;
+	return goo ? QString(goo->getCString()) : QString();
+}
+
+QByteArray EmbeddedFile::data()
+{
+	if (!isValid())
+		return QByteArray();
+	Stream *stream = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->stream() : NULL;
+	if (!stream)
+		return QByteArray();
+	
+	stream->reset();
+	int dataLen = 0;
+	QByteArray fileArray;
+	int i;
+	while ( (i = stream->getChar()) != EOF) {
+		fileArray[dataLen] = (char)i;
+		++dataLen;
+	}
+	fileArray.resize(dataLen);
+	return fileArray;
+}
+
+bool EmbeddedFile::isValid() const
+{
+	return m_embeddedFile->filespec->isOk();
+}
+
+}
diff --git a/qt5/src/poppler-export.h b/qt5/src/poppler-export.h
new file mode 100644
index 00000000..fdce95c7
--- /dev/null
+++ b/qt5/src/poppler-export.h
@@ -0,0 +1,17 @@
+/*
+* This file is used to set the poppler_qt5_EXPORT macros right.
+* This is needed for setting the visibility on windows, it will have no effect on other platforms.
+*/
+#if defined(_WIN32)
+# define LIB_EXPORT __declspec(dllexport)
+# define LIB_IMPORT __declspec(dllimport)
+#else
+# define LIB_EXPORT
+# define LIB_IMPORT
+#endif
+
+#ifdef poppler_qt5_EXPORTS
+# define POPPLER_QT5_EXPORT LIB_EXPORT
+#else
+# define POPPLER_QT5_EXPORT LIB_IMPORT
+#endif
diff --git a/qt5/src/poppler-fontinfo.cc b/qt5/src/poppler-fontinfo.cc
new file mode 100644
index 00000000..f2a55790
--- /dev/null
+++ b/qt5/src/poppler-fontinfo.cc
@@ -0,0 +1,149 @@
+/* poppler-qt.h: qt interface to poppler
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005, Tobias Koening <tokoe@kde.org>
+ * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2005-2008, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, 2009, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+#include "poppler-private.h"
+
+namespace Poppler {
+
+FontInfo::FontInfo()
+{
+	m_data = new FontInfoData();
+}
+
+FontInfo::FontInfo( const FontInfoData &fid )
+{
+	m_data = new FontInfoData(fid);
+}
+
+FontInfo::FontInfo( const FontInfo &fi )
+{
+	m_data = new FontInfoData(*fi.m_data);
+}
+
+FontInfo::~FontInfo()
+{
+	delete m_data;
+}
+
+QString FontInfo::name() const
+{
+	return m_data->fontName;
+}
+
+QString FontInfo::file() const
+{
+	return m_data->fontFile;
+}
+
+bool FontInfo::isEmbedded() const
+{
+	return m_data->isEmbedded;
+}
+
+bool FontInfo::isSubset() const
+{
+	return m_data->isSubset;
+}
+
+FontInfo::Type FontInfo::type() const
+{
+	return m_data->type;
+}
+
+QString FontInfo::typeName() const
+{
+	switch (type()) {
+	case unknown:
+		return QObject::tr("unknown");
+	case Type1:
+		return QObject::tr("Type 1");
+	case Type1C:
+		return QObject::tr("Type 1C");
+	case Type3:
+		return QObject::tr("Type 3");
+	case TrueType:
+		return QObject::tr("TrueType");
+	case CIDType0:
+		return QObject::tr("CID Type 0");
+	case CIDType0C:
+		return QObject::tr("CID Type 0C");
+	case CIDTrueType:
+		return QObject::tr("CID TrueType");
+	case Type1COT:
+		return QObject::tr("Type 1C (OpenType)");
+	case TrueTypeOT:
+		return QObject::tr("TrueType (OpenType)");
+	case CIDType0COT:
+		return QObject::tr("CID Type 0C (OpenType)");
+	case CIDTrueTypeOT:
+		return QObject::tr("CID TrueType (OpenType)");
+	}
+	return QObject::tr("Bug: unexpected font type. Notify poppler mailing list!");
+}
+
+FontInfo& FontInfo::operator=( const FontInfo &fi )
+{
+	if (this == &fi)
+		return *this;
+
+	*m_data = *fi.m_data;
+	return *this;
+}
+
+
+FontIterator::FontIterator( int startPage, DocumentData *dd )
+	: d( new FontIteratorData( startPage, dd ) )
+{
+}
+
+FontIterator::~FontIterator()
+{
+	delete d;
+}
+
+QList<FontInfo> FontIterator::next()
+{
+	++d->currentPage;
+
+	QList<FontInfo> fonts;
+	GooList *items = d->fontInfoScanner.scan( 1 );
+	if ( !items )
+		return fonts;
+	for ( int i = 0; i < items->getLength(); ++i ) {
+		fonts.append( FontInfo( FontInfoData( ( ::FontInfo* )items->get( i ) ) ) );
+	}
+	deleteGooList( items, ::FontInfo );
+	return fonts;
+}
+
+bool FontIterator::hasNext() const
+{
+	return ( d->currentPage + 1 ) < d->totalPages;
+}
+
+int FontIterator::currentPage() const
+{
+	return d->currentPage;
+}
+
+}
diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc
new file mode 100644
index 00000000..4be0482d
--- /dev/null
+++ b/qt5/src/poppler-form.cc
@@ -0,0 +1,416 @@
+/* poppler-form.h: qt interface to poppler
+ * Copyright (C) 2007-2008, 2011, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, 2011, 2012 Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+ * Copyright (C) 2012, Adam Reichold <adamreichold@myopera.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include <QtCore/QSizeF>
+
+#include <Form.h>
+#include <Object.h>
+#include <Link.h>
+
+#include "poppler-form.h"
+#include "poppler-page-private.h"
+#include "poppler-private.h"
+#include "poppler-annotation-helper.h"
+
+#include <math.h>
+
+namespace {
+
+Qt::Alignment formTextAlignment(::FormWidget *fm)
+{
+  Qt::Alignment qtalign = Qt::AlignLeft;
+  switch (fm->getField()->getTextQuadding())
+  {
+    case quaddingCentered:
+      qtalign = Qt::AlignHCenter;
+      break;
+    case quaddingRightJustified:
+      qtalign = Qt::AlignRight;
+      break;
+    case quaddingLeftJustified:
+      qtalign = Qt::AlignLeft;
+  }
+  return qtalign;
+}
+
+}
+
+namespace Poppler {
+
+FormField::FormField(FormFieldData &dd)
+  : m_formData(&dd)
+{
+  const int rotation = m_formData->page->getRotate();
+  // reading the coords
+  double left, top, right, bottom;
+  m_formData->fm->getRect(&left, &bottom, &right, &top);
+  // build a normalized transform matrix for this page at 100% scale
+  GfxState gfxState( 72.0, 72.0, m_formData->page->getCropBox(), rotation, gTrue );
+  double * gfxCTM = gfxState.getCTM();
+  double MTX[6];
+  double pageWidth = m_formData->page->getCropWidth();
+  double pageHeight = m_formData->page->getCropHeight();
+  // landscape and seascape page rotation: be sure to use the correct (== rotated) page size
+  if (((rotation / 90) % 2) == 1)
+    qSwap(pageWidth, pageHeight);
+  for ( int i = 0; i < 6; i+=2 )
+  {
+    MTX[i] = gfxCTM[i] / pageWidth;
+    MTX[i+1] = gfxCTM[i+1] / pageHeight;
+  }
+  QPointF topLeft;
+  XPDFReader::transform( MTX, qMin( left, right ), qMax( top, bottom ), topLeft );
+  QPointF bottomRight;
+  XPDFReader::transform( MTX, qMax( left, right ), qMin( top, bottom ), bottomRight );
+  m_formData->box = QRectF(topLeft, QSizeF(bottomRight.x() - topLeft.x(), bottomRight.y() - topLeft.y()));
+}
+
+FormField::~FormField()
+{
+  delete m_formData;
+  m_formData = 0;
+}
+
+QRectF FormField::rect() const
+{
+  return m_formData->box;
+}
+
+int FormField::id() const
+{
+  return m_formData->fm->getID();
+}
+
+QString FormField::name() const
+{
+  QString name;
+  if (GooString *goo = m_formData->fm->getPartialName())
+  {
+    name = QString::fromLatin1(goo->getCString());
+  }
+  return name;
+}
+
+QString FormField::fullyQualifiedName() const
+{
+  QString name;
+  if (GooString *goo = m_formData->fm->getFullyQualifiedName())
+  {
+    name = UnicodeParsedString(goo);
+  }
+  return name;
+}
+
+QString FormField::uiName() const
+{
+  QString name;
+  if (GooString *goo = m_formData->fm->getAlternateUiName())
+  {
+    name = QString::fromLatin1(goo->getCString());
+  }
+  return name;
+}
+
+bool FormField::isReadOnly() const
+{
+  return m_formData->fm->isReadOnly();
+}
+
+bool FormField::isVisible() const
+{
+  return !(m_formData->fm->getWidgetAnnotation()->getFlags() & Annot::flagHidden);
+}
+
+Link* FormField::activationAction() const
+{
+  Link* action = 0;
+  if (::LinkAction *act = m_formData->fm->getActivationAction())
+  {
+    action = PageData::convertLinkActionToLink(act, m_formData->doc, QRectF());
+  }
+  return action;
+}
+
+
+FormFieldButton::FormFieldButton(DocumentData *doc, ::Page *p, ::FormWidgetButton *w)
+  : FormField(*new FormFieldData(doc, p, w))
+{
+}
+
+FormFieldButton::~FormFieldButton()
+{
+}
+
+FormFieldButton::FormType FormFieldButton::type() const
+{
+  return FormField::FormButton;
+}
+
+FormFieldButton::ButtonType FormFieldButton::buttonType() const
+{
+  FormWidgetButton* fwb = static_cast<FormWidgetButton*>(m_formData->fm);
+  switch (fwb->getButtonType())
+  {
+    case formButtonCheck:
+      return FormFieldButton::CheckBox;
+      break;
+    case formButtonPush:
+      return FormFieldButton::Push;
+      break;
+    case formButtonRadio:
+      return FormFieldButton::Radio;
+      break;
+  }
+  return FormFieldButton::CheckBox;
+}
+
+QString FormFieldButton::caption() const
+{
+  FormWidgetButton* fwb = static_cast<FormWidgetButton*>(m_formData->fm);
+  QString ret;
+  if (fwb->getButtonType() == formButtonPush)
+  {
+    Dict *dict = m_formData->fm->getObj()->getDict();
+    Object obj1;
+    if (dict->lookup("MK", &obj1)->isDict())
+    {
+      AnnotAppearanceCharacs appearCharacs(obj1.getDict());
+      if (appearCharacs.getNormalCaption())
+      {
+        ret = UnicodeParsedString(appearCharacs.getNormalCaption());
+      }
+    }
+    obj1.free();
+  }
+  else
+  {
+    if (const char *goo = fwb->getOnStr())
+    {
+      ret = QString::fromUtf8(goo);
+    }
+  }
+  return ret;
+}
+
+bool FormFieldButton::state() const
+{
+  FormWidgetButton* fwb = static_cast<FormWidgetButton*>(m_formData->fm);
+  return fwb->getState();
+}
+
+void FormFieldButton::setState( bool state )
+{
+  FormWidgetButton* fwb = static_cast<FormWidgetButton*>(m_formData->fm);
+  fwb->setState((GBool)state);
+}
+
+QList<int> FormFieldButton::siblings() const
+{
+  FormWidgetButton* fwb = static_cast<FormWidgetButton*>(m_formData->fm);
+  ::FormFieldButton* ffb = static_cast< ::FormFieldButton* >(fwb->getField());
+  if (fwb->getButtonType() == formButtonPush)
+    return QList<int>();
+
+  QList<int> ret;
+  for (int i = 0; i < ffb->getNumSiblings(); ++i)
+  {
+    ::FormFieldButton* sibling = static_cast< ::FormFieldButton* >(ffb->getSibling(i));
+    for (int j = 0; j < sibling->getNumWidgets(); ++j)
+    {
+        FormWidget *w = sibling->getWidget(j);
+        if (w) ret.append(w->getID());
+    }
+  }
+
+  return ret;
+}
+
+
+FormFieldText::FormFieldText(DocumentData *doc, ::Page *p, ::FormWidgetText *w)
+  : FormField(*new FormFieldData(doc, p, w))
+{
+}
+
+FormFieldText::~FormFieldText()
+{
+}
+
+FormField::FormType FormFieldText::type() const
+{
+  return FormField::FormText;
+}
+
+FormFieldText::TextType FormFieldText::textType() const
+{
+  FormWidgetText* fwt = static_cast<FormWidgetText*>(m_formData->fm);
+  if (fwt->isFileSelect())
+    return FormFieldText::FileSelect;
+  else if (fwt->isMultiline())
+    return FormFieldText::Multiline;
+  return FormFieldText::Normal;
+}
+
+QString FormFieldText::text() const
+{
+  GooString *goo = static_cast<FormWidgetText*>(m_formData->fm)->getContent();
+  return UnicodeParsedString(goo);
+}
+
+void FormFieldText::setText( const QString& text )
+{
+  FormWidgetText* fwt = static_cast<FormWidgetText*>(m_formData->fm);
+  GooString * goo = QStringToUnicodeGooString( text );
+  fwt->setContent( goo );
+  delete goo;
+}
+
+bool FormFieldText::isPassword() const
+{
+  FormWidgetText* fwt = static_cast<FormWidgetText*>(m_formData->fm);
+  return fwt->isPassword();
+}
+
+bool FormFieldText::isRichText() const
+{
+  FormWidgetText* fwt = static_cast<FormWidgetText*>(m_formData->fm);
+  return fwt->isRichText();
+}
+
+int FormFieldText::maximumLength() const
+{
+  FormWidgetText* fwt = static_cast<FormWidgetText*>(m_formData->fm);
+  const int maxlen = fwt->getMaxLen();
+  return maxlen > 0 ? maxlen : -1;
+}
+
+Qt::Alignment FormFieldText::textAlignment() const
+{
+  return formTextAlignment(m_formData->fm);
+}
+
+bool FormFieldText::canBeSpellChecked() const
+{
+  FormWidgetText* fwt = static_cast<FormWidgetText*>(m_formData->fm);
+  return !fwt->noSpellCheck();
+}
+
+
+FormFieldChoice::FormFieldChoice(DocumentData *doc, ::Page *p, ::FormWidgetChoice *w)
+  : FormField(*new FormFieldData(doc, p, w))
+{
+}
+
+FormFieldChoice::~FormFieldChoice()
+{
+}
+
+FormFieldChoice::FormType FormFieldChoice::type() const
+{
+  return FormField::FormChoice;
+}
+
+FormFieldChoice::ChoiceType FormFieldChoice::choiceType() const
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  if (fwc->isCombo())
+    return FormFieldChoice::ComboBox;
+  return FormFieldChoice::ListBox;
+}
+
+QStringList FormFieldChoice::choices() const
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  QStringList ret;
+  int num = fwc->getNumChoices();
+  for (int i = 0; i < num; ++i)
+  {
+    ret.append(UnicodeParsedString(fwc->getChoice(i)));
+  }
+  return ret;
+}
+
+bool FormFieldChoice::isEditable() const
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  return fwc->isCombo() ? fwc->hasEdit() : false;
+}
+
+bool FormFieldChoice::multiSelect() const
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  return !fwc->isCombo() ? fwc->isMultiSelect() : false;
+}
+
+QList<int> FormFieldChoice::currentChoices() const
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  int num = fwc->getNumChoices();
+  QList<int> choices;
+  for ( int i = 0; i < num; ++i )
+    if ( fwc->isSelected( i ) )
+      choices.append( i );
+  return choices;
+}
+
+void FormFieldChoice::setCurrentChoices( const QList<int> &choice )
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  fwc->deselectAll();
+  for ( int i = 0; i < choice.count(); ++i )
+    fwc->select( choice.at( i ) );
+}
+
+QString FormFieldChoice::editChoice() const
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  
+  if ( fwc->isCombo() && fwc->hasEdit() )
+    return UnicodeParsedString(fwc->getEditChoice());
+  else
+    return QString();
+}
+
+void FormFieldChoice::setEditChoice(const QString& text)
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  
+  if ( fwc->isCombo() && fwc->hasEdit() )
+  {
+    GooString* goo = QStringToUnicodeGooString( text );
+    fwc->setEditChoice( goo );
+    delete goo;
+  }
+}
+
+Qt::Alignment FormFieldChoice::textAlignment() const
+{
+  return formTextAlignment(m_formData->fm);
+}
+
+bool FormFieldChoice::canBeSpellChecked() const
+{
+  FormWidgetChoice* fwc = static_cast<FormWidgetChoice*>(m_formData->fm);
+  return !fwc->noSpellCheck();
+}
+
+}
diff --git a/qt5/src/poppler-form.h b/qt5/src/poppler-form.h
new file mode 100644
index 00000000..3481ce7b
--- /dev/null
+++ b/qt5/src/poppler-form.h
@@ -0,0 +1,343 @@
+/* poppler-form.h: qt interface to poppler
+ * Copyright (C) 2007-2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, 2011, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2012, Adam Reichold <adamreichold@myopera.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _POPPLER_QT5_FORM_H_
+#define _POPPLER_QT5_FORM_H_
+
+#include <QtCore/QRectF>
+#include <QtCore/QStringList>
+#include "poppler-export.h"
+
+class Page;
+class FormWidget;
+class FormWidgetButton;
+class FormWidgetText;
+class FormWidgetChoice;
+
+namespace Poppler {
+
+    class DocumentData;
+    class Link;
+
+    class FormFieldData;
+    /**
+      The base class representing a form field.
+
+      \since 0.6
+     */
+    class POPPLER_QT5_EXPORT FormField {
+    public:
+
+	/**
+	   The different types of form field.
+	*/
+	enum FormType {
+	    FormButton,    ///< A button field. See \ref Poppler::FormFieldButton::ButtonType "ButtonType"
+	    FormText,      ///< A text field. See \ref Poppler::FormFieldText::TextType "TextType"
+	    FormChoice,    ///< A single choice field. See \ref Poppler::FormFieldChoice::ChoiceType "ChoiceType"
+	    FormSignature  ///< A signature field.
+	};
+
+	virtual ~FormField();
+
+	/**
+	  The type of the field.
+	 */
+	virtual FormType type() const = 0;
+
+	/**
+	   \return The size of the field, in normalized coordinates, i.e.
+	   [0..1] with regard to the dimensions (cropbox) of the page
+	*/
+	QRectF rect() const;
+
+	/**
+	  The ID of the field.
+	 */
+	int id() const;
+
+	/**
+	  The internal name of the field.
+	 */
+	QString name() const;
+	
+	/**
+	  The internal fully qualified name of the field.
+	  \since 0.18
+	 */
+	QString fullyQualifiedName() const;
+
+	/**
+	  The name of the field to be used in user interface (eg messages to
+	  the user).
+	 */
+	QString uiName() const;
+
+	/**
+	  Whether this form field is read-only.
+	 */
+	bool isReadOnly() const;
+
+	/**
+	  Whether this form field is visible.
+	 */
+	bool isVisible() const;
+
+	/**
+	  The activation action of this form field.
+
+	  \note It may be null.
+	 */
+	Link* activationAction() const;
+
+    protected:
+	/// \cond PRIVATE
+	FormField(FormFieldData &dd);
+
+	FormFieldData *m_formData;
+	/// \endcond
+
+    private:
+	Q_DISABLE_COPY(FormField)
+    };
+
+    /**
+      A form field that represents a "button".
+
+      \since 0.8
+     */
+    class POPPLER_QT5_EXPORT FormFieldButton : public FormField {
+    public:
+
+	/**
+	 * The types of button field.
+	 */
+	enum ButtonType
+	{
+	    Push,          ///< A simple push button.
+	    CheckBox,      ///< A check box.
+	    Radio          ///< A radio button.
+	};
+
+	/// \cond PRIVATE
+	FormFieldButton(DocumentData *doc, ::Page *p, ::FormWidgetButton *w);
+	/// \endcond
+	virtual ~FormFieldButton();
+
+	virtual FormType type() const;
+
+	/**
+	  The particular type of the button field.
+	 */
+	ButtonType buttonType() const;
+
+	/**
+	 * The caption to be used for the button.
+	 */
+	QString caption() const;
+
+	/**
+	  The state of the button.
+	 */
+	bool state() const;
+
+	/**
+	  Sets the state of the button to the new \p state .
+	 */
+	void setState( bool state );
+
+	/**
+	  The list with the IDs of siblings (ie, buttons belonging to the same
+	  group as the current one.
+
+	  Valid only for \ref Radio buttons, an empty list otherwise.
+	 */
+	QList<int> siblings() const;
+
+    private:
+	Q_DISABLE_COPY(FormFieldButton)
+    };
+
+    /**
+      A form field that represents a text input.
+
+      \since 0.6
+     */
+    class POPPLER_QT5_EXPORT FormFieldText : public FormField {
+    public:
+
+	/**
+	   The particular type of this text field.
+	*/
+	enum TextType {
+	    Normal,        ///< A simple singleline text field.
+	    Multiline,     ///< A multiline text field.
+	    FileSelect     ///< An input field to select the path of a file on disk.
+	};
+
+	/// \cond PRIVATE
+	FormFieldText(DocumentData *doc, ::Page *p, ::FormWidgetText *w);
+	/// \endcond
+	virtual ~FormFieldText();
+
+	virtual FormType type() const;
+
+	/**
+	  The text type of the text field.
+	 */
+	TextType textType() const;
+
+	/**
+	  The text associated with the text field.
+	 */
+	QString text() const;
+
+	/**
+	  Sets the text associated with the text field to the specified
+	  \p text.
+	 */
+	void setText( const QString& text );
+
+	/**
+	  Whether this text field is a password input, eg its text \b must be
+	  replaced with asterisks.
+
+	  Always false for \ref FileSelect text fields.
+	 */
+	bool isPassword() const;
+
+	/**
+	  Whether this text field should allow rich text.
+	 */
+	bool isRichText() const;
+
+	/**
+	  The maximum length for the text of this field, or -1 if not set.
+	 */
+	int maximumLength() const;
+
+	/**
+	  The horizontal alignment for the text of this text field.
+	 */
+	Qt::Alignment textAlignment() const;
+
+	/**
+	  Whether the text inserted manually in the field (where possible)
+	  can be spell-checked.
+	 */
+	bool canBeSpellChecked() const;
+
+    private:
+	Q_DISABLE_COPY(FormFieldText)
+    };
+
+    /**
+      A form field that represents a choice field.
+
+      \since 0.6
+     */
+    class POPPLER_QT5_EXPORT FormFieldChoice : public FormField {
+    public:
+
+	/**
+	   The particular type of this choice field.
+	*/
+	enum ChoiceType {
+	    ComboBox,     ///< A simple singleline text field.
+	    ListBox       ///< A multiline text field.
+	};
+
+	/// \cond PRIVATE
+	FormFieldChoice(DocumentData *doc, ::Page *p, ::FormWidgetChoice *w);
+	/// \endcond
+	virtual ~FormFieldChoice();
+
+	virtual FormType type() const;
+
+	/**
+	  The choice type of the choice field.
+	 */
+	ChoiceType choiceType() const;
+
+	/**
+	  The possible choices of the choice field.
+	 */
+	QStringList choices() const;
+
+	/**
+	  Whether this FormFieldChoice::ComboBox is editable, i.e. the user
+	  can type in a custom value.
+
+	  Always false for the other types of choices.
+	 */
+	bool isEditable() const;
+
+	/**
+	  Whether more than one choice of this FormFieldChoice::ListBox
+	  can be selected at the same time.
+
+	  Always false for the other types of choices.
+	 */
+	bool multiSelect() const;
+
+	/**
+	  The currently selected choices.
+	 */
+	QList<int> currentChoices() const;
+
+	/**
+	  Sets the selected choices to \p choice.
+	 */
+	void setCurrentChoices( const QList<int> &choice );
+	
+	/**
+	  The text entered into an editable combo box choice field. Otherwise a null string.
+	  
+	  \since 0.22
+	*/
+	QString editChoice() const;
+	
+	/**
+	  Sets the text entered into an editable combo box choice field. Otherwise does nothing.
+	  
+	  \since 0.22
+	*/
+	void setEditChoice(const QString& text);
+
+	/**
+	  The horizontal alignment for the text of this text field.
+	 */
+	Qt::Alignment textAlignment() const;
+
+	/**
+	  Whether the text inserted manually in the field (where possible)
+	  can be spell-checked.
+
+          Returns false if the field is not an editable text field.
+	 */
+	bool canBeSpellChecked() const;
+
+    private:
+	Q_DISABLE_COPY(FormFieldChoice)
+    };
+
+}
+
+#endif
diff --git a/qt5/src/poppler-link-extractor-private.h b/qt5/src/poppler-link-extractor-private.h
new file mode 100644
index 00000000..32ddd038
--- /dev/null
+++ b/qt5/src/poppler-link-extractor-private.h
@@ -0,0 +1,57 @@
+/* poppler-link-extractor_p.h: qt interface to poppler
+ * Copyright (C) 2007, 2008, 2011, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _POPPLER_LINK_EXTRACTOR_H_
+#define _POPPLER_LINK_EXTRACTOR_H_
+
+#include <Object.h>
+#include <OutputDev.h>
+
+#include <QtCore/QList>
+
+namespace Poppler
+{
+
+class Link;
+class PageData;
+
+class LinkExtractorOutputDev : public OutputDev
+{
+  public:
+    LinkExtractorOutputDev(PageData *data);
+    virtual ~LinkExtractorOutputDev();
+
+    // inherited from OutputDev
+    virtual GBool upsideDown() { return gFalse; }
+    virtual GBool useDrawChar() { return gFalse; }
+    virtual GBool interpretType3Chars() { return gFalse; }
+    virtual void processLink(::AnnotLink *link);
+
+    // our stuff
+    QList< Link* > links();
+
+  private:
+    PageData *m_data;
+    double m_pageCropWidth;
+    double m_pageCropHeight;
+    QList< Link* > m_links;
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-link-extractor.cc b/qt5/src/poppler-link-extractor.cc
new file mode 100644
index 00000000..3781dcec
--- /dev/null
+++ b/qt5/src/poppler-link-extractor.cc
@@ -0,0 +1,84 @@
+/* poppler-link-extractor_p.h: qt interface to poppler
+ * Copyright (C) 2007, 2008, 2011, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, Albert Astals Cid <aacid@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-link-extractor-private.h"
+
+#include <GfxState.h>
+#include <Link.h>
+#include <Object.h>
+#include <Page.h>
+#include <Annot.h>
+
+#include "poppler-qt5.h"
+#include "poppler-page-private.h"
+
+namespace Poppler
+{
+
+LinkExtractorOutputDev::LinkExtractorOutputDev(PageData *data)
+  : m_data(data)
+{
+  Q_ASSERT(m_data);
+  ::Page *popplerPage = m_data->page;
+  m_pageCropWidth = popplerPage->getCropWidth();
+  m_pageCropHeight = popplerPage->getCropHeight();
+  if (popplerPage->getRotate() == 90 || popplerPage->getRotate() == 270)
+    qSwap(m_pageCropWidth, m_pageCropHeight);
+  GfxState gfxState(72.0, 72.0, popplerPage->getCropBox(), popplerPage->getRotate(), gTrue);
+  setDefaultCTM(gfxState.getCTM());
+}
+
+LinkExtractorOutputDev::~LinkExtractorOutputDev()
+{
+  qDeleteAll(m_links);
+}
+
+void LinkExtractorOutputDev::processLink(::AnnotLink *link)
+{
+  if (!link->isOk())
+    return;
+
+  double left, top, right, bottom;
+  int leftAux, topAux, rightAux, bottomAux;
+  link->getRect(&left, &top, &right, &bottom);
+  QRectF linkArea;
+
+  cvtUserToDev(left, top, &leftAux, &topAux);
+  cvtUserToDev(right, bottom, &rightAux, &bottomAux);
+  linkArea.setLeft((double)leftAux / m_pageCropWidth);
+  linkArea.setTop((double)topAux / m_pageCropHeight);
+  linkArea.setRight((double)rightAux / m_pageCropWidth);
+  linkArea.setBottom((double)bottomAux / m_pageCropHeight);
+
+  Link *popplerLink = m_data->convertLinkActionToLink(link->getAction(), linkArea);
+  if (popplerLink)
+  {
+    m_links.append(popplerLink);
+  }
+  OutputDev::processLink(link);
+}
+
+QList< Link* > LinkExtractorOutputDev::links()
+{
+  QList< Link* > ret = m_links;
+  m_links.clear();
+  return ret;
+}
+
+}
diff --git a/qt5/src/poppler-link.cc b/qt5/src/poppler-link.cc
new file mode 100644
index 00000000..ca6e6eb5
--- /dev/null
+++ b/qt5/src/poppler-link.cc
@@ -0,0 +1,706 @@
+/* poppler-link.cc: qt interface to poppler
+ * Copyright (C) 2006-2007, 2013, Albert Astals Cid
+ * Copyright (C) 2007-2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+ * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
+ * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
+ * Adapting code from
+ *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <poppler-qt5.h>
+#include <poppler-private.h>
+#include <poppler-media.h>
+
+#include <QtCore/QStringList>
+
+#include "poppler-annotation-private.h"
+
+#include "Link.h"
+#include "Rendition.h"
+
+bool operator==( const Ref &r1, const Ref &r2 )
+{
+	return r1.num == r2.num && r1.gen == r2.gen;
+}
+
+namespace Poppler {
+
+class LinkDestinationPrivate : public QSharedData
+{
+	public:
+		LinkDestinationPrivate();
+
+		LinkDestination::Kind kind; // destination type
+		QString name;
+		int pageNum; // page number
+		double left, bottom; // position
+		double right, top;
+		double zoom; // zoom factor
+		bool changeLeft : 1, changeTop : 1; // for destXYZ links, which position
+		bool changeZoom : 1; //   components to change
+};
+
+	LinkDestinationPrivate::LinkDestinationPrivate()
+	{
+		// sane defaults
+		kind = LinkDestination::destXYZ;
+		pageNum = 0;
+		left = 0;
+		bottom = 0;
+		right = 0;
+		top = 0;
+		zoom = 1;
+		changeLeft = true;
+		changeTop = true;
+		changeZoom = false;
+	}
+
+class LinkPrivate
+{
+	public:
+		LinkPrivate( const QRectF &area );
+		virtual ~LinkPrivate();
+
+		QRectF linkArea;
+};
+
+	LinkPrivate::LinkPrivate( const QRectF &area )
+		: linkArea( area )
+	{
+	}
+
+	LinkPrivate::~LinkPrivate()
+	{
+	}
+
+class LinkGotoPrivate : public LinkPrivate
+{
+	public:
+		LinkGotoPrivate( const QRectF &area, const LinkDestination &dest );
+
+		QString extFileName;
+		LinkDestination destination;
+};
+
+	LinkGotoPrivate::LinkGotoPrivate( const QRectF &area, const LinkDestination &dest )
+		: LinkPrivate( area ), destination( dest )
+	{
+	}
+
+class LinkExecutePrivate : public LinkPrivate
+{
+	public:
+		LinkExecutePrivate( const QRectF &area );
+
+		QString fileName;
+		QString parameters;
+};
+
+	LinkExecutePrivate::LinkExecutePrivate( const QRectF &area )
+		: LinkPrivate( area )
+	{
+	}
+
+class LinkBrowsePrivate : public LinkPrivate
+{
+	public:
+		LinkBrowsePrivate( const QRectF &area );
+
+		QString url;
+};
+
+	LinkBrowsePrivate::LinkBrowsePrivate( const QRectF &area )
+		: LinkPrivate( area )
+	{
+	}
+
+class LinkActionPrivate : public LinkPrivate
+{
+	public:
+		LinkActionPrivate( const QRectF &area );
+
+		LinkAction::ActionType type;
+};
+
+	LinkActionPrivate::LinkActionPrivate( const QRectF &area )
+		: LinkPrivate( area )
+	{
+	}
+
+class LinkSoundPrivate : public LinkPrivate
+{
+	public:
+		LinkSoundPrivate( const QRectF &area );
+		~LinkSoundPrivate();
+
+		double volume;
+		bool sync : 1;
+		bool repeat : 1;
+		bool mix : 1;
+		SoundObject *sound;
+};
+
+	LinkSoundPrivate::LinkSoundPrivate( const QRectF &area )
+		: LinkPrivate( area ), sound( 0 )
+	{
+	}
+
+	LinkSoundPrivate::~LinkSoundPrivate()
+	{
+		delete sound;
+	}
+
+class LinkRenditionPrivate : public LinkPrivate
+{
+	public:
+		LinkRenditionPrivate( const QRectF &area, ::MediaRendition *rendition, ::LinkRendition::RenditionOperation operation, const QString &script, const Ref &annotationReference );
+		~LinkRenditionPrivate();
+
+		MediaRendition *rendition;
+		LinkRendition::RenditionAction action;
+		QString script;
+		Ref annotationReference;
+};
+
+	LinkRenditionPrivate::LinkRenditionPrivate( const QRectF &area, ::MediaRendition *r, ::LinkRendition::RenditionOperation operation, const QString &javaScript, const Ref &ref )
+		: LinkPrivate( area )
+		, rendition( r ? new MediaRendition( r ) : 0 )
+		, action( LinkRendition::PlayRendition )
+		, script( javaScript )
+		, annotationReference( ref )
+	{
+		switch ( operation )
+		{
+			case ::LinkRendition::NoRendition:
+				action = LinkRendition::NoRendition;
+				break;
+			case ::LinkRendition::PlayRendition:
+				action = LinkRendition::PlayRendition;
+				break;
+			case ::LinkRendition::StopRendition:
+				action = LinkRendition::StopRendition;
+				break;
+			case ::LinkRendition::PauseRendition:
+				action = LinkRendition::PauseRendition;
+				break;
+			case ::LinkRendition::ResumeRendition:
+				action = LinkRendition::ResumeRendition;
+				break;
+		}
+	}
+
+	LinkRenditionPrivate::~LinkRenditionPrivate()
+	{
+		delete rendition;
+	}
+
+class LinkJavaScriptPrivate : public LinkPrivate
+{
+	public:
+		LinkJavaScriptPrivate( const QRectF &area );
+
+		QString js;
+};
+
+	LinkJavaScriptPrivate::LinkJavaScriptPrivate( const QRectF &area )
+		: LinkPrivate( area )
+	{
+	}
+
+class LinkMoviePrivate : public LinkPrivate
+{
+	public:
+		LinkMoviePrivate( const QRectF &area, LinkMovie::Operation operation, const QString &title, const Ref &reference );
+
+		LinkMovie::Operation operation;
+		QString annotationTitle;
+		Ref annotationReference;
+};
+
+	LinkMoviePrivate::LinkMoviePrivate( const QRectF &area, LinkMovie::Operation _operation, const QString &title, const Ref &reference  )
+		: LinkPrivate( area ), operation( _operation ), annotationTitle( title ), annotationReference( reference )
+	{
+	}
+
+	static void cvtUserToDev(::Page *page, double xu, double yu, int *xd, int *yd) {
+		double ctm[6];
+		
+		page->getDefaultCTM(ctm, 72.0, 72.0, 0, false, true);
+		*xd = (int)(ctm[0] * xu + ctm[2] * yu + ctm[4] + 0.5);
+		*yd = (int)(ctm[1] * xu + ctm[3] * yu + ctm[5] + 0.5);
+	}
+
+	LinkDestination::LinkDestination(const LinkDestinationData &data)
+		: d( new LinkDestinationPrivate )
+	{
+		bool deleteDest = false;
+		LinkDest *ld = data.ld;
+		
+		if ( data.namedDest && !ld && !data.externalDest )
+		{
+			deleteDest = true;
+			ld = data.doc->doc->findDest( data.namedDest );
+		}
+		// in case this destination was named one, and it was not resolved
+		if ( data.namedDest && !ld )
+		{
+			d->name = QString::fromLatin1( data.namedDest->getCString() );
+		}
+		
+		if (!ld) return;
+		
+		if (ld->getKind() == ::destXYZ) d->kind = destXYZ;
+		else if (ld->getKind() == ::destFit) d->kind = destFit;
+		else if (ld->getKind() == ::destFitH) d->kind = destFitH;
+		else if (ld->getKind() == ::destFitV) d->kind = destFitV;
+		else if (ld->getKind() == ::destFitR) d->kind = destFitR;
+		else if (ld->getKind() == ::destFitB) d->kind = destFitB;
+		else if (ld->getKind() == ::destFitBH) d->kind = destFitBH;
+		else if (ld->getKind() == ::destFitBV) d->kind = destFitBV;
+
+		if ( !ld->isPageRef() ) d->pageNum = ld->getPageNum();
+		else
+		{
+			Ref ref = ld->getPageRef();
+			d->pageNum = data.doc->doc->findPage( ref.num, ref.gen );
+		}
+		double left = ld->getLeft();
+		double bottom = ld->getBottom();
+		double right = ld->getRight();
+		double top = ld->getTop();
+		d->zoom = ld->getZoom();
+		d->changeLeft = ld->getChangeLeft();
+		d->changeTop = ld->getChangeTop();
+		d->changeZoom = ld->getChangeZoom();
+		
+		int leftAux = 0, topAux = 0, rightAux = 0, bottomAux = 0;
+		
+		::Page *page;
+		if (d->pageNum > 0 &&
+		    d->pageNum <= data.doc->doc->getNumPages() &&
+		    (page = data.doc->doc->getPage( d->pageNum )))
+		{
+			cvtUserToDev( page, left, top, &leftAux, &topAux );
+			cvtUserToDev( page, right, bottom, &rightAux, &bottomAux );
+			
+			d->left = leftAux / (double)page->getCropWidth();
+			d->top = topAux / (double)page->getCropHeight();
+			d->right = rightAux/ (double)page->getCropWidth();
+			d->bottom = bottomAux / (double)page->getCropHeight();
+		}
+		else d->pageNum = 0;
+		
+		if (deleteDest) delete ld;
+	}
+	
+	LinkDestination::LinkDestination(const QString &description)
+		: d( new LinkDestinationPrivate )
+	{
+		QStringList tokens = description.split( ';' );
+		d->kind = static_cast<Kind>(tokens.at(0).toInt());
+		d->pageNum = tokens.at(1).toInt();
+		d->left = tokens.at(2).toDouble();
+		d->bottom = tokens.at(3).toDouble();
+		d->right = tokens.at(4).toDouble();
+		d->top = tokens.at(5).toDouble();
+		d->zoom = tokens.at(6).toDouble();
+		d->changeLeft = static_cast<bool>(tokens.at(7).toInt());
+		d->changeTop = static_cast<bool>(tokens.at(8).toInt());
+		d->changeZoom = static_cast<bool>(tokens.at(9).toInt());
+	}
+	
+	LinkDestination::LinkDestination(const LinkDestination &other)
+		: d( other.d )
+	{
+	}
+	
+	LinkDestination::~LinkDestination()
+	{
+	}
+	
+	LinkDestination::Kind LinkDestination::kind() const
+	{
+		return d->kind;
+	}
+	
+	int LinkDestination::pageNumber() const
+	{
+		return d->pageNum;
+	}
+	
+	double LinkDestination::left() const
+	{
+		return d->left;
+	}
+	
+	double LinkDestination::bottom() const
+	{
+		return d->bottom;
+	}
+	
+	double LinkDestination::right() const
+	{
+		return d->right;
+	}
+	
+	double LinkDestination::top() const
+	{
+		return d->top;
+	}
+	
+	double LinkDestination::zoom() const
+	{
+		return d->zoom;
+	}
+	
+	bool LinkDestination::isChangeLeft() const
+	{
+		return d->changeLeft;
+	}
+	
+	bool LinkDestination::isChangeTop() const
+	{
+		return d->changeTop;
+	}
+	
+	bool LinkDestination::isChangeZoom() const
+	{
+		return d->changeZoom;
+	}
+	
+	QString LinkDestination::toString() const
+	{
+		QString s = QString::number( (qint8)d->kind );
+		s += ";" + QString::number( d->pageNum );
+		s += ";" + QString::number( d->left );
+		s += ";" + QString::number( d->bottom );
+		s += ";" + QString::number( d->right );
+		s += ";" + QString::number( d->top );
+		s += ";" + QString::number( d->zoom );
+		s += ";" + QString::number( (qint8)d->changeLeft );
+		s += ";" + QString::number( (qint8)d->changeTop );
+		s += ";" + QString::number( (qint8)d->changeZoom );
+		return s;
+	}
+	
+	QString LinkDestination::destinationName() const
+	{
+		return d->name;
+	}
+	
+	LinkDestination& LinkDestination::operator=(const LinkDestination &other)
+	{
+		if ( this == &other )
+			return *this;
+		
+		d = other.d;
+		return *this;
+	}
+	
+	
+	// Link
+	Link::~Link()
+	{
+		delete d_ptr;
+	}
+	
+	Link::Link(const QRectF &linkArea)
+		: d_ptr( new LinkPrivate( linkArea ) )
+	{
+	}
+	
+	Link::Link( LinkPrivate &dd )
+		: d_ptr( &dd )
+	{
+	}
+
+	Link::LinkType Link::linkType() const
+	{
+		return None;
+	}
+	
+	QRectF Link::linkArea() const
+	{
+		Q_D( const Link );
+		return d->linkArea;
+	}
+	
+	// LinkGoto
+	LinkGoto::LinkGoto( const QRectF &linkArea, QString extFileName, const LinkDestination & destination )
+		: Link( *new LinkGotoPrivate( linkArea, destination ) )
+	{
+		Q_D( LinkGoto );
+		d->extFileName = extFileName;
+	}
+	
+	LinkGoto::~LinkGoto()
+	{
+	}
+	
+	bool LinkGoto::isExternal() const
+	{
+		Q_D( const LinkGoto );
+		return !d->extFileName.isEmpty();
+	}
+	
+	QString LinkGoto::fileName() const
+	{
+		Q_D( const LinkGoto );
+		return d->extFileName;
+	}
+	
+	LinkDestination LinkGoto::destination() const
+	{
+		Q_D( const LinkGoto );
+		return d->destination;
+	}
+	
+	Link::LinkType LinkGoto::linkType() const
+	{
+		return Goto;
+	}
+	
+	// LinkExecute
+	LinkExecute::LinkExecute( const QRectF &linkArea, const QString & file, const QString & params )
+		: Link( *new LinkExecutePrivate( linkArea ) )
+	{
+		Q_D( LinkExecute );
+		d->fileName = file;
+		d->parameters = params;
+	}
+	
+	LinkExecute::~LinkExecute()
+	{
+	}
+	
+	QString LinkExecute::fileName() const
+	{
+		Q_D( const LinkExecute );
+		return d->fileName;
+	}
+	QString LinkExecute::parameters() const
+	{
+		Q_D( const LinkExecute );
+		return d->parameters;
+	}
+
+	Link::LinkType LinkExecute::linkType() const
+	{
+		return Execute;
+	}
+
+	// LinkBrowse
+	LinkBrowse::LinkBrowse( const QRectF &linkArea, const QString &url )
+		: Link( *new LinkBrowsePrivate( linkArea ) )
+	{
+		Q_D( LinkBrowse );
+		d->url = url;
+	}
+	
+	LinkBrowse::~LinkBrowse()
+	{
+	}
+	
+	QString LinkBrowse::url() const
+	{
+		Q_D( const LinkBrowse );
+		return d->url;
+	}
+	
+	Link::LinkType LinkBrowse::linkType() const
+	{
+		return Browse;
+	}
+
+	// LinkAction
+	LinkAction::LinkAction( const QRectF &linkArea, ActionType actionType )
+		: Link( *new LinkActionPrivate( linkArea ) )
+	{
+		Q_D( LinkAction );
+		d->type = actionType;
+	}
+		
+	LinkAction::~LinkAction()
+	{
+	}
+	
+	LinkAction::ActionType LinkAction::actionType() const
+	{
+		Q_D( const LinkAction );
+		return d->type;
+	}
+
+	Link::LinkType LinkAction::linkType() const
+	{
+		return Action;
+	}
+
+	// LinkSound
+	LinkSound::LinkSound( const QRectF &linkArea, double volume, bool sync, bool repeat, bool mix, SoundObject *sound )
+		: Link( *new LinkSoundPrivate( linkArea ) )
+	{
+		Q_D( LinkSound );
+		d->volume = volume;
+		d->sync = sync;
+		d->repeat = repeat;
+		d->mix = mix;
+		d->sound = sound;
+	}
+	
+	LinkSound::~LinkSound()
+	{
+	}
+	
+	Link::LinkType LinkSound::linkType() const
+	{
+		return Sound;
+	}
+
+	double LinkSound::volume() const
+	{
+		Q_D( const LinkSound );
+		return d->volume;
+	}
+
+	bool LinkSound::synchronous() const
+	{
+		Q_D( const LinkSound );
+		return d->sync;
+	}
+
+	bool LinkSound::repeat() const
+	{
+		Q_D( const LinkSound );
+		return d->repeat;
+	}
+
+	bool LinkSound::mix() const
+	{
+		Q_D( const LinkSound );
+		return d->mix;
+	}
+
+	SoundObject *LinkSound::sound() const
+	{
+		Q_D( const LinkSound );
+		return d->sound;
+	}
+
+	// LinkRendition
+	LinkRendition::LinkRendition( const QRectF &linkArea, ::MediaRendition *rendition, int operation, const QString &script, const Ref &annotationReference )
+		: Link( *new LinkRenditionPrivate( linkArea, rendition, static_cast<enum ::LinkRendition::RenditionOperation>(operation), script, annotationReference ) )
+	{
+	}
+
+	LinkRendition::~LinkRendition()
+	{
+	}
+	
+	Link::LinkType LinkRendition::linkType() const
+	{
+		return Rendition;
+	}
+	
+	MediaRendition * LinkRendition::rendition() const
+	{
+		Q_D( const LinkRendition );
+		return d->rendition;
+	}
+
+	LinkRendition::RenditionAction LinkRendition::action() const
+	{
+		Q_D( const LinkRendition );
+		return d->action;
+	}
+
+	QString LinkRendition::script() const
+	{
+		Q_D( const LinkRendition );
+		return d->script;
+	}
+
+	bool LinkRendition::isReferencedAnnotation( const ScreenAnnotation *annotation ) const
+	{
+		Q_D( const LinkRendition );
+		if ( d->annotationReference.num != -1 && d->annotationReference == annotation->d_ptr->pdfObjectReference() )
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	// LinkJavaScript
+	LinkJavaScript::LinkJavaScript( const QRectF &linkArea, const QString &js )
+		: Link( *new LinkJavaScriptPrivate( linkArea ) )
+	{
+		Q_D( LinkJavaScript );
+		d->js = js;
+	}
+	
+	LinkJavaScript::~LinkJavaScript()
+	{
+	}
+	
+	Link::LinkType LinkJavaScript::linkType() const
+	{
+		return JavaScript;
+	}
+	
+	QString LinkJavaScript::script() const
+	{
+		Q_D( const LinkJavaScript );
+		return d->js;
+	}
+
+	// LinkMovie
+	LinkMovie::LinkMovie( const QRectF &linkArea, Operation operation, const QString &annotationTitle, const Ref &annotationReference )
+		: Link( *new LinkMoviePrivate( linkArea, operation, annotationTitle, annotationReference ) )
+	{
+	}
+	
+	LinkMovie::~LinkMovie()
+	{
+	}
+	
+	Link::LinkType LinkMovie::linkType() const
+	{
+		return Movie;
+	}
+	
+	LinkMovie::Operation LinkMovie::operation() const
+	{
+		Q_D( const LinkMovie );
+		return d->operation;
+	}
+
+	bool LinkMovie::isReferencedAnnotation( const MovieAnnotation *annotation ) const
+	{
+		Q_D( const LinkMovie );
+		if ( d->annotationReference.num != -1 && d->annotationReference == annotation->d_ptr->pdfObjectReference() )
+		{
+			return true;
+		}
+		else if ( !d->annotationTitle.isNull() )
+		{
+			return ( annotation->movieTitle() == d->annotationTitle );
+		}
+
+		return false;
+	}
+}
diff --git a/qt5/src/poppler-link.h b/qt5/src/poppler-link.h
new file mode 100644
index 00000000..172effa2
--- /dev/null
+++ b/qt5/src/poppler-link.h
@@ -0,0 +1,602 @@
+/* poppler-link.h: qt interface to poppler
+ * Copyright (C) 2006, 2013, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2007-2008, 2010, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2010, 2012, Guillermo Amaral <gamaral@kdab.com>
+ * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
+ * Copyright (C) 2013, Anthony Granger <grangeranthony@gmail.com>
+ * Adapting code from
+ *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _POPPLER_LINK_H_
+#define _POPPLER_LINK_H_
+
+#include <QtCore/QString>
+#include <QtCore/QRectF>
+#include <QtCore/QSharedDataPointer>
+#include "poppler-export.h"
+
+struct Ref;
+class MediaRendition;
+
+namespace Poppler {
+
+class LinkPrivate;
+class LinkGotoPrivate;
+class LinkExecutePrivate;
+class LinkBrowsePrivate;
+class LinkActionPrivate;
+class LinkSoundPrivate;
+class LinkJavaScriptPrivate;
+class LinkMoviePrivate;
+class LinkDestinationData;
+class LinkDestinationPrivate;
+class LinkRenditionPrivate;
+class MediaRendition;
+class SoundObject;
+
+/**
+ * \short A destination.
+ *
+ * The LinkDestination class represent a "destination" (in terms of visual
+ * viewport to be displayed) for \link Poppler::LinkGoto GoTo\endlink links,
+ * and items in the table of contents (TOC) of a document.
+ *
+ * Coordinates are in 0..1 range
+ */
+class POPPLER_QT5_EXPORT LinkDestination
+{
+	public:
+		/**
+		 * The possible kind of "viewport destination".
+		 */
+		enum Kind
+		{
+			/**
+			 * The new viewport is specified in terms of:
+			 * - possibile new left coordinate (see isChangeLeft() )
+			 * - possibile new top coordinate (see isChangeTop() )
+			 * - possibile new zoom level (see isChangeZoom() )
+			 */
+			destXYZ = 1,
+			destFit = 2,
+			destFitH = 3,
+			destFitV = 4,
+			destFitR = 5,
+			destFitB = 6,
+			destFitBH = 7,
+			destFitBV = 8
+		};
+
+		/// \cond PRIVATE
+		LinkDestination(const LinkDestinationData &data);
+		LinkDestination(const QString &description);
+		/// \endcond
+		/**
+		 * Copy constructor.
+		 */
+		LinkDestination(const LinkDestination &other);
+		/**
+		 * Destructor.
+		 */
+		~LinkDestination();
+
+		// Accessors.
+		/**
+		 * The kind of destination.
+		 */
+		Kind kind() const;
+		/**
+		 * Which page is the target of this destination.
+		 *
+		 * \note this number is 1-based, so for a 5 pages document the
+		 *       valid page numbers go from 1 to 5 (both included).
+		 */
+		int pageNumber() const;
+		/**
+		 * The new left for the viewport of the target page, in case
+		 * it is specified to be changed (see isChangeLeft() )
+		 */
+		double left() const;
+		double bottom() const;
+		double right() const;
+		/**
+		 * The new top for the viewport of the target page, in case
+		 * it is specified to be changed (see isChangeTop() )
+		 */
+		double top() const;
+		double zoom() const;
+		/**
+		 * Whether the left of the viewport on the target page should
+		 * be changed.
+		 *
+		 * \see left()
+		 */
+		bool isChangeLeft() const;
+		/**
+		 * Whether the top of the viewport on the target page should
+		 * be changed.
+		 *
+		 * \see top()
+		 */
+		bool isChangeTop() const;
+		/**
+		 * Whether the zoom level should be changed.
+		 *
+		 * \see zoom()
+		 */
+		bool isChangeZoom() const;
+
+		/**
+		 * Return a string repesentation of this destination.
+		 */
+		QString toString() const;
+
+		/**
+		 * Return the name of this destination.
+		 *
+		 * \since 0.12
+		 */
+		QString destinationName() const;
+
+		/**
+		 * Assignment operator.
+		 */
+		LinkDestination& operator=(const LinkDestination &other);
+
+	private:
+		QSharedDataPointer< LinkDestinationPrivate > d;
+};
+
+/**
+ * \short Encapsulates data that describes a link.
+ *
+ * This is the base class for links. It makes mandatory for inherited
+ * kind of links to reimplement the linkType() method and return the type of
+ * the link described by the reimplemented class.
+ */
+class POPPLER_QT5_EXPORT Link
+{
+	public:
+		/// \cond PRIVATE
+		Link( const QRectF &linkArea );
+		/// \endcond
+		
+		/**
+		 * The possible kinds of link.
+		 *
+		 * Inherited classes must return an unique identifier
+		 */
+		enum LinkType
+		{
+		    None,     ///< Unknown link
+		    Goto,     ///< A "Go To" link
+		    Execute,  ///< A command to be executed
+		    Browse,   ///< An URL to be browsed (eg "http://poppler.freedesktop.org")
+		    Action,   ///< A "standard" action to be executed in the viewer
+		    Sound,    ///< A link representing a sound to be played
+		    Movie,    ///< An action to be executed on a movie
+		    Rendition,    ///< A rendition link \since 0.20
+		    JavaScript    ///< A JavaScript code to be interpreted \since 0.10
+		};
+
+		/**
+		 * The type of this link.
+		 */
+		virtual LinkType linkType() const;
+
+		/**
+		 * Destructor.
+		 */
+		virtual ~Link();
+		
+		/**
+		 * The area of a Page where the link should be active.
+		 *
+		 * \note this can be a null rect, in this case the link represents
+		 * a general action. The area is given in 0..1 range
+		 */
+		QRectF linkArea() const;
+		
+	protected:
+		/// \cond PRIVATE
+		Link( LinkPrivate &dd );
+		Q_DECLARE_PRIVATE( Link )
+		LinkPrivate *d_ptr;
+		/// \endcond
+		
+	private:
+		Q_DISABLE_COPY( Link )
+};
+
+
+/**
+ * \brief Viewport reaching request.
+ *
+ * With a LinkGoto link, the document requests the specified viewport to be
+ * reached (aka, displayed in a viewer). Furthermore, if a file name is specified,
+ * then the destination refers to that document (and not to the document the
+ * current LinkGoto belongs to).
+ */
+class POPPLER_QT5_EXPORT LinkGoto : public Link
+{
+	public:
+		/**
+		 * Create a new Goto link.
+		 *
+		 * \param linkArea the active area of the link
+		 * \param extFileName if not empty, the file name to be open
+		 * \param destination the destination to be reached
+		 */
+		LinkGoto( const QRectF &linkArea, QString extFileName, const LinkDestination & destination );
+		/**
+		 * Destructor.
+		 */
+		~LinkGoto();
+
+		/**
+		 * Whether the destination is in an external document
+		 * (i.e. not the current document)
+		 */
+		bool isExternal() const;
+		// query for goto parameters
+		/**
+		 * The file name of the document the destination() refers to,
+		 * or an empty string in case it refers to the current document.
+		 */
+		QString fileName() const;
+		/**
+		 * The destination to reach.
+		 */
+		LinkDestination destination() const;
+		LinkType linkType() const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkGoto )
+		Q_DISABLE_COPY( LinkGoto )
+};
+
+/**
+ * \brief Generic execution request.
+ *
+ * The LinkExecute link represent a "file name" execution request. The result
+ * depends on the \link fileName() file name\endlink:
+ * - if it is a document, then it is requested to be open
+ * - otherwise, it represents an executable to be run with the specified parameters
+ */
+class POPPLER_QT5_EXPORT LinkExecute : public Link
+{
+	public:
+		/**
+		 * The file name to be executed
+		 */
+		QString fileName() const;
+		/**
+		 * The parameters for the command.
+		 */
+		QString parameters() const;
+
+		/**
+		 * Create a new Execute link.
+		 *
+		 * \param linkArea the active area of the link
+		 * \param file the file name to be open, or the program to be execute
+		 * \param params the parameters for the program to execute
+		 */
+		LinkExecute( const QRectF &linkArea, const QString & file, const QString & params );
+		/**
+		 * Destructor.
+		 */
+		~LinkExecute();
+		LinkType linkType() const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkExecute )
+		Q_DISABLE_COPY( LinkExecute )
+};
+
+/**
+ * \brief An URL to browse.
+ *
+ * The LinkBrowse link holds a URL (eg 'http://poppler.freedesktop.org',
+ * 'mailto:john@some.org', etc) to be open.
+ *
+ * The format of the URL is specified by RFC 2396 (http://www.ietf.org/rfc/rfc2396.txt)
+ */
+class POPPLER_QT5_EXPORT LinkBrowse : public Link
+{
+	public:
+		/**
+		 * The URL to open
+		 */
+		QString url() const;
+
+		/**
+		 * Create a new browse link.
+		 *
+		 * \param linkArea the active area of the link
+		 * \param url the URL to be open
+		 */
+		LinkBrowse( const QRectF &linkArea, const QString &url );
+		/**
+		 * Destructor.
+		 */
+		~LinkBrowse();
+		LinkType linkType() const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkBrowse )
+		Q_DISABLE_COPY( LinkBrowse )
+};	
+
+/**
+ * \brief "Standard" action request.
+ *
+ * The LinkAction class represents a link that request a "standard" action
+ * to be performed by the viewer on the displayed document.
+ */
+class POPPLER_QT5_EXPORT LinkAction : public Link
+{
+	public:
+		/**
+		 * The possible types of actions
+		 */
+		enum ActionType { PageFirst = 1,
+		                  PagePrev = 2,
+		                  PageNext = 3,
+		                  PageLast = 4,
+		                  HistoryBack = 5,
+		                  HistoryForward = 6,
+		                  Quit = 7,
+		                  Presentation = 8,
+		                  EndPresentation = 9,
+		                  Find = 10,
+		                  GoToPage = 11,
+		                  Close = 12,
+		                  Print = 13    ///< \since 0.16
+		};
+
+		/**
+		 * The action of the current LinkAction
+		 */
+		ActionType actionType() const;
+
+		/**
+		 * Create a new Action link, that executes a specified action
+		 * on the document.
+		 *
+		 * \param linkArea the active area of the link
+		 * \param actionType which action should be executed
+		 */
+		LinkAction( const QRectF &linkArea, ActionType actionType );
+		/**
+		 * Destructor.
+		 */
+		~LinkAction();
+		LinkType linkType() const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkAction )
+		Q_DISABLE_COPY( LinkAction )
+};
+
+/**
+ * Sound: a sound to be played.
+ *
+ * \since 0.6
+ */
+class POPPLER_QT5_EXPORT LinkSound : public Link
+{
+	public:
+		// create a Link_Sound
+		LinkSound( const QRectF &linkArea, double volume, bool sync, bool repeat, bool mix, SoundObject *sound );
+		/**
+		 * Destructor.
+		 */
+		virtual ~LinkSound();
+
+		LinkType linkType() const;
+
+		/**
+		 * The volume to be used when playing the sound.
+		 *
+		 * The volume is in the range [ -1, 1 ], where:
+		 * - a negative number: no volume (mute)
+		 * - 1: full volume
+		 */
+		double volume() const;
+		/**
+		 * Whether the playback of the sound should be synchronous
+		 * (thus blocking, waiting for the end of the sound playback).
+		 */
+		bool synchronous() const;
+		/**
+		 * Whether the sound should be played continuously (that is,
+		 * started again when it ends)
+		 */
+		bool repeat() const;
+		/**
+		 * Whether the playback of this sound can be mixed with
+		 * playbacks with other sounds of the same document.
+		 *
+		 * \note When false, any other playback must be stopped before
+		 *       playing the sound.
+		 */
+		bool mix() const;
+		/**
+		 * The sound object to be played
+		 */
+		SoundObject *sound() const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkSound )
+		Q_DISABLE_COPY( LinkSound )
+};
+
+/**
+ * Rendition: Rendition link.
+ *
+ * \since 0.20
+ */
+class POPPLER_QT5_EXPORT LinkRendition : public Link
+{
+	public:
+		/**
+		 * Describes the possible rendition actions.
+		 *
+		 * \since 0.22
+		 */
+		enum RenditionAction {
+			NoRendition,
+			PlayRendition,
+			StopRendition,
+			PauseRendition,
+			ResumeRendition
+		};
+
+		/**
+		 * Create a new rendition link.
+		 *
+		 * \param linkArea the active area of the link
+		 * \param rendition the media rendition object. Ownership is taken
+		 * \param operation the numeric operation (action) (@see ::LinkRendition::RenditionOperation)
+		 * \param script the java script code
+		 * \param annotationReference the object reference of the screen annotation associated with this rendition action
+		 * \since 0.22
+		 */
+		LinkRendition( const QRectF &linkArea, ::MediaRendition *rendition, int operation, const QString &script, const Ref &annotationReference );
+
+		/**
+		 * Destructor.
+		 */
+		virtual ~LinkRendition();
+
+		LinkType linkType() const;
+
+		/**
+		 * Returns the media rendition object if the redition provides one, @c 0 otherwise
+		 */
+		MediaRendition *rendition() const;
+
+		/**
+		 * Returns the action that should be executed if a rendition object is provided.
+		 *
+		 * \since 0.22
+		 */
+		RenditionAction action() const;
+
+		/**
+		 * The JS code that shall be executed or an empty string.
+		 *
+		 * \since 0.22
+		 */
+		QString script() const;
+
+		/**
+		 * Returns whether the given @p annotation is the referenced screen annotation for this rendition @p link.
+		 *
+		 * \since 0.22
+		 */
+		bool isReferencedAnnotation( const ScreenAnnotation *annotation ) const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkRendition )
+		Q_DISABLE_COPY( LinkRendition )
+};
+
+/**
+ * JavaScript: a JavaScript code to be interpreted.
+ *
+ * \since 0.10
+ */
+class POPPLER_QT5_EXPORT LinkJavaScript : public Link
+{
+	public:
+		/**
+		 * Create a new JavaScript link.
+		 *
+		 * \param linkArea the active area of the link
+		 * \param js the JS code to be interpreted
+		 */
+		LinkJavaScript( const QRectF &linkArea, const QString &js );
+		/**
+		 * Destructor.
+		 */
+		virtual ~LinkJavaScript();
+
+		LinkType linkType() const;
+
+		/**
+		 * The JS code
+		 */
+		QString script() const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkJavaScript )
+		Q_DISABLE_COPY( LinkJavaScript )
+};	
+
+/**
+ * Movie: a movie to be played.
+ *
+ * \since 0.20
+ */
+class POPPLER_QT5_EXPORT LinkMovie : public Link
+{
+	public:
+		/**
+		 * Describes the operation to be performed on the movie.
+		 */
+		enum Operation { Play,
+		                 Stop,
+		                 Pause,
+		                 Resume
+		};
+
+		/**
+		 * Create a new Movie link.
+		 *
+		 * \param linkArea the active area of the link
+		 * \param operation the operation to be performed on the movie
+		 * \param annotationTitle the title of the movie annotation identifying the movie to be played
+		 * \param annotationReference the object reference of the movie annotation identifying the movie to be played
+		 *
+		 * Note: This constructor is supposed to be used by Poppler::Page only.
+		 */
+		LinkMovie( const QRectF &linkArea, Operation operation, const QString &annotationTitle, const Ref &annotationReference );
+		/**
+		 * Destructor.
+		 */
+		~LinkMovie();
+		LinkType linkType() const;
+		/**
+		 * Returns the operation to be performed on the movie.
+		 */
+		Operation operation() const;
+		/**
+		 * Returns whether the given @p annotation is the referenced movie annotation for this movie @p link.
+		 */
+		bool isReferencedAnnotation( const MovieAnnotation *annotation ) const;
+
+	private:
+		Q_DECLARE_PRIVATE( LinkMovie )
+		Q_DISABLE_COPY( LinkMovie )
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-media.cc b/qt5/src/poppler-media.cc
new file mode 100644
index 00000000..1757fdbb
--- /dev/null
+++ b/qt5/src/poppler-media.cc
@@ -0,0 +1,168 @@
+/* poppler-media.cc: qt interface to poppler
+ * Copyright (C) 2012 Guillermo A. Amaral B. <gamaral@kde.org>
+ * Copyright (C) 2013 Albert Astals Cid <aacid@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-media.h"
+
+#include "Rendition.h"
+
+#include "poppler-private.h"
+
+#include <QtCore/QBuffer>
+
+#define BUFFER_MAX 4096
+
+namespace Poppler
+{
+
+class MediaRenditionPrivate
+{
+public:
+
+  MediaRenditionPrivate(::MediaRendition *rendition)
+  : rendition(rendition)
+  {
+  }
+  
+  ~MediaRenditionPrivate()
+  {
+    delete rendition;
+  }
+
+  ::MediaRendition *rendition;
+};
+
+MediaRendition::MediaRendition(::MediaRendition *rendition)
+  : d_ptr(new MediaRenditionPrivate(rendition))
+{
+}
+
+MediaRendition::~MediaRendition()
+{
+  delete d_ptr;
+}
+
+bool
+MediaRendition::isValid() const
+{
+  Q_D( const MediaRendition );
+  return d->rendition && d->rendition->isOk();
+}
+
+QString
+MediaRendition::contentType() const
+{
+  Q_ASSERT(isValid() && "Invalid media rendition.");
+  Q_D( const MediaRendition );
+  return UnicodeParsedString(d->rendition->getContentType());
+}
+
+QString
+MediaRendition::fileName() const
+{
+  Q_ASSERT(isValid() && "Invalid media rendition.");
+  Q_D( const MediaRendition );
+  return UnicodeParsedString(d->rendition->getFileName());
+}
+
+bool
+MediaRendition::isEmbedded() const
+{
+  Q_ASSERT(isValid() && "Invalid media rendition.");
+  Q_D( const MediaRendition );
+  return d->rendition->getIsEmbedded();
+}
+
+QByteArray
+MediaRendition::data() const
+{
+  Q_ASSERT(isValid() && "Invalid media rendition.");
+  Q_D( const MediaRendition );
+
+  Stream *s = d->rendition->getEmbbededStream();
+  if (!s)
+    return QByteArray();
+
+  QBuffer buffer;
+  Guchar data[BUFFER_MAX];
+  int bread;
+
+  buffer.open(QIODevice::WriteOnly);
+  s->reset();
+  while ((bread = s->doGetChars(BUFFER_MAX, data)) != 0)
+    buffer.write(reinterpret_cast<const char *>(data), bread);
+  buffer.close();
+
+  return buffer.data();
+}
+
+bool
+MediaRendition::autoPlay() const
+{
+  Q_D( const MediaRendition );
+  if (d->rendition->getBEParameters()) {
+    return d->rendition->getBEParameters()->autoPlay;
+  } else if (d->rendition->getMHParameters()) {
+    return d->rendition->getMHParameters()->autoPlay;
+  } else qDebug("No BE or MH paremeters to reference!");
+  return false;
+}
+
+bool
+MediaRendition::showControls() const
+{
+  Q_D( const MediaRendition );
+  if (d->rendition->getBEParameters()) {
+    return d->rendition->getBEParameters()->showControls;
+  } else if (d->rendition->getMHParameters()) {
+    return d->rendition->getMHParameters()->showControls;
+  } else qDebug("No BE or MH paremeters to reference!");
+  return false;
+}
+
+float
+MediaRendition::repeatCount() const
+{
+  Q_D( const MediaRendition );
+  if (d->rendition->getBEParameters()) {
+    return d->rendition->getBEParameters()->repeatCount;
+  } else if (d->rendition->getMHParameters()) {
+    return d->rendition->getMHParameters()->repeatCount;
+  } else qDebug("No BE or MH paremeters to reference!");
+  return 1.f;
+}
+
+QSize
+MediaRendition::size() const
+{
+  Q_D( const MediaRendition );
+  MediaParameters *mp = 0;
+
+  if (d->rendition->getBEParameters())
+    mp = d->rendition->getBEParameters();
+  else if (d->rendition->getMHParameters())
+    mp = d->rendition->getMHParameters();
+  else qDebug("No BE or MH paremeters to reference!");
+
+  if (mp)
+    return QSize(mp->windowParams.width, mp->windowParams.height);
+  return QSize();
+}
+
+}
+
diff --git a/qt5/src/poppler-media.h b/qt5/src/poppler-media.h
new file mode 100644
index 00000000..40b8cae3
--- /dev/null
+++ b/qt5/src/poppler-media.h
@@ -0,0 +1,100 @@
+/* poppler-media.h: qt interface to poppler
+ * Copyright (C) 2012 Guillermo A. Amaral B. <gamaral@kde.org>
+ * Copyright (C) 2012, 2013 Albert Astals Cid <aacid@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __POPPLER_MEDIARENDITION_H__
+#define __POPPLER_MEDIARENDITION_H__
+
+#include "poppler-export.h"
+
+#include <QtCore/QSize>
+#include <QtCore/QString>
+
+class MediaRendition;
+class QIODevice;
+
+namespace Poppler
+{
+  class MediaRenditionPrivate;
+
+  /**
+    Qt wrapper for MediaRendition.
+
+    \since 0.20
+   */
+  class POPPLER_QT5_EXPORT MediaRendition {
+   public:
+    /**
+      Constructs a MediaRendition. Takes ownership of the passed rendition
+     */
+    MediaRendition(::MediaRendition *rendition);
+    ~MediaRendition();
+
+    /**
+      Check if wrapper is holding a valid rendition object.
+     */
+    bool isValid() const;
+
+    /**
+      Returns content type.
+     */
+    QString contentType() const;
+
+    /**
+      Returns file name.
+     */
+    QString fileName() const;
+
+    /**
+      Returns true if media is embedded.
+     */
+    bool isEmbedded() const;
+
+    /**
+      Returns data buffer.
+     */
+    QByteArray data() const;
+
+    /**
+      Convenience accessor for auto-play parameter.
+     */
+    bool autoPlay() const;
+
+    /**
+      Convenience accessor for show controls parameter.
+     */
+    bool showControls() const;
+
+    /**
+      Convenience accessor for repeat count parameter.
+     */
+    float repeatCount() const;
+
+    /**
+      Convenience accessor for size parameter.
+     */
+    QSize size() const;
+
+   private:
+    Q_DECLARE_PRIVATE( MediaRendition )
+    MediaRenditionPrivate *d_ptr;
+    Q_DISABLE_COPY( MediaRendition )
+  };
+}
+
+#endif /* __POPPLER_MEDIARENDITION_H__ */
diff --git a/qt5/src/poppler-movie.cc b/qt5/src/poppler-movie.cc
new file mode 100644
index 00000000..cdb674dc
--- /dev/null
+++ b/qt5/src/poppler-movie.cc
@@ -0,0 +1,110 @@
+/* poppler-sound.cc: qt interface to poppler
+ * Copyright (C) 2008, 2010, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2010, Carlos Garcia Campos <carlosgc@gnome.org>
+ * Copyright (C) 2012, Tobias Koenig <tobias.koenig@kdab.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include "Object.h"
+#include "Annot.h"
+#include "Movie.h"
+
+#include <QtGui/QImage>
+
+namespace Poppler
+{
+
+class MovieData
+{
+public:
+	MovieData()
+	  : m_movieObj( 0 )
+	{
+	}
+
+	~MovieData()
+	{
+		delete m_movieObj;
+	}
+
+	Movie *m_movieObj;
+	QSize m_size;
+	int m_rotation;
+	QImage m_posterImage;
+	MovieObject::PlayMode m_playMode : 3;
+	bool m_showControls : 1;
+};
+
+MovieObject::MovieObject( AnnotMovie *ann )
+{
+	m_movieData = new MovieData();
+	m_movieData->m_movieObj = ann->getMovie()->copy();
+	//TODO: copy poster image
+
+	MovieActivationParameters *mp = m_movieData->m_movieObj->getActivationParameters();
+	int width, height;
+	m_movieData->m_movieObj->getFloatingWindowSize(&width, &height);
+	m_movieData->m_size = QSize(width, height);
+	m_movieData->m_rotation = m_movieData->m_movieObj->getRotationAngle();
+	m_movieData->m_showControls = mp->showControls;
+	m_movieData->m_playMode = (MovieObject::PlayMode)mp->repeatMode;
+}
+
+MovieObject::~MovieObject()
+{
+	delete m_movieData;
+}
+
+QString MovieObject::url() const
+{
+	GooString * goo = m_movieData->m_movieObj->getFileName();
+	return goo ? QString( goo->getCString() ) : QString();
+}
+
+QSize MovieObject::size() const
+{
+	return m_movieData->m_size;
+}
+
+int MovieObject::rotation() const
+{
+	return m_movieData->m_rotation;
+}
+
+bool MovieObject::showControls() const
+{
+	return m_movieData->m_showControls;
+}
+
+MovieObject::PlayMode MovieObject::playMode() const
+{
+	return m_movieData->m_playMode;
+}
+
+bool MovieObject::showPosterImage() const
+{
+	return (m_movieData->m_movieObj->getShowPoster() == gTrue);
+}
+
+QImage MovieObject::posterImage() const
+{
+	return m_movieData->m_posterImage;
+}
+
+}
diff --git a/qt5/src/poppler-optcontent-private.h b/qt5/src/poppler-optcontent-private.h
new file mode 100644
index 00000000..98eda073
--- /dev/null
+++ b/qt5/src/poppler-optcontent-private.h
@@ -0,0 +1,121 @@
+/* poppler-optcontent-private.h: qt interface to poppler
+ *
+ * Copyright (C) 2007, Brad Hards <bradh@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef POPPLER_OPTCONTENT_PRIVATE_H
+#define POPPLER_OPTCONTENT_PRIVATE_H
+
+#include <QtCore/QMap>
+#include <QtCore/QSet>
+#include <QtCore/QString>
+
+class Array;
+class OCGs;
+class OptionalContentGroup;
+
+class QModelIndex;
+
+namespace Poppler
+{
+  class OptContentItem;
+  class OptContentModel;
+  class OptContentModelPrivate;
+
+  class RadioButtonGroup
+  {
+  public:
+    RadioButtonGroup( OptContentModelPrivate *ocModel, Array *rbarray);
+    ~RadioButtonGroup();
+    QSet<OptContentItem *> setItemOn( OptContentItem *itemToSetOn );
+
+  private:
+    QList<OptContentItem*> itemsInGroup;
+  };
+
+  class OptContentItem
+  {
+    public:
+    enum ItemState { On, Off, HeadingOnly };
+
+    OptContentItem( OptionalContentGroup *group );
+    OptContentItem( const QString &label );
+    OptContentItem();
+    ~OptContentItem();
+
+    QString name() const { return m_name; }
+    ItemState state() const { return m_stateBackup; }
+    bool setState(ItemState state, QSet<OptContentItem *> &changedItems);
+
+    QList<OptContentItem*> childList() { return m_children; }
+
+    void setParent( OptContentItem* parent) { m_parent = parent; }
+    OptContentItem* parent() { return m_parent; }
+
+    void addChild( OptContentItem *child );
+
+    void appendRBGroup( RadioButtonGroup *rbgroup );
+
+    bool isEnabled() const { return m_enabled; }
+
+    QSet<OptContentItem*> recurseListChildren(bool includeMe = false) const;
+
+    private:
+    OptionalContentGroup *m_group;
+    QString m_name;
+    ItemState m_state; // true for ON, false for OFF
+    ItemState m_stateBackup;
+    QList<OptContentItem*> m_children;
+    OptContentItem *m_parent;
+    QList<RadioButtonGroup*> m_rbGroups;
+    bool m_enabled;
+  };
+
+  class OptContentModelPrivate
+  {
+    public:
+    OptContentModelPrivate( OptContentModel *qq, OCGs *optContent );
+    ~OptContentModelPrivate();
+
+    void parseRBGroupsArray( Array *rBGroupArray );
+    OptContentItem *nodeFromIndex(const QModelIndex &index, bool canBeNull = false) const;
+    QModelIndex indexFromItem(OptContentItem *node, int column) const;
+
+    /**
+       Get the OptContentItem corresponding to a given reference value.
+
+       \param ref the reference number (e.g. from Object.getRefNum()) to look up
+
+       \return the matching optional content item, or null if the reference wasn't found
+    */
+    OptContentItem *itemFromRef( const QString &ref ) const;
+    void setRootNode(OptContentItem *node);
+
+    OptContentModel *q;
+
+    QMap<QString, OptContentItem*> m_optContentItems;
+    QList<RadioButtonGroup*> m_rbgroups;
+    OptContentItem *m_rootNode;
+
+    private:
+    void addChild( OptContentItem *parent, OptContentItem *child);
+    void parseOrderArray( OptContentItem *parentNode, Array *orderArray );
+  };
+}
+
+#endif
diff --git a/qt5/src/poppler-optcontent.cc b/qt5/src/poppler-optcontent.cc
new file mode 100644
index 00000000..5af37c87
--- /dev/null
+++ b/qt5/src/poppler-optcontent.cc
@@ -0,0 +1,429 @@
+/* poppler-optcontent.cc: qt interface to poppler
+ *
+ * Copyright (C) 2007, Brad Hards <bradh@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, Carlos Garcia Campos <carlosgc@gnome.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-optcontent.h"
+
+#include "poppler-optcontent-private.h"
+
+#include "poppler-private.h"
+
+#include <QtCore/QDebug>
+#include <QtCore/QtAlgorithms>
+
+#include "poppler/OptionalContent.h"
+
+namespace Poppler
+{
+
+  RadioButtonGroup::RadioButtonGroup( OptContentModelPrivate *ocModel, Array *rbarray )
+  {
+    for (int i = 0; i < rbarray->getLength(); ++i) {
+      Object ref;
+      rbarray->getNF( i, &ref );
+      if ( ! ref.isRef() ) {
+	qDebug() << "expected ref, but got:" << ref.getType();
+      }
+      OptContentItem *item = ocModel->itemFromRef( QString::number(ref.getRefNum() ) );
+      itemsInGroup.append( item );
+    }
+    for (int i = 0; i < itemsInGroup.size(); ++i) {
+      OptContentItem *item = itemsInGroup.at(i);
+      item->appendRBGroup( this );
+    }
+  }
+
+  RadioButtonGroup::~RadioButtonGroup()
+  {
+  }
+
+  QSet<OptContentItem *> RadioButtonGroup::setItemOn( OptContentItem *itemToSetOn )
+  {
+    QSet<OptContentItem *> changedItems;
+    for (int i = 0; i < itemsInGroup.size(); ++i) {
+      OptContentItem *thisItem = itemsInGroup.at(i);
+      if (thisItem != itemToSetOn) {
+        QSet<OptContentItem *> newChangedItems;
+        thisItem->setState(OptContentItem::Off, newChangedItems);
+        changedItems += newChangedItems;
+      }
+    }
+    return changedItems;
+  }
+
+
+
+  OptContentItem::OptContentItem( OptionalContentGroup *group )
+  {
+    m_group = group;
+    m_parent = 0;
+    m_name = UnicodeParsedString( group->getName() );
+    if ( group->getState() == OptionalContentGroup::On ) {
+      m_state = OptContentItem::On;
+    } else {
+      m_state = OptContentItem::Off;
+    }
+    m_stateBackup = m_state;
+    m_enabled = true;
+  }
+
+  OptContentItem::OptContentItem( const QString &label )
+  {
+    m_parent = 0;
+    m_name = label;
+    m_group = 0;
+    m_state = OptContentItem::HeadingOnly;
+    m_stateBackup = m_state;
+    m_enabled = true;
+  }
+
+  OptContentItem::OptContentItem() :
+    m_parent( 0 ), m_enabled(true)
+  {
+  }
+
+  OptContentItem::~OptContentItem()
+  {
+  }
+
+  void OptContentItem::appendRBGroup( RadioButtonGroup *rbgroup )
+  {
+    m_rbGroups.append( rbgroup );
+  }
+
+
+  bool OptContentItem::setState(ItemState state, QSet<OptContentItem *> &changedItems)
+  {
+    m_state = state;
+    m_stateBackup = m_state;
+    changedItems.insert(this);
+    QSet<OptContentItem *> empty;
+    Q_FOREACH (OptContentItem *child, m_children) {
+      ItemState oldState = child->m_stateBackup;
+      child->setState(state == OptContentItem::On ? child->m_stateBackup : OptContentItem::Off, empty);
+      child->m_enabled = state == OptContentItem::On;
+      child->m_stateBackup = oldState;
+    }
+    if (!m_group) {
+      return false;
+    }
+    if ( state == OptContentItem::On ) {
+      m_group->setState( OptionalContentGroup::On );
+      for (int i = 0; i < m_rbGroups.size(); ++i) {
+	RadioButtonGroup *rbgroup = m_rbGroups.at(i);
+        changedItems += rbgroup->setItemOn( this );
+      }
+    } else if ( state == OptContentItem::Off ) {
+      m_group->setState( OptionalContentGroup::Off );
+    }
+    return true;
+  }
+
+  void OptContentItem::addChild( OptContentItem *child )
+  {
+    m_children += child;
+    child->setParent( this );
+  }
+
+  QSet<OptContentItem*> OptContentItem::recurseListChildren(bool includeMe) const
+  {
+    QSet<OptContentItem*> ret;
+    if (includeMe) {
+      ret.insert(const_cast<OptContentItem*>(this));
+    }
+    Q_FOREACH (OptContentItem *child, m_children) {
+      ret += child->recurseListChildren(true);
+    }
+    return ret;
+  }
+
+  OptContentModelPrivate::OptContentModelPrivate( OptContentModel *qq, OCGs *optContent )
+    : q(qq)
+  {
+    m_rootNode = new OptContentItem();
+    GooList *ocgs = optContent->getOCGs();
+
+    for (int i = 0; i < ocgs->getLength(); ++i) {
+      OptionalContentGroup *ocg = static_cast<OptionalContentGroup*>(ocgs->get(i));
+      OptContentItem *node = new OptContentItem( ocg );
+      m_optContentItems.insert( QString::number(ocg->getRef().num), node);
+    }
+
+    if ( optContent->getOrderArray() == 0 ) {
+      // no Order array, so drop them all at the top level
+      QMapIterator<QString, OptContentItem*> i(m_optContentItems);
+      while ( i.hasNext() ) {
+	i.next();
+	qDebug() << "iterator" << i.key() << ":" << i.value();
+	addChild( i.value(), m_rootNode );
+      }
+    } else {
+      parseOrderArray( m_rootNode, optContent->getOrderArray() );
+    }
+
+    parseRBGroupsArray( optContent->getRBGroupsArray() );
+  }
+
+  OptContentModelPrivate::~OptContentModelPrivate()
+  {
+    qDeleteAll( m_optContentItems );
+    qDeleteAll( m_rbgroups );
+    delete m_rootNode;
+  }
+
+  void OptContentModelPrivate::parseOrderArray( OptContentItem *parentNode, Array *orderArray )
+  {
+    OptContentItem *lastItem = parentNode;
+    for (int i = 0; i < orderArray->getLength(); ++i) {
+      Object orderItem;
+      orderArray->get(i, &orderItem);
+      if ( orderItem.isDict() ) {
+	Object item;
+	orderArray->getNF(i, &item);
+	if (item.isRef() ) {
+          OptContentItem *ocItem = m_optContentItems.value(QString::number(item.getRefNum()), 0);
+	  if (ocItem) {
+	    addChild( parentNode, ocItem );
+	    lastItem = ocItem;
+	  } else {
+            qDebug() << "could not find group for object" << item.getRefNum();
+	  }
+	}
+	item.free();
+      } else if ( (orderItem.isArray()) && (orderItem.arrayGetLength() > 0) ) {
+	parseOrderArray(lastItem, orderItem.getArray());
+      } else if ( orderItem.isString() ) {
+	GooString *label = orderItem.getString();
+	OptContentItem *header = new OptContentItem ( UnicodeParsedString ( label ) );
+	addChild( parentNode, header );
+	parentNode = header;
+	lastItem = header;
+      } else {
+	qDebug() << "something unexpected";
+      }	
+      orderItem.free();
+    }
+  }
+
+  void OptContentModelPrivate::parseRBGroupsArray( Array *rBGroupArray )
+  {
+    if (! rBGroupArray) {
+      return;
+    }
+    // This is an array of array(s)
+    for (int i = 0; i < rBGroupArray->getLength(); ++i) {
+      Object rbObj;
+      rBGroupArray->get(i, &rbObj);
+      if ( ! rbObj.isArray() ) {
+	qDebug() << "expected inner array, got:" << rbObj.getType();
+	return;
+      }
+      Array *rbarray = rbObj.getArray();
+      RadioButtonGroup *rbg = new RadioButtonGroup( this, rbarray );
+      m_rbgroups.append( rbg );
+      rbObj.free();
+    }
+  }
+
+  OptContentModel::OptContentModel( OCGs *optContent, QObject *parent)
+    : QAbstractItemModel(parent)
+  {
+    d = new OptContentModelPrivate( this, optContent );
+  }
+
+  OptContentModel::~OptContentModel()
+  {
+    delete d;
+  }
+
+  void OptContentModelPrivate::setRootNode(OptContentItem *node)
+  {
+    q->beginResetModel();
+    delete m_rootNode;
+    m_rootNode = node;
+    q->endResetModel();
+  }
+
+  QModelIndex OptContentModel::index(int row, int column, const QModelIndex &parent) const
+  {
+    if (row < 0 || column != 0) {
+      return QModelIndex();
+    }
+
+    OptContentItem *parentNode = d->nodeFromIndex( parent );
+    if (row < parentNode->childList().count()) {
+      return createIndex(row, column, parentNode->childList().at(row));
+    }
+    return QModelIndex();
+  }
+
+  QModelIndex OptContentModel::parent(const QModelIndex &child) const
+  {
+    OptContentItem *childNode = d->nodeFromIndex( child );
+    if (!childNode) {
+      return QModelIndex();
+    }
+    return d->indexFromItem(childNode->parent(), child.column());
+  }
+
+  QModelIndex OptContentModelPrivate::indexFromItem(OptContentItem *node, int column) const
+  {
+    if (!node) {
+      return QModelIndex();
+    }
+    OptContentItem *parentNode = node->parent();
+    if (!parentNode) {
+      return QModelIndex();
+    }
+    const int row = parentNode->childList().indexOf(node);
+    return q->createIndex(row, column, node);
+  }
+ 
+  int OptContentModel::rowCount(const QModelIndex &parent) const
+  {
+    OptContentItem *parentNode = d->nodeFromIndex( parent );
+    if (!parentNode) {
+      return 0;
+    } else {
+      return parentNode->childList().count();
+    }
+  }
+
+  int OptContentModel::columnCount(const QModelIndex &parent) const
+  {
+    return 1;
+  }
+
+
+  QVariant OptContentModel::data(const QModelIndex &index, int role) const
+  {
+    OptContentItem *node = d->nodeFromIndex(index, true);
+    if (!node) {
+      return QVariant();
+    }
+
+    switch (role) {
+      case Qt::DisplayRole:
+        return node->name();
+        break;
+      case Qt::EditRole:
+        if (node->state() == OptContentItem::On) {
+          return true;
+        } else if (node->state() == OptContentItem::Off) {
+          return false;
+        }
+        break;
+      case Qt::CheckStateRole:
+        if (node->state() == OptContentItem::On) {
+          return Qt::Checked;
+        } else if (node->state() == OptContentItem::Off) {
+          return Qt::Unchecked;
+        }
+        break;
+    }
+
+    return QVariant();
+  }
+
+  bool OptContentModel::setData ( const QModelIndex & index, const QVariant & value, int role )
+  {
+    OptContentItem *node = d->nodeFromIndex(index, true);
+    if (!node) {
+      return false;
+    }
+
+    switch (role) {
+      case Qt::CheckStateRole:
+      {
+        const bool newvalue = value.toBool();
+        if (newvalue) {
+          if (node->state() != OptContentItem::On) {
+            QSet<OptContentItem *> changedItems;
+            node->setState(OptContentItem::On, changedItems);
+            changedItems += node->recurseListChildren(false);
+            QModelIndexList indexes;
+            Q_FOREACH (OptContentItem *item, changedItems) {
+              indexes.append(d->indexFromItem(item, 0));
+            }
+            qStableSort(indexes);
+            Q_FOREACH (const QModelIndex &changedIndex, indexes) {
+              emit dataChanged(changedIndex, changedIndex);
+            }
+            return true;
+          }
+        } else {
+          if (node->state() != OptContentItem::Off) {
+            QSet<OptContentItem *> changedItems;
+            node->setState(OptContentItem::Off, changedItems);
+            changedItems += node->recurseListChildren(false);
+            QModelIndexList indexes;
+            Q_FOREACH (OptContentItem *item, changedItems) {
+              indexes.append(d->indexFromItem(item, 0));
+            }
+            qStableSort(indexes);
+            Q_FOREACH (const QModelIndex &changedIndex, indexes) {
+              emit dataChanged(changedIndex, changedIndex);
+            }
+            return true;
+          }
+        }
+        break;
+      }
+    }
+
+    return false;
+  }
+
+  Qt::ItemFlags OptContentModel::flags ( const QModelIndex & index ) const
+  {
+    OptContentItem *node = d->nodeFromIndex(index);
+    Qt::ItemFlags itemFlags = Qt::ItemIsSelectable | Qt::ItemIsUserCheckable;
+    if (node->isEnabled()) {
+      itemFlags |= Qt::ItemIsEnabled;
+    }
+    return itemFlags;
+  }
+
+  QVariant OptContentModel::headerData( int section, Qt::Orientation orientation, int role ) const
+  {
+    return QAbstractItemModel::headerData( section, orientation, role );
+  }
+
+  void OptContentModelPrivate::addChild( OptContentItem *parent, OptContentItem *child )
+  {
+    parent->addChild( child );
+  }
+
+  OptContentItem* OptContentModelPrivate::itemFromRef( const QString &ref ) const
+  {
+    return m_optContentItems.value(ref, 0);
+  }
+
+  OptContentItem* OptContentModelPrivate::nodeFromIndex(const QModelIndex &index, bool canBeNull) const
+  {
+    if (index.isValid()) {
+      return static_cast<OptContentItem *>(index.internalPointer());
+    } else {
+      return canBeNull ? 0 : m_rootNode;
+    }
+  }
+}
+
+#include "poppler-optcontent.moc"
diff --git a/qt5/src/poppler-optcontent.h b/qt5/src/poppler-optcontent.h
new file mode 100644
index 00000000..ad75da8c
--- /dev/null
+++ b/qt5/src/poppler-optcontent.h
@@ -0,0 +1,77 @@
+/* poppler-optcontent.h: qt interface to poppler
+ *
+ * Copyright (C) 2007, Brad Hards <bradh@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013, Anthony Granger <grangeranthony@gmail.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef POPPLER_OPTCONTENT_H
+#define POPPLER_OPTCONTENT_H
+
+#include <QtCore/QAbstractListModel>
+
+#include "poppler-export.h"
+
+class OCGs;
+
+namespace Poppler
+{
+  class Document;
+  class OptContentModelPrivate;
+
+  /**
+   * \brief Model for optional content
+   *
+   * OptContentModel is an item model representing the optional content items
+   * that can be found in PDF documents.
+   *
+   * The model offers a mostly read-only display of the data, allowing to
+   * enable/disable some contents setting the Qt::CheckStateRole data role.
+   *
+   * \since 0.8
+   */
+  class POPPLER_QT5_EXPORT OptContentModel : public QAbstractItemModel
+  {
+    friend class Document;
+
+    Q_OBJECT
+
+    public:
+    virtual ~OptContentModel();
+
+    QModelIndex index(int row, int column, const QModelIndex &parent) const;
+    QModelIndex parent(const QModelIndex &child) const;
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int columnCount(const QModelIndex &parent) const;
+
+    QVariant data(const QModelIndex &index, int role) const;
+    virtual bool setData ( const QModelIndex & index, const QVariant & value, int role = Qt::EditRole );
+
+    Qt::ItemFlags flags ( const QModelIndex & index ) const;
+
+    virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
+
+    private:
+    OptContentModel( OCGs *optContent, QObject *parent = 0);
+
+    friend class OptContentModelPrivate;
+    OptContentModelPrivate *d;
+  };
+}
+
+#endif
diff --git a/qt5/src/poppler-page-private.h b/qt5/src/poppler-page-private.h
new file mode 100644
index 00000000..91955e09
--- /dev/null
+++ b/qt5/src/poppler-page-private.h
@@ -0,0 +1,54 @@
+/* poppler-page.cc: qt interface to poppler
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2007, 2012, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _POPPLER_PAGE_PRIVATE_H_
+#define _POPPLER_PAGE_PRIVATE_H_
+
+#include "CharTypes.h"
+
+class QRectF;
+
+class LinkAction;
+class Page;
+class TextPage;
+
+namespace Poppler
+{
+
+class DocumentData;
+class PageTransition;
+
+class PageData {
+public:
+  Link* convertLinkActionToLink(::LinkAction * a, const QRectF &linkArea);
+
+  DocumentData *parentDoc;
+  ::Page *page;
+  int index;
+  PageTransition *transition;
+
+  static Link* convertLinkActionToLink(::LinkAction * a, DocumentData *parentDoc, const QRectF &linkArea);
+  
+  TextPage *prepareTextSearch(const QString &text, Page::SearchMode caseSensitive, Page::Rotation rotate, GBool *sCase, QVector<Unicode> *u);
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-page-transition-private.h b/qt5/src/poppler-page-transition-private.h
new file mode 100644
index 00000000..63febb09
--- /dev/null
+++ b/qt5/src/poppler-page-transition-private.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2005, Albert Astals Cid
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+class Object;
+
+namespace Poppler {
+
+class PageTransitionParams {
+  public:
+    Object *dictObj;
+};
+
+}
diff --git a/qt5/src/poppler-page-transition.cc b/qt5/src/poppler-page-transition.cc
new file mode 100644
index 00000000..cde8818d
--- /dev/null
+++ b/qt5/src/poppler-page-transition.cc
@@ -0,0 +1,95 @@
+/* PageTransition.cc
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "PageTransition.h"
+#include "poppler-page-transition.h"
+#include "poppler-page-transition-private.h"
+
+namespace Poppler {
+
+class PageTransitionData
+{
+  public:
+    PageTransitionData(Object *trans)
+    {
+        pt = new ::PageTransition(trans);
+    }
+
+    PageTransitionData(const PageTransitionData &ptd)
+    {
+        pt = new ::PageTransition(*ptd.pt);
+    }
+
+    ~PageTransitionData()
+    {
+        delete pt;
+    }
+
+    ::PageTransition *pt;
+};
+
+PageTransition::PageTransition(const PageTransitionParams &params)
+{
+  data = new PageTransitionData(params.dictObj);
+}
+
+PageTransition::PageTransition(const PageTransition &pt)
+{
+  data = new PageTransitionData(*pt.data);
+}
+
+PageTransition::~PageTransition()
+{
+  delete data;
+}
+
+PageTransition::Type PageTransition::type() const
+{
+  return (Poppler::PageTransition::Type)data->pt->getType();
+}
+
+int PageTransition::duration() const
+{
+  return data->pt->getDuration();
+}
+
+PageTransition::Alignment PageTransition::alignment() const
+{
+  return (Poppler::PageTransition::Alignment)data->pt->getAlignment();
+}
+
+PageTransition::Direction PageTransition::direction() const
+{
+  return (Poppler::PageTransition::Direction)data->pt->getDirection();
+}
+
+int PageTransition::angle() const
+{
+  return data->pt->getAngle();
+}
+
+double PageTransition::scale() const
+{
+  return data->pt->getScale();
+}
+bool PageTransition::isRectangular() const
+{
+  return data->pt->isRectangular();
+}
+
+}
diff --git a/qt5/src/poppler-page-transition.h b/qt5/src/poppler-page-transition.h
new file mode 100644
index 00000000..2d408a51
--- /dev/null
+++ b/qt5/src/poppler-page-transition.h
@@ -0,0 +1,148 @@
+/* PageTransition.h
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __PAGETRANSITION_X_H__
+#define __PAGETRANSITION_X_H__
+
+#include "poppler-export.h"
+
+namespace Poppler {
+
+class PageTransitionParams;
+class PageTransitionData;
+
+/**
+   \brief Describes how a PDF file viewer shall perform the transition
+   from one page to another
+
+   In PDF files there is a way to specify if the viewer shall use
+   certain effects to perform the transition from one page to
+   another. This feature can be used, e.g., in a PDF-based beamer
+   presentation.
+
+   This utility class represents the transition effect, and can be
+   used to extract the information from a PDF object.
+*/
+
+
+class POPPLER_QT5_EXPORT PageTransition {
+ public:
+
+  /** \brief transition effect that shall be used
+   */
+  // if changed remember to keep in sync with PageTransition.h enum
+  enum Type {
+    Replace = 0,
+    Split,
+    Blinds,
+    Box,
+    Wipe,
+    Dissolve,
+    Glitter,
+    Fly,
+    Push,
+    Cover,
+    Uncover,
+    Fade
+  };
+  
+  /** \brief alignment of the transition effect that shall be used
+   */
+  // if changed remember to keep in sync with PageTransition.h enum
+  enum Alignment {
+    Horizontal = 0,
+    Vertical
+  };
+  
+  /** \brief direction of the transition effect that shall be used
+   */
+  // if changed remember to keep in sync with PageTransition.h enum
+  enum Direction {
+    Inward = 0,
+    Outward
+  };
+  
+  /** \brief Construct a new PageTransition object from a page dictionary.
+
+  Users of the library will rarely need to construct a
+  PageTransition object themselves. Instead, the method
+  Poppler::Page::transition() can be used to find out if a certain
+  transition effect is specified.
+
+  @warning In case or error, this method will print an error message to stderr,
+  and construct a default object.
+
+  @param params an object whose dictionary will be read and
+   parsed. This must be a valid object, whose dictionaries are
+   accessed by the constructor. The object is only accessed by this
+   constructor, and may be deleted after the constructor returns.
+  */
+  PageTransition(const PageTransitionParams &params);
+
+  /** \brief copy constructor */
+  PageTransition(const PageTransition &pt);
+  
+  /**
+     Destructor
+  */
+  ~PageTransition();
+  
+  /**
+     \brief Get type of the transition.
+  */
+  Type type() const;
+  
+  /**
+     \brief Get duration of the transition in seconds.
+  */
+  int duration() const;
+  
+  /**
+     \brief Get dimension in which the transition effect occurs.
+  */
+  Alignment alignment() const;
+  
+  /**
+     \brief Get direction of motion of the transition effect.
+  */
+  Direction direction() const;
+  
+  /**
+     \brief Get direction in which the transition effect moves.
+  */
+  int angle() const;
+  
+  /**
+     \brief Get starting or ending scale.
+  */
+  double scale() const;
+  
+  /**
+     \brief Returns true if the area to be flown is rectangular and
+     opaque.
+  */
+  bool isRectangular() const;
+  
+ private:
+  PageTransitionData *data;
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
new file mode 100644
index 00000000..df2ef691
--- /dev/null
+++ b/qt5/src/poppler-page.cc
@@ -0,0 +1,726 @@
+/* poppler-page.cc: qt interface to poppler
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2005-2013, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
+ * Copyright (C) 2006-2011, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
+ * Copyright (C) 2009 Shawn Rutledge <shawn.t.rutledge@gmail.com>
+ * Copyright (C) 2010, 2012, Guillermo Amaral <gamaral@kdab.com>
+ * Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ * Copyright (C) 2010 Matthias Fauconneau <matthias.fauconneau@gmail.com>
+ * Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+ * Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com>
+ * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012 Adam Reichold <adamreichold@myopera.com>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <poppler-qt5.h>
+
+#include <QtCore/QHash>
+#include <QtCore/QMap>
+#include <QtCore/QVarLengthArray>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
+
+#include <config.h>
+#include <PDFDoc.h>
+#include <Catalog.h>
+#include <Form.h>
+#include <ErrorCodes.h>
+#include <TextOutputDev.h>
+#include <Annot.h>
+#include <Link.h>
+#include <ArthurOutputDev.h>
+#include <Rendition.h>
+#if defined(HAVE_SPLASH)
+#include <SplashOutputDev.h>
+#include <splash/SplashBitmap.h>
+#endif
+
+#include "poppler-private.h"
+#include "poppler-page-transition-private.h"
+#include "poppler-page-private.h"
+#include "poppler-link-extractor-private.h"
+#include "poppler-annotation-private.h"
+#include "poppler-form.h"
+#include "poppler-media.h"
+
+namespace Poppler {
+
+Link* PageData::convertLinkActionToLink(::LinkAction * a, const QRectF &linkArea)
+{
+    return convertLinkActionToLink(a, parentDoc, linkArea);
+}
+
+Link* PageData::convertLinkActionToLink(::LinkAction * a, DocumentData *parentDoc, const QRectF &linkArea)
+{
+  if ( !a )
+    return NULL;
+
+  Link * popplerLink = NULL;
+  switch ( a->getKind() )
+  {
+    case actionGoTo:
+    {
+      LinkGoTo * g = (LinkGoTo *) a;
+      const LinkDestinationData ldd( g->getDest(), g->getNamedDest(), parentDoc, false );
+      // create link: no ext file, namedDest, object pointer
+      popplerLink = new LinkGoto( linkArea, QString::null, LinkDestination( ldd ) );
+    }
+    break;
+
+    case actionGoToR:
+    {
+      LinkGoToR * g = (LinkGoToR *) a;
+      // copy link file
+      const QString fileName = UnicodeParsedString( g->getFileName() );
+      const LinkDestinationData ldd( g->getDest(), g->getNamedDest(), parentDoc, !fileName.isEmpty() );
+      // ceate link: fileName, namedDest, object pointer
+      popplerLink = new LinkGoto( linkArea, fileName, LinkDestination( ldd ) );
+    }
+    break;
+
+    case actionLaunch:
+    {
+      LinkLaunch * e = (LinkLaunch *)a;
+      GooString * p = e->getParams();
+      popplerLink = new LinkExecute( linkArea, e->getFileName()->getCString(), p ? p->getCString() : 0 );
+    }
+    break;
+
+    case actionNamed:
+    {
+      const char * name = ((LinkNamed *)a)->getName()->getCString();
+      if ( !strcmp( name, "NextPage" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::PageNext );
+      else if ( !strcmp( name, "PrevPage" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::PagePrev );
+      else if ( !strcmp( name, "FirstPage" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::PageFirst );
+      else if ( !strcmp( name, "LastPage" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::PageLast );
+      else if ( !strcmp( name, "GoBack" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::HistoryBack );
+      else if ( !strcmp( name, "GoForward" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::HistoryForward );
+      else if ( !strcmp( name, "Quit" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::Quit );
+      else if ( !strcmp( name, "GoToPage" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::GoToPage );
+      else if ( !strcmp( name, "Find" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::Find );
+      else if ( !strcmp( name, "FullScreen" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::Presentation );
+      else if ( !strcmp( name, "Print" ) )
+        popplerLink = new LinkAction( linkArea, LinkAction::Print );
+      else if ( !strcmp( name, "Close" ) )
+      {
+        // acroread closes the document always, doesnt care whether 
+        // its presentation mode or not
+        // popplerLink = new LinkAction( linkArea, LinkAction::EndPresentation );
+        popplerLink = new LinkAction( linkArea, LinkAction::Close );
+      }
+      else
+      {
+        // TODO
+      }
+    }
+    break;
+
+    case actionURI:
+    {
+      popplerLink = new LinkBrowse( linkArea, ((LinkURI *)a)->getURI()->getCString() );
+    }
+    break;
+
+    case actionSound:
+    {
+      ::LinkSound *ls = (::LinkSound *)a;
+      popplerLink = new LinkSound( linkArea, ls->getVolume(), ls->getSynchronous(), ls->getRepeat(), ls->getMix(), new SoundObject( ls->getSound() ) );
+    }
+    break;
+
+    case actionJavaScript:
+    {
+      ::LinkJavaScript *ljs = (::LinkJavaScript *)a;
+      popplerLink = new LinkJavaScript( linkArea, UnicodeParsedString(ljs->getScript()) );
+    }
+    break;
+
+    case actionMovie:
+    {
+      ::LinkMovie *lm = (::LinkMovie *)a;
+
+      const QString title = ( lm->hasAnnotTitle() ? UnicodeParsedString( lm->getAnnotTitle() ) : QString() );
+
+      Ref reference;
+      reference.num = reference.gen = -1;
+      if ( lm->hasAnnotRef() )
+        reference = *lm->getAnnotRef();
+
+      LinkMovie::Operation operation = LinkMovie::Play;
+      switch ( lm->getOperation() )
+      {
+        case ::LinkMovie::operationTypePlay:
+          operation = LinkMovie::Play;
+          break;
+        case ::LinkMovie::operationTypePause:
+          operation = LinkMovie::Pause;
+          break;
+        case ::LinkMovie::operationTypeResume:
+          operation = LinkMovie::Resume;
+          break;
+        case ::LinkMovie::operationTypeStop:
+          operation = LinkMovie::Stop;
+          break;
+      };
+
+      popplerLink = new LinkMovie( linkArea, operation, title, reference );
+    }
+    break;
+
+    case actionRendition:
+    {
+      ::LinkRendition *lrn = (::LinkRendition *)a;
+
+      Ref reference;
+      reference.num = reference.gen = -1;
+      if ( lrn->hasScreenAnnot() )
+        reference = lrn->getScreenAnnot();
+
+      popplerLink = new LinkRendition( linkArea, lrn->getMedia()->copy(), lrn->getOperation(), UnicodeParsedString( lrn->getScript() ), reference );
+    }
+    break;
+
+    case actionUnknown:
+    break;
+  }
+
+  return popplerLink;
+}
+
+TextPage *PageData::prepareTextSearch(const QString &text, Page::SearchMode caseSensitive, Page::Rotation rotate, GBool *sCase, QVector<Unicode> *u)
+{
+  const QChar * str = text.unicode();
+  const int len = text.length();
+  u->resize(len);
+  for (int i = 0; i < len; ++i) (*u)[i] = str[i].unicode();
+
+  if (caseSensitive == Page::CaseSensitive) *sCase = gTrue;
+  else *sCase = gFalse;
+
+  const int rotation = (int)rotate * 90;
+
+  // fetch ourselves a textpage
+  TextOutputDev td(NULL, gTrue, 0, gFalse, gFalse);
+  parentDoc->doc->displayPage( &td, index + 1, 72, 72, rotation, false, true, false,
+    NULL, NULL, NULL, NULL, gTrue);
+  TextPage *textPage=td.takeText();
+  
+  return textPage;
+} 
+
+Page::Page(DocumentData *doc, int index) {
+  m_page = new PageData();
+  m_page->index = index;
+  m_page->parentDoc = doc;
+  m_page->page = doc->doc->getPage(m_page->index + 1);
+  m_page->transition = 0;
+}
+
+Page::~Page()
+{
+  delete m_page->transition;
+  delete m_page;
+}
+
+QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate) const
+{
+  int rotation = (int)rotate * 90;
+  QImage img;
+  switch(m_page->parentDoc->m_backend)
+  {
+    case Poppler::Document::SplashBackend:
+    {
+#if defined(HAVE_SPLASH)
+      SplashColor bgColor;
+      GBool overprint = gFalse;
+#if defined(SPLASH_CMYK)
+      overprint = m_page->parentDoc->m_hints & Document::OverprintPreview ? gTrue : gFalse;
+      if (overprint)
+      {
+        Guchar c, m, y, k;
+
+        c = 255 - m_page->parentDoc->paperColor.blue();
+        m = 255 - m_page->parentDoc->paperColor.red();
+        y = 255 - m_page->parentDoc->paperColor.green();
+        k = c;
+        if (m < k) {
+          k = m;
+        }
+        if (y < k) {
+          k = y;
+        }
+        bgColor[0] = c - k;
+        bgColor[1] = m - k;
+        bgColor[2] = y - k;
+        bgColor[3] = k;
+        for (int i = 4; i < SPOT_NCOMPS + 4; i++) {
+          bgColor[i] = 0;
+        }
+      }
+      else
+#endif
+      {
+        bgColor[0] = m_page->parentDoc->paperColor.blue();
+        bgColor[1] = m_page->parentDoc->paperColor.green();
+        bgColor[2] = m_page->parentDoc->paperColor.red();
+      }
+ 
+      GBool AA = m_page->parentDoc->m_hints & Document::TextAntialiasing ? gTrue : gFalse;
+      SplashThinLineMode thinLineMode = splashThinLineDefault;
+      if (m_page->parentDoc->m_hints & Document::ThinLineShape) thinLineMode = splashThinLineShape;
+      if (m_page->parentDoc->m_hints & Document::ThinLineSolid) thinLineMode = splashThinLineSolid;
+
+      SplashOutputDev * splash_output = new SplashOutputDev(
+#if defined(SPLASH_CMYK)
+                      (overprint) ? splashModeDeviceN8 : splashModeXBGR8,
+#else
+                      splashModeXBGR8,
+#endif 
+                      4, gFalse, bgColor, gTrue, AA, thinLineMode, overprint);
+
+      splash_output->setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? gTrue : gFalse);
+      splash_output->setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? gTrue : gFalse, 
+                                        m_page->parentDoc->m_hints & Document::TextSlightHinting ? gTrue : gFalse);
+
+      splash_output->startDoc(m_page->parentDoc->doc);      
+
+      m_page->parentDoc->doc->displayPageSlice(splash_output, m_page->index + 1, xres, yres,
+                                               rotation, false, true, false, x, y, w, h,
+                                               NULL, NULL, NULL, NULL, gTrue);
+
+      SplashBitmap *bitmap = splash_output->getBitmap();
+      int bw = bitmap->getWidth();
+      int bh = bitmap->getHeight();
+
+      if (bitmap->convertToXBGR())
+      {
+        SplashColorPtr dataPtr = bitmap->getDataPtr();
+
+        if (QSysInfo::BigEndian == QSysInfo::ByteOrder)
+        {
+            uchar c;
+            int count = bw * bh * 4;
+            for (int k = 0; k < count; k += 4)
+            {
+            c = dataPtr[k];
+            dataPtr[k] = dataPtr[k+3];
+            dataPtr[k+3] = c;
+
+            c = dataPtr[k+1];
+            dataPtr[k+1] = dataPtr[k+2];
+            dataPtr[k+2] = c;
+            }
+        }
+
+        // construct a qimage SHARING the raw bitmap data in memory
+        QImage tmpimg( dataPtr, bw, bh, QImage::Format_ARGB32 );
+        img = tmpimg.copy();
+      }
+      delete splash_output;
+#endif
+      break;
+    }
+    case Poppler::Document::ArthurBackend:
+    {
+      QSize size = pageSize();
+      QImage tmpimg(w == -1 ? qRound( size.width() * xres / 72.0 ) : w, h == -1 ? qRound( size.height() * yres / 72.0 ) : h, QImage::Format_ARGB32);
+
+      QPainter painter(&tmpimg);
+      renderToPainter(&painter, xres, yres, x, y, w, h, rotate, DontSaveAndRestore);
+      painter.end();
+      img = tmpimg;
+      break;
+    }
+  }
+
+  return img;
+}
+
+bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, int y, int w, int h, Rotation rotate, PainterFlags flags) const
+{
+  if (!painter)
+    return false;
+
+  switch(m_page->parentDoc->m_backend)
+  {
+    case Poppler::Document::SplashBackend:
+      return false;
+    case Poppler::Document::ArthurBackend:
+    {
+      const bool savePainter = !(flags & DontSaveAndRestore);
+      if (savePainter)
+         painter->save();
+      if (m_page->parentDoc->m_hints & Document::Antialiasing)
+          painter->setRenderHint(QPainter::Antialiasing);
+      if (m_page->parentDoc->m_hints & Document::TextAntialiasing)
+          painter->setRenderHint(QPainter::TextAntialiasing);
+      painter->translate(x == -1 ? 0 : -x, y == -1 ? 0 : -y);
+      ArthurOutputDev arthur_output(painter);
+      arthur_output.startDoc(m_page->parentDoc->doc->getXRef());
+      m_page->parentDoc->doc->displayPageSlice(&arthur_output,
+                                               m_page->index + 1,
+                                               xres,
+                                               yres,
+                                               (int)rotate * 90,
+                                               false,
+                                               true,
+                                               false,
+                                               x,
+                                               y,
+                                               w,
+                                               h);
+      if (savePainter)
+         painter->restore();
+      return true;
+    }
+  }
+  return false;
+}
+
+QImage Page::thumbnail() const
+{
+  unsigned char* data = 0;
+  int w = 0;
+  int h = 0;
+  int rowstride = 0;
+  GBool r = m_page->page->loadThumb(&data, &w, &h, &rowstride);
+  QImage ret;
+  if (r)
+  {
+    // first construct a temporary image with the data got,
+    // then force a copy of it so we can free the raw thumbnail data
+    ret = QImage(data, w, h, rowstride, QImage::Format_RGB888).copy();
+    gfree(data);
+  }
+  return ret;
+}
+
+QString Page::text(const QRectF &r, TextLayout textLayout) const
+{
+  TextOutputDev *output_dev;
+  GooString *s;
+  PDFRectangle *rect;
+  QString result;
+  
+  const GBool rawOrder = textLayout == RawOrderLayout;
+  output_dev = new TextOutputDev(0, gFalse, 0, rawOrder, gFalse);
+  m_page->parentDoc->doc->displayPageSlice(output_dev, m_page->index + 1, 72, 72,
+      0, false, true, false, -1, -1, -1, -1,
+      NULL, NULL, NULL, NULL, gTrue);
+  if (r.isNull())
+  {
+    rect = m_page->page->getCropBox();
+    s = output_dev->getText(rect->x1, rect->y1, rect->x2, rect->y2);
+  }
+  else
+  {
+    s = output_dev->getText(r.left(), r.top(), r.right(), r.bottom());
+  }
+
+  result = QString::fromUtf8(s->getCString());
+
+  delete output_dev;
+  delete s;
+  return result;
+}
+
+QString Page::text(const QRectF &r) const
+{
+  return text(r, PhysicalLayout);
+}
+
+bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchMode caseSensitive, Rotation rotate) const
+{
+  GBool sCase;
+  QVector<Unicode> u;
+  TextPage *textPage = m_page->prepareTextSearch(text, caseSensitive, rotate, &sCase, &u);
+
+  bool found = false;
+  if (direction == FromTop)
+    found = textPage->findText( u.data(), u.size(), 
+            gTrue, gTrue, gFalse, gFalse, sCase, gFalse, gFalse, &sLeft, &sTop, &sRight, &sBottom );
+  else if ( direction == NextResult )
+    found = textPage->findText( u.data(), u.size(), 
+            gFalse, gTrue, gTrue, gFalse, sCase, gFalse, gFalse, &sLeft, &sTop, &sRight, &sBottom );
+  else if ( direction == PreviousResult )
+    found = textPage->findText( u.data(), u.size(), 
+            gFalse, gTrue, gTrue, gFalse, sCase, gTrue, gFalse, &sLeft, &sTop, &sRight, &sBottom );
+
+  textPage->decRefCnt();
+
+  return found;
+}
+
+QList<QRectF> Page::search(const QString &text, SearchMode caseSensitive, Rotation rotate) const
+{
+  GBool sCase;
+  QVector<Unicode> u;
+  TextPage *textPage = m_page->prepareTextSearch(text, caseSensitive, rotate, &sCase, &u);
+
+  QList<QRectF> results;
+  double sLeft = 0.0, sTop = 0.0, sRight = 0.0, sBottom = 0.0;
+  
+  while(textPage->findText( u.data(), u.size(), 
+        gFalse, gTrue, gTrue, gFalse, sCase, gFalse, gFalse, &sLeft, &sTop, &sRight, &sBottom ))
+  {
+      QRectF result;
+      
+      result.setLeft(sLeft);
+      result.setTop(sTop);
+      result.setRight(sRight);
+      result.setBottom(sBottom);
+      
+      results.append(result);
+  }
+  
+  textPage->decRefCnt();
+
+  return results;
+}
+
+QList<TextBox*> Page::textList(Rotation rotate) const
+{
+  TextOutputDev *output_dev;
+  
+  QList<TextBox*> output_list;
+  
+  output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
+  
+  int rotation = (int)rotate * 90;
+
+  m_page->parentDoc->doc->displayPageSlice(output_dev, m_page->index + 1, 72, 72,
+      rotation, false, false, false, -1, -1, -1, -1,
+      NULL, NULL, NULL, NULL, gTrue);
+
+  TextWordList *word_list = output_dev->makeWordList();
+  
+  if (!word_list) {
+    delete output_dev;
+    return output_list;
+  }
+  
+  QHash<TextWord *, TextBox*> wordBoxMap;
+  
+  for (int i = 0; i < word_list->getLength(); i++) {
+    TextWord *word = word_list->get(i);
+    GooString *gooWord = word->getText();
+    QString string = QString::fromUtf8(gooWord->getCString());
+    delete gooWord;
+    double xMin, yMin, xMax, yMax;
+    word->getBBox(&xMin, &yMin, &xMax, &yMax);
+    
+    TextBox* text_box = new TextBox(string, QRectF(xMin, yMin, xMax-xMin, yMax-yMin));
+    text_box->m_data->hasSpaceAfter = word->hasSpaceAfter() == gTrue;
+    text_box->m_data->charBBoxes.reserve(word->getLength());
+    for (int j = 0; j < word->getLength(); ++j)
+    {
+        word->getCharBBox(j, &xMin, &yMin, &xMax, &yMax);
+        text_box->m_data->charBBoxes.append(QRectF(xMin, yMin, xMax-xMin, yMax-yMin));
+    }
+    
+    wordBoxMap.insert(word, text_box);
+    
+    output_list.append(text_box);
+  }
+  
+  for (int i = 0; i < word_list->getLength(); i++) {
+    TextWord *word = word_list->get(i);
+    TextBox* text_box = wordBoxMap.value(word);
+    text_box->m_data->nextWord = wordBoxMap.value(word->nextWord());
+  }
+  
+  delete word_list;
+  delete output_dev;
+  
+  return output_list;
+}
+
+PageTransition *Page::transition() const
+{
+  if (!m_page->transition) {
+    Object o;
+    PageTransitionParams params;
+    params.dictObj = m_page->page->getTrans(&o);
+    if (params.dictObj->isDict()) m_page->transition = new PageTransition(params);
+    o.free();
+  }
+  return m_page->transition;
+}
+
+Link *Page::action( PageAction act ) const
+{
+  if ( act == Page::Opening || act == Page::Closing )
+  {
+    Object o;
+    m_page->page->getActions(&o);
+    if (!o.isDict())
+    {
+      o.free();
+      return 0;
+    }
+    Dict *dict = o.getDict();
+    Object o2;
+    const char *key = act == Page::Opening ? "O" : "C";
+    dict->lookup((char*)key, &o2);
+    ::LinkAction *lact = ::LinkAction::parseAction(&o2, m_page->parentDoc->doc->getCatalog()->getBaseURI() );
+    o2.free();
+    o.free();
+    Link *popplerLink = NULL;
+    if (lact != NULL)
+    {
+      popplerLink = m_page->convertLinkActionToLink(lact, QRectF());
+      delete lact;
+    }
+    return popplerLink;
+  }
+  return 0;
+}
+
+QSizeF Page::pageSizeF() const
+{
+  Page::Orientation orient = orientation();
+  if ( ( Page::Landscape == orient ) || (Page::Seascape == orient ) ) {
+      return QSizeF( m_page->page->getCropHeight(), m_page->page->getCropWidth() );
+  } else {
+    return QSizeF( m_page->page->getCropWidth(), m_page->page->getCropHeight() );
+  }
+}
+
+QSize Page::pageSize() const
+{
+  return pageSizeF().toSize();
+}
+
+Page::Orientation Page::orientation() const
+{
+  const int rotation = m_page->page->getRotate();
+  switch (rotation) {
+  case 90:
+    return Page::Landscape;
+    break;
+  case 180:
+    return Page::UpsideDown;
+    break;
+  case 270:
+    return Page::Seascape;
+    break;
+  default:
+    return Page::Portrait;
+  }
+}
+
+void Page::defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool upsideDown)
+{
+  m_page->page->getDefaultCTM(CTM, dpiX, dpiY, rotate, gFalse, upsideDown);
+}
+
+QList<Link*> Page::links() const
+{
+  LinkExtractorOutputDev link_dev(m_page);
+  m_page->parentDoc->doc->processLinks(&link_dev, m_page->index + 1);
+  QList<Link*> popplerLinks = link_dev.links();
+
+  return popplerLinks;
+}
+
+QList<Annotation*> Page::annotations() const
+{
+  return AnnotationPrivate::findAnnotations(m_page->page, m_page->parentDoc);
+}
+
+void Page::addAnnotation( const Annotation *ann )
+{
+  AnnotationPrivate::addAnnotationToPage(m_page->page, m_page->parentDoc, ann);
+}
+
+void Page::removeAnnotation( const Annotation *ann )
+{
+  AnnotationPrivate::removeAnnotationFromPage(m_page->page, ann);
+}
+
+QList<FormField*> Page::formFields() const
+{
+  QList<FormField*> fields;
+  ::Page *p = m_page->page;
+  ::FormPageWidgets * form = p->getFormWidgets();
+  int formcount = form->getNumWidgets();
+  for (int i = 0; i < formcount; ++i)
+  {
+    ::FormWidget *fm = form->getWidget(i);
+    FormField * ff = NULL;
+    switch (fm->getType())
+    {
+      case formButton:
+      {
+        ff = new FormFieldButton(m_page->parentDoc, p, static_cast<FormWidgetButton*>(fm));
+      }
+      break;
+
+      case formText:
+      {
+        ff = new FormFieldText(m_page->parentDoc, p, static_cast<FormWidgetText*>(fm));
+      }
+      break;
+
+      case formChoice:
+      {
+        ff = new FormFieldChoice(m_page->parentDoc, p, static_cast<FormWidgetChoice*>(fm));
+      }
+      break;
+
+      default: ;
+    }
+
+    if (ff)
+      fields.append(ff);
+  }
+
+  delete form;
+
+  return fields;
+}
+
+double Page::duration() const
+{
+  return m_page->page->getDuration();
+}
+
+QString Page::label() const
+{
+  GooString goo;
+  if (!m_page->parentDoc->doc->getCatalog()->indexToLabel(m_page->index, &goo))
+    return QString();
+
+  return UnicodeParsedString(&goo);
+}
+
+
+}
diff --git a/qt5/src/poppler-pdf-converter.cc b/qt5/src/poppler-pdf-converter.cc
new file mode 100644
index 00000000..557a9f8d
--- /dev/null
+++ b/qt5/src/poppler-pdf-converter.cc
@@ -0,0 +1,115 @@
+/* poppler-pdf-converter.cc: qt interface to poppler
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, 2009, Albert Astals Cid <aacid@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include "poppler-private.h"
+#include "poppler-converter-private.h"
+#include "poppler-qiodeviceoutstream-private.h"
+
+#include <QtCore/QFile>
+
+#include <ErrorCodes.h>
+
+namespace Poppler {
+
+class PDFConverterPrivate : public BaseConverterPrivate
+{
+	public:
+		PDFConverterPrivate();
+
+		PDFConverter::PDFOptions opts;
+};
+
+PDFConverterPrivate::PDFConverterPrivate()
+	: BaseConverterPrivate(), opts(0)
+{
+}
+
+
+PDFConverter::PDFConverter(DocumentData *document)
+	: BaseConverter(*new PDFConverterPrivate())
+{
+	Q_D(PDFConverter);
+	d->document = document;
+}
+
+PDFConverter::~PDFConverter()
+{
+}
+
+void PDFConverter::setPDFOptions(PDFConverter::PDFOptions options)
+{
+	Q_D(PDFConverter);
+	d->opts = options;
+}
+
+PDFConverter::PDFOptions PDFConverter::pdfOptions() const
+{
+	Q_D(const PDFConverter);
+	return d->opts;
+}
+
+bool PDFConverter::convert()
+{
+	Q_D(PDFConverter);
+	d->lastError = NoError;
+
+	if (d->document->locked)
+	{
+		d->lastError = FileLockedError;
+		return false;
+	}
+
+	QIODevice *dev = d->openDevice();
+	if (!dev)
+	{
+		d->lastError = OpenOutputError;
+		return false;
+	}
+
+	bool deleteFile = false;
+	if (QFile *file = qobject_cast<QFile*>(dev))
+		deleteFile = !file->exists();
+
+	int errorCode = errNone;
+	QIODeviceOutStream stream(dev);
+	if (d->opts & WithChanges)
+	{
+		errorCode = d->document->doc->saveAs(&stream);
+	}
+	else
+	{
+		errorCode = d->document->doc->saveWithoutChangesAs(&stream);
+	}
+	d->closeDevice();
+	if (errorCode != errNone)
+	{
+		if (deleteFile)
+		{
+			qobject_cast<QFile*>(dev)->remove();
+		}
+		if (errorCode == errOpenFile) d->lastError = OpenOutputError;
+		else d->lastError = NotSupportedInputFileError;
+	}
+
+	return (errorCode == errNone);
+}
+
+}
diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc
new file mode 100644
index 00000000..1e47c6d8
--- /dev/null
+++ b/qt5/src/poppler-private.cc
@@ -0,0 +1,292 @@
+/* poppler-private.cc: qt interface to poppler
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2006, 2011 by Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, 2010, 2011 by Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 by Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+ * Inspired on code by
+ * Copyright (C) 2004 by Albert Astals Cid <tsdgeos@terra.es>
+ * Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-private.h"
+
+#include <QtCore/QByteArray>
+#include <QtCore/QDebug>
+#include <QtCore/QVariant>
+
+#include <Link.h>
+#include <Outline.h>
+#include <UnicodeMap.h>
+
+namespace Poppler {
+
+namespace Debug {
+
+    void qDebugDebugFunction(const QString &message, const QVariant & /*closure*/)
+    {
+        qDebug() << message;
+    }
+
+    PopplerDebugFunc debugFunction = qDebugDebugFunction;
+    QVariant debugClosure;
+
+}
+
+    static UnicodeMap *utf8Map = 0;
+
+    void setDebugErrorFunction(PopplerDebugFunc function, const QVariant &closure)
+    {
+        Debug::debugFunction = function ? function : Debug::qDebugDebugFunction;
+        Debug::debugClosure = closure;
+    }
+
+    void qt5ErrorFunction(void * /*data*/, ErrorCategory /*category*/, Goffset pos, char *msg)
+    {
+        QString emsg;
+
+        if (pos >= 0)
+        {
+            emsg = QString::fromLatin1("Error (%1): ").arg(pos);
+        }
+        else
+        {
+            emsg = QString::fromLatin1("Error: ");
+        }
+        emsg += QString::fromLatin1(msg);
+        (*Debug::debugFunction)(emsg, Debug::debugClosure);
+    }
+
+    QString unicodeToQString(Unicode* u, int len) {
+        if (!utf8Map)
+        {
+                GooString enc("UTF-8");
+                utf8Map = globalParams->getUnicodeMap(&enc);
+                utf8Map->incRefCnt();
+        }
+
+        // ignore the last character if it is 0x0
+        if ((len > 0) && (u[len - 1] == 0))
+        {
+            --len;
+        }
+
+        GooString convertedStr;
+        for (int i = 0; i < len; ++i)
+        {
+            char buf[8];
+            const int n = utf8Map->mapUnicode(u[i], buf, sizeof(buf));
+            convertedStr.append(buf, n);
+        }
+
+        return QString::fromUtf8(convertedStr.getCString(), convertedStr.getLength());
+    }
+
+    QString UnicodeParsedString(GooString *s1) {
+        if ( !s1 || s1->getLength() == 0 )
+            return QString();
+
+        GBool isUnicode;
+        int i;
+        Unicode u;
+        QString result;
+        if ( ( s1->getChar(0) & 0xff ) == 0xfe && ( s1->getLength() > 1 && ( s1->getChar(1) & 0xff ) == 0xff ) )
+        {
+            isUnicode = gTrue;
+            i = 2;
+            result.reserve( ( s1->getLength() - 2 ) / 2 );
+        }
+        else
+        {
+            isUnicode = gFalse;
+            i = 0;
+            result.reserve( s1->getLength() );
+        }
+        while ( i < s1->getLength() )
+        {
+            if ( isUnicode )
+            {
+                u = ( ( s1->getChar(i) & 0xff ) << 8 ) | ( s1->getChar(i+1) & 0xff );
+                i += 2;
+            }
+            else
+            {
+                u = s1->getChar(i) & 0xff;
+                ++i;
+            }
+            result += QChar( u );
+        }
+        return result;
+    }
+
+    GooString *QStringToUnicodeGooString(const QString &s) {
+        int len = s.length() * 2 + 2;
+        char *cstring = (char *)gmallocn(len, sizeof(char));
+        cstring[0] = 0xfe;
+        cstring[1] = 0xff;
+        for (int i = 0; i < s.length(); ++i)
+        {
+            cstring[2+i*2] = s.at(i).row();
+            cstring[3+i*2] = s.at(i).cell();
+        }
+        GooString *ret = new GooString(cstring, len);
+        gfree(cstring);
+        return ret;
+    }
+
+    GooString *QStringToGooString(const QString &s) {
+        int len = s.length();
+        char *cstring = (char *)gmallocn(s.length(), sizeof(char));
+        for (int i = 0; i < len; ++i)
+            cstring[i] = s.at(i).unicode();
+        GooString *ret = new GooString(cstring, len);
+        gfree(cstring);
+        return ret;
+    }
+
+    void linkActionToTocItem( ::LinkAction * a, DocumentData * doc, QDomElement * e )
+    {
+        if ( !a || !e )
+            return;
+
+        switch ( a->getKind() )
+        {
+            case actionGoTo:
+            {
+                // page number is contained/referenced in a LinkGoTo
+                LinkGoTo * g = static_cast< LinkGoTo * >( a );
+                LinkDest * destination = g->getDest();
+                if ( !destination && g->getNamedDest() )
+                {
+                    // no 'destination' but an internal 'named reference'. we could
+                    // get the destination for the page now, but it's VERY time consuming,
+                    // so better storing the reference and provide the viewport on demand
+                    GooString *s = g->getNamedDest();
+                    QChar *charArray = new QChar[s->getLength()];
+                    for (int i = 0; i < s->getLength(); ++i) charArray[i] = QChar(s->getCString()[i]);
+                    QString aux(charArray, s->getLength());
+                    e->setAttribute( "DestinationName", aux );
+                    delete[] charArray;
+                }
+                else if ( destination && destination->isOk() )
+                {
+                    LinkDestinationData ldd(destination, NULL, doc, false);
+                    e->setAttribute( "Destination", LinkDestination(ldd).toString() );
+                }
+                break;
+            }
+            case actionGoToR:
+            {
+                // page number is contained/referenced in a LinkGoToR
+                LinkGoToR * g = static_cast< LinkGoToR * >( a );
+                LinkDest * destination = g->getDest();
+                if ( !destination && g->getNamedDest() )
+                {
+                    // no 'destination' but an internal 'named reference'. we could
+                    // get the destination for the page now, but it's VERY time consuming,
+                    // so better storing the reference and provide the viewport on demand
+                    GooString *s = g->getNamedDest();
+                    QChar *charArray = new QChar[s->getLength()];
+                    for (int i = 0; i < s->getLength(); ++i) charArray[i] = QChar(s->getCString()[i]);
+                    QString aux(charArray, s->getLength());
+                    e->setAttribute( "DestinationName", aux );
+                    delete[] charArray;
+                }
+                else if ( destination && destination->isOk() )
+                {
+                    LinkDestinationData ldd(destination, NULL, doc, g->getFileName() != 0);
+                    e->setAttribute( "Destination", LinkDestination(ldd).toString() );
+                }
+                e->setAttribute( "ExternalFileName", g->getFileName()->getCString() );
+                break;
+            }
+            case actionURI:
+            {
+                LinkURI * u = static_cast< LinkURI * >( a );
+                e->setAttribute( "DestinationURI", u->getURI()->getCString() );
+            }
+            default: ;
+        }
+    }
+    
+    DocumentData::~DocumentData()
+    {
+        qDeleteAll(m_embeddedFiles);
+        delete (OptContentModel *)m_optContentModel;
+        delete doc;
+        delete m_fontInfoIterator;
+    
+        count --;
+        if ( count == 0 )
+        {
+            utf8Map = 0;
+            delete globalParams;
+        }
+      }
+    
+    void DocumentData::init()
+    {
+        m_fontInfoIterator = 0;
+        m_backend = Document::SplashBackend;
+        paperColor = Qt::white;
+        m_hints = 0;
+        m_optContentModel = 0;
+      
+        if ( count == 0 )
+        {
+            utf8Map = 0;
+            globalParams = new GlobalParams();
+            setErrorCallback(qt5ErrorFunction, NULL);
+        }
+        count ++;
+    }
+
+
+    void DocumentData::addTocChildren( QDomDocument * docSyn, QDomNode * parent, GooList * items )
+    {
+        int numItems = items->getLength();
+        for ( int i = 0; i < numItems; ++i )
+        {
+            // iterate over every object in 'items'
+            OutlineItem * outlineItem = (OutlineItem *)items->get( i );
+
+            // 1. create element using outlineItem's title as tagName
+            QString name;
+            Unicode * uniChar = outlineItem->getTitle();
+            int titleLength = outlineItem->getTitleLength();
+            name = unicodeToQString(uniChar, titleLength);
+            if ( name.isEmpty() )
+                continue;
+
+            QDomElement item = docSyn->createElement( name );
+            parent->appendChild( item );
+
+            // 2. find the page the link refers to
+            ::LinkAction * a = outlineItem->getAction();
+            linkActionToTocItem( a, this, &item );
+
+            item.setAttribute( "Open", QVariant( (bool)outlineItem->isOpen() ).toString() );
+
+            // 3. recursively descend over children
+            outlineItem->open();
+            GooList * children = outlineItem->getKids();
+            if ( children )
+                addTocChildren( docSyn, &item, children );
+        }
+    }
+
+}
diff --git a/qt5/src/poppler-private.h b/qt5/src/poppler-private.h
new file mode 100644
index 00000000..0a132f07
--- /dev/null
+++ b/qt5/src/poppler-private.h
@@ -0,0 +1,240 @@
+/* poppler-private.h: qt interface to poppler
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005, 2008, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2006-2009, 2011, 2012 by Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2007-2009, 2011 by Pino Toscano <pino@kde.org>
+ * Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+ * Copyright (C) 2011 Hib Eris <hib@hiberis.nl>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2013 Anthony Granger <grangeranthony@gmail.com>
+ * Inspired on code by
+ * Copyright (C) 2004 by Albert Astals Cid <tsdgeos@terra.es>
+ * Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _POPPLER_PRIVATE_H_
+#define _POPPLER_PRIVATE_H_
+
+#include <QtCore/QFile>
+#include <QtCore/QPointer>
+#include <QtCore/QVector>
+
+#include <config.h>
+#include <GfxState.h>
+#include <GlobalParams.h>
+#include <PDFDoc.h>
+#include <FontInfo.h>
+#include <OutputDev.h>
+#include <Error.h>
+#if defined(HAVE_SPLASH)
+#include <SplashOutputDev.h>
+#endif
+
+#include "poppler-qt5.h"
+#include "poppler-embeddedfile-private.h"
+
+class LinkDest;
+class FormWidget;
+
+namespace Poppler {
+
+    /* borrowed from kpdf */
+    QString unicodeToQString(Unicode* u, int len);
+
+    QString UnicodeParsedString(GooString *s1);
+
+    GooString *QStringToUnicodeGooString(const QString &s);
+
+    GooString *QStringToGooString(const QString &s);
+
+    void qt5ErrorFunction(int pos, char *msg, va_list args);
+
+    class LinkDestinationData
+    {
+        public:
+            LinkDestinationData( LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc, bool external )
+             : ld(l), namedDest(nd), doc(pdfdoc), externalDest(external)
+            {
+            }
+
+            LinkDest *ld;
+            GooString *namedDest;
+            Poppler::DocumentData *doc;
+            bool externalDest;
+    };
+
+    class DocumentData {
+    public:
+	DocumentData(const QString &filePath, GooString *ownerPassword, GooString *userPassword)
+	    {
+		init();
+		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;
+	    }
+	
+	DocumentData(const QByteArray &data, GooString *ownerPassword, GooString *userPassword)
+	    {
+		Object obj;
+		fileContents = data;
+		obj.initNull();
+		MemStream *str = new MemStream((char*)fileContents.data(), 0, fileContents.length(), &obj);
+		init();
+		doc = new PDFDoc(str, ownerPassword, userPassword);
+		delete ownerPassword;
+		delete userPassword;
+	    }
+	
+	void init();
+	
+	~DocumentData();
+	
+	void addTocChildren( QDomDocument * docSyn, QDomNode * parent, GooList * items );
+	
+	void setPaperColor(const QColor &color)
+	{
+		paperColor = color;
+	}
+	
+	void fillMembers()
+	{
+		m_fontInfoIterator = new FontIterator(0, this);
+		int numEmb = doc->getCatalog()->numEmbeddedFiles();
+		if (!(0 == numEmb)) {
+			// we have some embedded documents, build the list
+			for (int yalv = 0; yalv < numEmb; ++yalv) {
+				FileSpec *fs = doc->getCatalog()->embeddedFile(yalv);
+				m_embeddedFiles.append(new EmbeddedFile(*new EmbeddedFileData(fs)));
+			}
+		}
+	}
+	
+	static Document *checkDocument(DocumentData *doc);
+
+	PDFDoc *doc;
+	QString m_filePath;
+	QByteArray fileContents;
+	bool locked;
+	FontIterator *m_fontInfoIterator;
+	Document::RenderBackend m_backend;
+	QList<EmbeddedFile*> m_embeddedFiles;
+	QPointer<OptContentModel> m_optContentModel;
+	QColor paperColor;
+	int m_hints;
+	static int count;
+    };
+
+    class FontInfoData
+    {
+	public:
+		FontInfoData()
+		{
+			isEmbedded = false;
+			isSubset = false;
+			type = FontInfo::unknown;
+		}
+		
+		FontInfoData( const FontInfoData &fid )
+		{
+			fontName = fid.fontName;
+			fontFile = fid.fontFile;
+			isEmbedded = fid.isEmbedded;
+			isSubset = fid.isSubset;
+			type = fid.type;
+			embRef = fid.embRef;
+		}
+		
+		FontInfoData( ::FontInfo* fi )
+		{
+			if (fi->getName()) fontName = fi->getName()->getCString();
+			if (fi->getFile()) fontFile = fi->getFile()->getCString();
+			isEmbedded = fi->getEmbedded();
+			isSubset = fi->getSubset();
+			type = (Poppler::FontInfo::Type)fi->getType();
+			embRef = fi->getEmbRef();
+		}
+
+		QString fontName;
+		QString fontFile;
+		bool isEmbedded : 1;
+		bool isSubset : 1;
+		FontInfo::Type type;
+		Ref embRef;
+    };
+
+    class FontIteratorData
+    {
+	public:
+		FontIteratorData( int startPage, DocumentData *dd )
+		  : fontInfoScanner( dd->doc, startPage )
+		  , totalPages( dd->doc->getNumPages() )
+		  , currentPage( qMax( startPage, 0 ) - 1 )
+		{
+		}
+
+		~FontIteratorData()
+		{
+		}
+
+		FontInfoScanner fontInfoScanner;
+		int totalPages;
+		int currentPage;
+    };
+
+    class TextBoxData
+    {
+	public:
+		TextBoxData()
+		  : nextWord(0), hasSpaceAfter(false)
+		{
+		}
+
+		QString text;
+		QRectF bBox;
+		TextBox *nextWord;
+		QVector<QRectF> charBBoxes; // the boundingRect of each character
+		bool hasSpaceAfter;
+    };
+
+    class FormFieldData
+    {
+	public:
+		FormFieldData(DocumentData *_doc, ::Page *p, ::FormWidget *w) :
+		doc(_doc), page(p), fm(w)
+		{
+		}
+
+		DocumentData *doc;
+		::Page *page;
+		::FormWidget *fm;
+		QRectF box;
+    };
+
+}
+
+#endif
diff --git a/qt5/src/poppler-ps-converter.cc b/qt5/src/poppler-ps-converter.cc
new file mode 100644
index 00000000..30f53fae
--- /dev/null
+++ b/qt5/src/poppler-ps-converter.cc
@@ -0,0 +1,273 @@
+/* poppler-ps-converter.cc: qt interface to poppler
+ * Copyright (C) 2007, 2009, 2010, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
+ * Copyright (C) 2011 Glad Deschrijver <glad.deschrijver@gmail.com>
+ * Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include "poppler-private.h"
+#include "poppler-converter-private.h"
+
+#include "PSOutputDev.h"
+
+static void outputToQIODevice(void *stream, const char *data, int len)
+{
+	static_cast<QIODevice*>(stream)->write(data, len);
+}
+
+namespace Poppler {
+
+class PSConverterPrivate : public BaseConverterPrivate
+{
+	public:
+		PSConverterPrivate();
+
+		QList<int> pageList;
+		QString title;
+		double hDPI;
+		double vDPI;
+		int rotate;
+		int paperWidth;
+		int paperHeight;
+		int marginRight;
+		int marginBottom;
+		int marginLeft;
+		int marginTop;
+		PSConverter::PSOptions opts;
+		void (* pageConvertedCallback)(int page, void *payload);
+		void *pageConvertedPayload;
+};
+
+PSConverterPrivate::PSConverterPrivate()
+	: BaseConverterPrivate(),
+	hDPI(72), vDPI(72), rotate(0), paperWidth(-1), paperHeight(-1),
+	marginRight(0), marginBottom(0), marginLeft(0), marginTop(0),
+	opts(PSConverter::Printing), pageConvertedCallback(0),
+	pageConvertedPayload(0)
+{
+}
+
+
+PSConverter::PSConverter(DocumentData *document)
+	: BaseConverter(*new PSConverterPrivate())
+{
+	Q_D(PSConverter);
+	d->document = document;
+}
+
+PSConverter::~PSConverter()
+{
+}
+
+void PSConverter::setPageList(const QList<int> &pageList)
+{
+	Q_D(PSConverter);
+	d->pageList = pageList;
+}
+
+void PSConverter::setTitle(const QString &title)
+{
+	Q_D(PSConverter);
+	d->title = title;
+}
+
+void PSConverter::setHDPI(double hDPI)
+{
+	Q_D(PSConverter);
+	d->hDPI = hDPI;
+}
+
+void PSConverter::setVDPI(double vDPI)
+{
+	Q_D(PSConverter);
+	d->vDPI = vDPI;
+}
+
+void PSConverter::setRotate(int rotate)
+{
+	Q_D(PSConverter);
+	d->rotate = rotate;
+}
+
+void PSConverter::setPaperWidth(int paperWidth)
+{
+	Q_D(PSConverter);
+	d->paperWidth = paperWidth;
+}
+
+void PSConverter::setPaperHeight(int paperHeight)
+{
+	Q_D(PSConverter);
+	d->paperHeight = paperHeight;
+}
+
+void PSConverter::setRightMargin(int marginRight)
+{
+	Q_D(PSConverter);
+	d->marginRight = marginRight;
+}
+
+void PSConverter::setBottomMargin(int marginBottom)
+{
+	Q_D(PSConverter);
+	d->marginBottom = marginBottom;
+}
+
+void PSConverter::setLeftMargin(int marginLeft)
+{
+	Q_D(PSConverter);
+	d->marginLeft = marginLeft;
+}
+
+void PSConverter::setTopMargin(int marginTop)
+{
+	Q_D(PSConverter);
+	d->marginTop = marginTop;
+}
+
+void PSConverter::setStrictMargins(bool strictMargins)
+{
+	Q_D(PSConverter);
+	if (strictMargins)
+		d->opts |= StrictMargins;
+	else
+		d->opts &= ~StrictMargins;
+}
+
+void PSConverter::setForceRasterize(bool forceRasterize)
+{
+	Q_D(PSConverter);
+	if (forceRasterize)
+		d->opts |= ForceRasterization;
+	else
+		d->opts &= ~ForceRasterization;
+}
+
+void PSConverter::setPSOptions(PSConverter::PSOptions options)
+{
+	Q_D(PSConverter);
+	d->opts = options;
+}
+
+PSConverter::PSOptions PSConverter::psOptions() const
+{
+	Q_D(const PSConverter);
+	return d->opts;
+}
+
+void PSConverter::setPageConvertedCallback(void (* callback)(int page, void *payload), void *payload)
+{
+	Q_D(PSConverter);
+	d->pageConvertedCallback = callback;
+	d->pageConvertedPayload = payload;
+}
+
+static GBool annotDisplayDecideCbk(Annot *annot, void *user_data)
+{
+	if (annot->getType() == Annot::typeWidget)
+		return gTrue; // Never hide forms
+	else
+		return *(GBool*)user_data;
+}
+
+bool PSConverter::convert()
+{
+	Q_D(PSConverter);
+	d->lastError = NoError;
+
+	Q_ASSERT(!d->pageList.isEmpty());
+	Q_ASSERT(d->paperWidth != -1);
+	Q_ASSERT(d->paperHeight != -1);
+	
+	if (d->document->locked)
+	{
+		d->lastError = FileLockedError;
+		return false;
+	}
+	
+	QIODevice *dev = d->openDevice();
+	if (!dev)
+	{
+		d->lastError = OpenOutputError;
+		return false;
+	}
+
+	QByteArray pstitle8Bit = d->title.toLocal8Bit();
+	char* pstitlechar;
+	if (!d->title.isEmpty()) pstitlechar = pstitle8Bit.data();
+	else pstitlechar = 0;
+	
+	PSOutputDev *psOut = new PSOutputDev(outputToQIODevice, dev,
+	                                     pstitlechar,
+	                                     d->document->doc,
+	                                     1,
+	                                     d->document->doc->getNumPages(),
+	                                     (d->opts & PrintToEPS) ? psModeEPS : psModePS,
+	                                     d->paperWidth,
+	                                     d->paperHeight,
+	                                     gFalse,
+	                                     d->marginLeft,
+	                                     d->marginBottom,
+	                                     d->paperWidth - d->marginRight,
+	                                     d->paperHeight - d->marginTop,
+	                                     (d->opts & ForceRasterization));
+	
+	if (d->opts & StrictMargins)
+	{
+		double xScale = ((double)d->paperWidth - (double)d->marginLeft - (double)d->marginRight) / (double)d->paperWidth;
+		double yScale = ((double)d->paperHeight - (double)d->marginBottom - (double)d->marginTop) / (double)d->paperHeight;
+		psOut->setScale(xScale, yScale);
+	}
+	
+	if (psOut->isOk())
+	{
+		GBool isPrinting = (d->opts & Printing) ? gTrue : gFalse;
+		GBool showAnnotations = (d->opts & HideAnnotations) ? gFalse : gTrue;
+		foreach(int page, d->pageList)
+		{
+			d->document->doc->displayPage(psOut,
+			                              page,
+			                              d->hDPI,
+			                              d->vDPI,
+			                              d->rotate,
+			                              gFalse,
+			                              gTrue,
+			                              isPrinting,
+			                              NULL,
+			                              NULL,
+			                              annotDisplayDecideCbk,
+			                              &showAnnotations, gTrue);
+			if (d->pageConvertedCallback)
+				(*d->pageConvertedCallback)(page, d->pageConvertedPayload);
+		}
+		delete psOut;
+		d->closeDevice();
+		return true;
+	}
+	else
+	{
+		delete psOut;
+		d->closeDevice();
+		return false;
+	}
+}
+
+}
diff --git a/qt5/src/poppler-qiodeviceoutstream-private.h b/qt5/src/poppler-qiodeviceoutstream-private.h
new file mode 100644
index 00000000..af0d46b1
--- /dev/null
+++ b/qt5/src/poppler-qiodeviceoutstream-private.h
@@ -0,0 +1,47 @@
+/* poppler-qiodevicestream-private.h: Qt5 interface to poppler
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef POPPLER_QIODEVICESTREAM_PRIVATE_H
+#define POPPLER_QIODEVICESTREAM_PRIVATE_H
+
+#include "Object.h"
+#include "Stream.h"
+
+class QIODevice;
+
+namespace Poppler {
+
+class QIODeviceOutStream : public OutStream
+{
+  public:
+    QIODeviceOutStream(QIODevice* device);
+    virtual ~QIODeviceOutStream();
+
+    virtual void close();
+    virtual Goffset getPos();
+    virtual void put(char c);
+    virtual void printf(const char *format, ...);
+
+  private:
+    QIODevice *m_device;
+};
+
+}
+
+#endif
diff --git a/qt5/src/poppler-qiodeviceoutstream.cc b/qt5/src/poppler-qiodeviceoutstream.cc
new file mode 100644
index 00000000..e91ceba1
--- /dev/null
+++ b/qt5/src/poppler-qiodeviceoutstream.cc
@@ -0,0 +1,64 @@
+/* poppler-qiodevicestream.cc: Qt5 interface to poppler
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qiodeviceoutstream-private.h"
+
+#include <QtCore/QIODevice>
+
+#include <stdio.h>
+
+#define QIODeviceOutStreamBufSize 8192
+
+namespace Poppler {
+
+QIODeviceOutStream::QIODeviceOutStream(QIODevice* device)
+  : m_device(device)
+{
+}
+
+QIODeviceOutStream::~QIODeviceOutStream()
+{
+}
+
+void QIODeviceOutStream::close()
+{
+}
+
+Goffset QIODeviceOutStream::getPos()
+{
+  return m_device->pos();
+}
+
+void QIODeviceOutStream::put(char c)
+{
+  m_device->putChar(c);
+}
+
+void QIODeviceOutStream::printf(const char *format, ...)
+{
+  va_list ap;
+  va_start(ap, format);
+  char buf[QIODeviceOutStreamBufSize];
+  size_t bufsize = 0;
+  bufsize = qvsnprintf(buf, QIODeviceOutStreamBufSize - 1, format, ap);
+  va_end(ap);
+  m_device->write(buf, bufsize);
+}
+
+}
diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
new file mode 100644
index 00000000..0eb0b44a
--- /dev/null
+++ b/qt5/src/poppler-qt5.h
@@ -0,0 +1,1771 @@
+/* poppler-qt.h: qt interface to poppler
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005, 2007, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2005-2013, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus@math.uni-koeln.de>
+ * Copyright (C) 2006-2011, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2009 Shawn Rutledge <shawn.t.rutledge@gmail.com>
+ * Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ * Copyright (C) 2010 Matthias Fauconneau <matthias.fauconneau@gmail.com>
+ * Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
+ * Copyright (C) 2011 Glad Deschrijver <glad.deschrijver@gmail.com>
+ * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
+ * Copyright (C) 2012, Fabio D'Urso <fabiodurso@hotmail.it>
+ * Copyright (C) 2012, Tobias Koenig <tobias.koenig@kdab.com>
+ * Copyright (C) 2012 Adam Reichold <adamreichold@myopera.com>
+ * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+ * Copyright (C) 2013 Anthony Granger <grangeranthony@gmail.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __POPPLER_QT_H__
+#define __POPPLER_QT_H__
+
+#include "poppler-annotation.h"
+#include "poppler-link.h"
+#include "poppler-optcontent.h"
+#include "poppler-page-transition.h"
+
+#include <QtCore/QByteArray>
+#include <QtCore/QDateTime>
+#include <QtCore/QSet>
+#include <QtXml/QDomDocument>
+#include "poppler-export.h"
+
+class EmbFile;
+class Sound;
+class AnnotMovie;
+
+/**
+   The %Poppler Qt5 binding.
+*/
+namespace Poppler {
+
+    class Document;
+    class DocumentData;
+
+    class PageData;
+
+    class FormField;
+
+    class TextBoxData;
+
+    class PDFConverter;
+    class PSConverter;
+
+    /**
+	Debug/error function.
+
+	This function type is used for debugging & error output;
+	the first parameter is the actual message, the second is the unaltered
+	closure argument which was passed to the setDebugErrorFunction call.
+
+	\since 0.16
+    */
+    typedef void (*PopplerDebugFunc)(const QString & /*message*/, const QVariant & /*closure*/);
+
+    /**
+	Set a new debug/error output function.
+
+	If not set, by default error and debug messages will be sent to the
+	Qt \p qDebug() function.
+
+	\param debugFunction the new debug function
+	\param closure user data which will be passes as-is to the debug function
+
+	\since 0.16
+    */
+    POPPLER_QT5_EXPORT void setDebugErrorFunction(PopplerDebugFunc debugFunction, const QVariant &closure);
+
+    /**
+        Describes the physical location of text on a document page
+       
+        This very simple class describes the physical location of text
+	on the page. It consists of
+	- a QString that contains the text
+	- a QRectF that gives a box that describes where on the page
+	the text is found.
+    */
+    class POPPLER_QT5_EXPORT TextBox {
+    friend class Page;
+    public:
+      /**
+	 The default constructor sets the \p text and the rectangle that
+	 contains the text. Coordinates for the \p bBox are in points =
+	 1/72 of an inch.
+      */
+      TextBox(const QString& text, const QRectF &bBox);
+      /**
+	Destructor.
+      */
+      ~TextBox();
+
+      /**
+	  Returns the text of this text box
+      */
+      QString text() const;
+
+      /**
+	  Returns the position of the text, in point, i.e., 1/72 of
+	 an inch
+
+	 \since 0.8
+      */
+      QRectF boundingBox() const;
+
+      /**
+	  Returns the pointer to the next text box, if there is one.
+
+	  Otherwise, it returns a null pointer.
+      */
+      TextBox *nextWord() const;
+
+      /**
+	  Returns the bounding box of the \p i -th characted of the word.
+      */
+      QRectF charBoundingBox(int i) const;
+
+      /**
+	  Returns whether there is a space character after this text box
+      */
+      bool hasSpaceAfter() const;
+
+    private:
+        Q_DISABLE_COPY(TextBox)
+
+	TextBoxData *m_data;
+    };
+
+
+    class FontInfoData;
+    /**
+       Container class for information about a font within a PDF
+       document
+    */
+    class POPPLER_QT5_EXPORT FontInfo {
+    friend class Document;
+    public:
+	/**
+	   The type of font.
+	*/
+	enum Type {
+		unknown,
+		Type1,
+		Type1C,
+		Type1COT,
+		Type3,
+		TrueType,
+		TrueTypeOT,
+		CIDType0,
+		CIDType0C,
+		CIDType0COT,
+		CIDTrueType,
+		CIDTrueTypeOT
+	};
+	
+	/// \cond PRIVATE
+	/**
+	   Create a new font information container.
+	*/
+	FontInfo();
+	
+	/**
+	   Create a new font information container.
+	*/
+	FontInfo( const FontInfoData &fid );
+	/// \endcond
+	
+	/**
+	   Copy constructor.
+	*/
+	FontInfo( const FontInfo &fi );
+	
+	/**
+	   Destructor.
+	*/
+	~FontInfo();
+
+	/**
+	   The name of the font. Can be QString::null if the font has no name
+	*/
+	QString name() const;
+
+	/**
+	   The path of the font file used to represent this font on this system,
+	   or a null string is the font is embedded
+	*/
+	QString file() const;
+
+	/**
+	   Whether the font is embedded in the file, or not
+
+	   \return true if the font is embedded
+	*/
+	bool isEmbedded() const;
+
+	/**
+	   Whether the font provided is only a subset of the full
+	   font or not. This only has meaning if the font is embedded.
+
+	   \return true if the font is only a subset
+	*/
+	bool isSubset() const;
+
+	/**
+	   The type of font encoding
+
+	   \return a enumerated value corresponding to the font encoding used
+
+	   \sa typeName for a string equivalent
+	*/
+	Type type() const;
+
+	/**
+	   The name of the font encoding used
+
+	   \note if you are looking for the name of the font (as opposed to the
+	   encoding format used), you probably want name().
+
+	   \sa type for a enumeration version
+	*/
+	QString typeName() const;
+
+	/**
+	   Standard assignment operator
+	*/
+	FontInfo& operator=( const FontInfo &fi );
+
+    private:
+	FontInfoData *m_data;
+    };
+
+
+    class FontIteratorData;
+    /**
+       Iterator for reading the fonts in a document.
+
+       FontIterator provides a Java-style iterator for reading the fonts in a
+       document.
+
+       You can use it in the following way:
+       \code
+Poppler::FontIterator* it = doc->newFontIterator();
+while (it->hasNext()) {
+  QList<Poppler::FontInfo> fonts = it->next();
+  // do something with the fonts
+}
+// after doing the job, the iterator must be freed
+delete it;
+       \endcode
+
+       \since 0.12
+    */
+    class POPPLER_QT5_EXPORT FontIterator {
+    friend class Document;
+    friend class DocumentData;
+    public:
+	/**
+	   Destructor.
+	*/
+	~FontIterator();
+
+	/**
+	   Returns the fonts of the current page and then advances the iterator
+	   to the next page.
+	*/
+	QList<FontInfo> next();
+
+	/**
+	   Checks whether there is at least one more page to iterate, ie returns
+	   false when the iterator is beyond the last page.
+	*/
+	bool hasNext() const;
+
+	/**
+	   Returns the current page where the iterator is.
+	*/
+	int currentPage() const;
+
+    private:
+	Q_DISABLE_COPY( FontIterator )
+	FontIterator( int, DocumentData *dd );
+
+	FontIteratorData *d;
+    };
+
+
+    class EmbeddedFileData;
+    /**
+       Container class for an embedded file with a PDF document
+    */
+    class POPPLER_QT5_EXPORT EmbeddedFile {
+	friend class DocumentData;
+	friend class AnnotationPrivate;
+    public:
+	/// \cond PRIVATE
+	EmbeddedFile(EmbFile *embfile);
+	/// \endcond
+	
+	/**
+	   Destructor.
+	*/
+	~EmbeddedFile();
+
+	/**
+	   The name associated with the file
+	*/
+	QString name() const;
+
+	/**
+	   The description associated with the file, if any.
+
+	   This will return an empty QString if there is no description element
+	*/
+	QString description() const;
+
+	/**
+	   The size of the file.
+	
+	   This will return < 0 if there is no size element
+	*/
+	int size() const;
+
+	/**
+	   The modification date for the embedded file, if known.
+	*/
+	QDateTime modDate() const;
+
+	/**
+	   The creation date for the embedded file, if known.
+	*/
+	QDateTime createDate() const;
+	
+	/**
+	   The MD5 checksum of the file.
+		
+	   This will return an empty QByteArray if there is no checksum element.
+	*/
+	QByteArray checksum() const;
+
+	/**
+	   The MIME type of the file, if known.
+	
+	   \since 0.8
+	*/
+	QString mimeType() const;
+
+	/**
+	   The data as a byte array
+	*/
+	QByteArray data();
+
+	/**
+	   Is the embedded file valid?
+	   
+	   \since 0.12
+	*/
+	bool isValid() const;
+
+	/**
+	   A QDataStream for the actual data?
+	*/
+	//QDataStream dataStream() const;
+
+    private:
+	Q_DISABLE_COPY(EmbeddedFile)
+	EmbeddedFile(EmbeddedFileData &dd);
+
+	EmbeddedFileData *m_embeddedFile;
+    };
+
+
+    /**
+       \brief A page in a document.
+
+       The Page class represents a single page within a PDF document.
+
+       You cannot construct a Page directly, but you have to use the Document
+       functions that return a new Page out of an index or a label.
+    */
+    class POPPLER_QT5_EXPORT Page {
+	friend class Document;
+    public:
+	/**
+	   Destructor.
+	*/
+	~Page();
+
+	/**
+	   The type of rotation to apply for an operation
+	*/
+	enum Rotation { Rotate0 = 0,   ///< Do not rotate
+			Rotate90 = 1,  ///< Rotate 90 degrees clockwise
+			Rotate180 = 2, ///< Rotate 180 degrees
+			Rotate270 = 3  ///< Rotate 270 degrees clockwise (90 degrees counterclockwise)
+	};
+
+	/**
+	   The kinds of page actions
+	*/
+	enum PageAction {
+	    Opening,   ///< The action when a page is "opened"
+	    Closing    ///< The action when a page is "closed"
+	};
+	
+	/**
+	   How the text is going to be returned
+	   \since 0.16
+	*/
+	enum TextLayout {
+	    PhysicalLayout,   ///< The text is layouted to resemble the real page layout
+	    RawOrderLayout          ///< The text is returned without any type of processing
+	};
+
+        /**
+           Additional flags for the renderToPainter method
+           \since 0.16
+        */
+        enum PainterFlag {
+            /**
+               Do not save/restore the caller-owned painter.
+
+               renderToPainter() by default preserves, using save() + restore(),
+               the state of the painter specified; if this is not needed, this
+               flag can avoid this job
+             */
+            DontSaveAndRestore = 0x00000001
+        };
+        Q_DECLARE_FLAGS( PainterFlags, PainterFlag )
+
+	/** 
+	   Render the page to a QImage using the current
+	   \link Document::renderBackend() Document renderer\endlink.
+	   
+	   If \p x = \p y = \p w = \p h = -1, the method will automatically
+           compute the size of the image from the horizontal and vertical
+           resolutions specified in \p xres and \p yres. Otherwise, the
+           method renders only a part of the page, specified by the
+           parameters (\p x, \p y, \p w, \p h) in pixel coordinates. The returned
+           QImage then has size (\p w, \p h), independent of the page
+           size.
+
+	   \param x specifies the left x-coordinate of the box, in
+	   pixels.
+
+	   \param y specifies the top y-coordinate of the box, in
+	   pixels.
+
+	   \param w specifies the width of the box, in pixels.
+
+	   \param h specifies the height of the box, in pixels.
+
+	   \param xres horizontal resolution of the graphics device,
+	   in dots per inch
+
+	   \param yres vertical resolution of the graphics device, in
+	   dots per inch
+	
+	   \param rotate how to rotate the page
+
+	   \warning The parameter (\p x, \p y, \p w, \p h) are not
+	   well-tested. Unusual or meaningless parameters may lead to
+	   rather unexpected results.
+
+	   \returns a QImage of the page, or a null image on failure.
+
+	   \since 0.6
+        */
+	QImage renderToImage(double xres=72.0, double yres=72.0, int x=-1, int y=-1, int w=-1, int h=-1, Rotation rotate = Rotate0) const;
+
+        /**
+           Render the page to the specified QPainter using the current
+           \link Document::renderBackend() Document renderer\endlink.
+
+           If \p x = \p y = \p w = \p h = -1, the method will automatically
+           compute the size of the page area from the horizontal and vertical
+           resolutions specified in \p xres and \p yres. Otherwise, the
+           method renders only a part of the page, specified by the
+           parameters (\p x, \p y, \p w, \p h) in pixel coordinates.
+
+           \param painter the painter to paint on
+
+           \param x specifies the left x-coordinate of the box, in
+           pixels.
+
+           \param y specifies the top y-coordinate of the box, in
+           pixels.
+
+           \param w specifies the width of the box, in pixels.
+
+           \param h specifies the height of the box, in pixels.
+
+           \param xres horizontal resolution of the graphics device,
+           in dots per inch
+
+           \param yres vertical resolution of the graphics device, in
+           dots per inch
+
+           \param rotate how to rotate the page
+
+           \param flags additional painter flags
+
+           \warning The parameter (\p x, \p y, \p w, \p h) are not
+           well-tested. Unusual or meaningless parameters may lead to
+           rather unexpected results.
+
+           \returns whether the painting succeeded
+
+           \note This method is only supported for Arthur
+
+           \since 0.16
+        */
+        bool renderToPainter(QPainter* painter, double xres=72.0, double yres=72.0, int x=-1, int y=-1, int w=-1, int h=-1,
+                             Rotation rotate = Rotate0, PainterFlags flags = 0) const;
+
+	/**
+	   Get the page thumbnail if it exists.
+
+	   \return a QImage of the thumbnail, or a null image
+	   if the PDF does not contain one for this page
+
+	   \since 0.12
+	*/
+	QImage thumbnail() const;
+
+	/**
+	   Returns the text that is inside a specified rectangle
+
+	   \param rect the rectangle specifying the area of interest,
+	   with coordinates given in points, i.e., 1/72th of an inch.
+	   If rect is null, all text on the page is given
+	
+	   \since 0.16
+	**/
+	QString text(const QRectF &rect, TextLayout textLayout) const;
+
+	/**
+	   Returns the text that is inside a specified rectangle.
+	   The text is returned using the physical layout of the page
+
+	   \param rect the rectangle specifying the area of interest,
+	   with coordinates given in points, i.e., 1/72th of an inch.
+	   If rect is null, all text on the page is given
+	**/
+	QString text(const QRectF &rect) const;
+	
+	/**
+	   The starting point for a search
+	*/
+	enum SearchDirection { FromTop,        ///< Start sorting at the top of the document
+			       NextResult,     ///< Find the next result, moving "down the page"
+			       PreviousResult  ///< Find the previous result, moving "up the page"
+	};
+
+	/**
+	   The type of search to perform
+	*/
+	enum SearchMode { CaseSensitive,   ///< Case differences cause no match in searching
+			  CaseInsensitive  ///< Case differences are ignored in matching
+	};
+	
+	/**
+	   Returns true if the specified text was found.
+
+	   \param text the text the search
+	   \param rectXXX in all directions is used to return where the text was found, for NextResult and PreviousResult
+	               indicates where to continue searching for
+	   \param direction in which direction do the search
+	   \param caseSensitive be case sensitive?
+	   \param rotate the rotation to apply for the search order
+	   \since 0.14
+	**/
+	bool search(const QString &text, double &rectLeft, double &rectTop, double &rectRight, double &rectBottom, SearchDirection direction, SearchMode caseSensitive, Rotation rotate = Rotate0) const;
+	
+	/**
+	   Returns a list of all occurrences of the specified text on the page.
+	   
+	   \param text the text to search
+	   \param caseSensitive whether to be case sensitive
+	   \param rotate the rotation to apply for the search order
+	   
+	   \warning Do not use the returned QRectF as arguments of another search call because of truncation issues if qreal is defined as float.
+	   
+	   \since 0.22
+	**/
+	QList<QRectF> search(const QString &text, SearchMode caseSensitive, Rotation rotate = Rotate0) const;
+
+	/**
+	   Returns a list of text of the page
+
+	   This method returns a QList of TextBoxes that contain all
+	   the text of the page, with roughly one text word of text
+	   per TextBox item.
+	   
+	   For text written in western languages (left-to-right and
+	   up-to-down), the QList contains the text in the proper
+	   order.
+
+	   \note The caller owns the text boxes and they should
+	         be deleted when no longer required.
+
+	   \warning This method is not tested with Asian scripts
+	*/
+	QList<TextBox*> textList(Rotation rotate = Rotate0) const;
+
+	/**
+	   \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 of an inch)
+	*/
+	QSize pageSize() const;
+
+	/**
+	  Returns the transition of this page
+
+	  \returns a pointer to a PageTransition structure that
+	  defines how transition to this page shall be performed.
+
+	  \note The PageTransition structure is owned by this page, and will
+	  automatically be destroyed when this page class is
+	  destroyed.
+	**/
+	PageTransition *transition() const;
+	
+	/**
+	  Gets the page action specified, or NULL if there is no action.
+
+	  \since 0.6
+	**/
+	Link *action( PageAction act ) const;
+	
+	/**
+	   Types of orientations that are possible
+	*/
+	enum Orientation {
+	    Landscape, ///< Landscape orientation (portrait, with 90 degrees clockwise rotation )
+	    Portrait, ///< Normal portrait orientation
+	    Seascape, ///< Seascape orientation (portrait, with 270 degrees clockwise rotation)
+	    UpsideDown ///< Upside down orientation (portrait, with 180 degrees rotation)
+	};
+
+	/**
+	   The orientation of the page
+	*/
+	Orientation orientation() const;
+	
+	/**
+	  The default CTM
+	*/
+	void defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool upsideDown);
+	
+	/**
+	  Gets the links of the page
+	*/
+	QList<Link*> links() const;
+	
+	/**
+	 Returns the annotations of the page
+
+	 \note If you call this method twice, you get different objects
+	       pointing to the same annotations (see Annotation).
+	       The caller owns the returned objects and they should be deleted
+	       when no longer required.
+	*/
+	QList<Annotation*> annotations() const;
+
+	/**
+	 Adds an annotation to the page
+
+	 \note Ownership of the annotation object stays with the caller, who can
+	       delete it at any time.
+	 \since 0.20
+	*/
+	void addAnnotation( const Annotation *ann );
+
+	/**
+	 Removes an annotation from the page and destroys the annotation object
+
+	 \note There mustn't be other Annotation objects pointing this annotation
+	 \since 0.20
+	*/
+	void removeAnnotation( const Annotation *ann );
+
+	/**
+	 Returns the form fields on the page
+	 The caller gets the ownership of the returned objects.
+
+	 \since 0.6
+	*/
+	QList<FormField*> formFields() const;
+
+	/**
+	 Returns the page duration. That is the time, in seconds, that the page
+	 should be displayed before the presentation automatically advances to the next page.
+	 Returns < 0 if duration is not set.
+
+	 \since 0.6
+	*/
+	double duration() const;
+	
+	/**
+	   Returns the label of the page, or a null string is the page has no label.
+
+	 \since 0.6
+	**/
+	QString label() const;
+	
+    private:
+	Q_DISABLE_COPY(Page)
+
+	Page(DocumentData *doc, int index);
+	PageData *m_page;
+    };
+
+/**
+   \brief PDF document.
+
+   The Document class represents a PDF document: its pages, and all the global
+   properties, metadata, etc.
+
+   \section ownership Ownership of the returned objects
+
+   All the functions that returns class pointers create new object, and the
+   responsability of those is given to the callee.
+
+   The only exception is \link Poppler::Page::transition() Page::transition()\endlink.
+
+   \section document-loading Loading
+
+   To get a Document, you have to load it via the load() & loadFromData()
+   functions.
+
+   In all the functions that have passwords as arguments, they \b must be Latin1
+   encoded. If you have a password that is a UTF-8 string, you need to use
+   QString::toLatin1() (or similar) to convert the password first.
+   If you have a UTF-8 character array, consider converting it to a QString first
+   (QString::fromUtf8(), or similar) before converting to Latin1 encoding.
+
+   \section document-rendering Rendering
+
+   To render pages of a document, you have different Document functions to set
+   various options.
+
+   \subsection document-rendering-backend Backends
+
+   %Poppler offers a different backends for rendering the pages. Currently
+   there are two backends (see #RenderBackend), but only the Splash engine works
+   well and has been tested.
+
+   The available rendering backends can be discovered via availableRenderBackends().
+   The current rendering backend can be changed using setRenderBackend().
+   Please note that setting a backend not listed in the available ones
+   will always result in null QImage's.
+
+   \section document-cms Color management support
+
+   %Poppler, if compiled with this support, provides functions to handle color
+   profiles.
+
+   To know whether the %Poppler version you are using has support for color
+   management, you can query Poppler::isCmsAvailable(). In case it is not
+   avilable, all the color management-related functions will either do nothing
+   or return null.
+*/
+    class POPPLER_QT5_EXPORT Document {
+	friend class Page;
+	friend class DocumentData;
+  
+    public:
+	/**
+	   The page mode
+	*/
+	enum PageMode {
+	    UseNone,     ///< No mode - neither document outline nor thumbnail images are visible
+	    UseOutlines, ///< Document outline visible
+	    UseThumbs,   ///< Thumbnail images visible
+	    FullScreen,  ///< Fullscreen mode (no menubar, windows controls etc)
+	    UseOC,       ///< Optional content group panel visible
+	    UseAttach    ///< Attachments panel visible
+	};
+  
+	/**
+	   The page layout
+	*/
+	enum PageLayout {
+	    NoLayout,   ///< Layout not specified
+	    SinglePage, ///< Display a single page
+	    OneColumn,  ///< Display a single column of pages
+	    TwoColumnLeft, ///< Display the pages in two columns, with odd-numbered pages on the left
+	    TwoColumnRight, ///< Display the pages in two columns, with odd-numbered pages on the right
+	    TwoPageLeft, ///< Display the pages two at a time, with odd-numbered pages on the left
+	    TwoPageRight ///< Display the pages two at a time, with odd-numbered pages on the right
+	};
+
+	/**
+	   The render backends available
+
+	   \since 0.6
+	*/
+	enum RenderBackend {
+	    SplashBackend,   ///< Splash backend
+	    ArthurBackend   ///< Arthur (Qt) backend
+	};
+
+	/**
+	   The render hints available
+
+	   \since 0.6
+	*/
+	enum RenderHint {
+	    Antialiasing = 0x00000001,      ///< Antialiasing for graphics
+	    TextAntialiasing = 0x00000002,  ///< Antialiasing for text
+	    TextHinting = 0x00000004,       ///< Hinting for text \since 0.12.1
+	    TextSlightHinting = 0x00000008, ///< Lighter hinting for text when combined with TextHinting \since 0.18
+	    OverprintPreview = 0x00000010,  ///< Overprint preview \since 0.22
+	    ThinLineSolid = 0x00000020,     ///< Enhance thin lines solid \since 0.24
+	    ThinLineShape = 0x00000040      ///< Enhance thin lines shape. Wins over ThinLineSolid \since 0.24
+	};
+	Q_DECLARE_FLAGS( RenderHints, RenderHint )
+
+	/**
+	   Form types
+
+	   \since 0.22
+	*/
+	enum FormType {
+	    NoForm,    ///< Document doesn't contain forms
+	    AcroForm,  ///< AcroForm
+	    XfaForm    ///< Adobe XML Forms Architecture (XFA), currently unsupported
+	};
+
+	/**
+	  Set a color display profile for the current document.
+
+	  \param outputProfileA is a \c cmsHPROFILE of the LCMS library.
+
+	   \since 0.12
+	*/
+	void setColorDisplayProfile(void *outputProfileA);
+	/**
+	  Set a color display profile for the current document.
+
+	  \param name is the name of the display profile to set.
+
+	   \since 0.12
+	*/
+	void setColorDisplayProfileName(const QString &name);
+	/**
+	  Return the current RGB profile.
+
+	  \return a \c cmsHPROFILE of the LCMS library.
+
+	   \since 0.12
+	*/
+	void* colorRgbProfile() const;
+	/**
+	  Return the current display profile.
+
+	  \return a \c cmsHPROFILE of the LCMS library.
+
+	   \since 0.12
+	*/
+	void *colorDisplayProfile() const;
+
+	/**
+	   Load the document from a file on disk
+
+	   \param filePath the name (and path, if required) of the file to load
+	   \param ownerPassword the Latin1-encoded owner password to use in
+	   loading the file
+	   \param userPassword the Latin1-encoded user ("open") password
+	   to use in loading the file
+
+	   \return the loaded document, or NULL on error
+
+	   \note The caller owns the pointer to Document, and this should
+	   be deleted when no longer required.
+	
+	   \warning The returning document may be locked if a password is required
+	   to open the file, and one is not provided (as the userPassword).
+	*/
+	static Document *load(const QString & filePath,
+			      const QByteArray &ownerPassword=QByteArray(),
+			      const QByteArray &userPassword=QByteArray());
+	
+	/**
+	   Load the document from memory
+
+	   \param fileContents the file contents. They are copied so there is no need 
+	                       to keep the byte array around for the full life time of 
+	                       the document.
+	   \param ownerPassword the Latin1-encoded owner password to use in
+	   loading the file
+	   \param userPassword the Latin1-encoded user ("open") password
+	   to use in loading the file
+
+	   \return the loaded document, or NULL on error
+
+	   \note The caller owns the pointer to Document, and this should
+	   be deleted when no longer required.
+	
+	   \warning The returning document may be locked if a password is required
+	   to open the file, and one is not provided (as the userPassword).
+
+	   \since 0.6
+	*/
+	static Document *loadFromData(const QByteArray &fileContents,
+			      const QByteArray &ownerPassword=QByteArray(),
+			      const QByteArray &userPassword=QByteArray());
+  
+	/**
+	   Get a specified Page
+     
+	   Note that this follows the PDF standard of being zero based - if you
+	   want the first page, then you need an index of zero.
+	
+	   The caller gets the ownership of the returned object.
+
+	   \param index the page number index
+	*/
+	Page *page(int index) const;
+
+	/**
+	   \overload
+
+
+	   The intent is that you can pass in a label like \c "ix" and
+	   get the page with that label (which might be in the table of
+	   contents), or pass in \c "1" and get the page that the user
+	   expects (which might not be the first page, if there is a
+	   title page and a table of contents).
+
+	   \param label the page label
+	*/
+	Page *page(const QString &label) const;
+
+	/**
+	   The number of pages in the document
+	*/
+	int numPages() const;
+  
+	/**
+	   The type of mode that should be used by the application
+	   when the document is opened. Note that while this is 
+	   called page mode, it is really viewer application mode.
+	*/
+	PageMode pageMode() const;
+
+	/**
+	   The layout that pages should be shown in when the document
+	   is first opened.  This basically describes how pages are
+	   shown relative to each other.
+	*/
+	PageLayout pageLayout() const;
+
+	/**
+	   Provide the passwords required to unlock the document
+
+	   \param ownerPassword the Latin1-encoded owner password to use in
+	   loading the file
+	   \param userPassword the Latin1-encoded user ("open") password
+	   to use in loading the file
+	*/
+	bool unlock(const QByteArray &ownerPassword, const QByteArray &userPassword);
+
+	/**
+	   Determine if the document is locked
+	*/
+	bool isLocked() const;
+
+	/**
+	   The date associated with the document
+
+	   You would use this method with something like:
+	   \code
+QDateTime created = m_doc->date("CreationDate");
+QDateTime modified = m_doc->date("ModDate");
+	   \endcode
+
+	   The available dates are:
+	   - CreationDate: the date of creation of the document
+	   - ModDate: the date of the last change in the document
+
+	   \param data the type of date that is required
+	*/
+	QDateTime date( const QString & data ) const;
+
+	/**
+	   Get specified information associated with the document
+
+	   You would use this method with something like:
+	   \code
+QString title = m_doc->info("Title");
+QString subject = m_doc->info("Subject");
+	   \endcode
+
+	   In addition to \c Title and \c Subject, other information that may
+	   be available include \c Author, \c Keywords, \c Creator and \c Producer.
+
+	   \param data the information that is required
+
+	   \sa infoKeys() to get a list of the available keys
+	*/
+	QString info( const QString & data ) const;
+
+	/**
+	   Obtain a list of the available string information keys.
+	*/
+	QStringList infoKeys() const;
+
+	/**
+	   Test if the document is encrypted
+	*/
+	bool isEncrypted() const;
+
+	/**
+	   Test if the document is linearised
+
+	   In some cases, this is called "fast web view", since it
+	   is mostly an optimisation for viewing over the Web.
+	*/
+	bool isLinearized() const;
+
+	/**
+	   Test if the permissions on the document allow it to be
+	   printed
+	*/
+	bool okToPrint() const;
+
+	/**
+	   Test if the permissions on the document allow it to be
+	   printed at high resolution
+	*/
+	bool okToPrintHighRes() const;
+
+	/**
+	   Test if the permissions on the document allow it to be
+	   changed.
+
+	   \note depending on the type of change, it may be more
+	   appropriate to check other properties as well.
+	*/
+	bool okToChange() const;
+
+	/**
+	   Test if the permissions on the document allow the
+	   contents to be copied / extracted
+	*/
+	bool okToCopy() const;
+
+	/**
+	   Test if the permissions on the document allow annotations
+	   to be added or modified, and interactive form fields (including
+	   signature fields) to be completed.
+	*/
+	bool okToAddNotes() const;
+
+	/**
+	   Test if the permissions on the document allow interactive
+	   form fields (including signature fields) to be completed.
+
+	   \note this can be true even if okToAddNotes() is false - this
+	   means that only form completion is permitted.
+	*/
+	bool okToFillForm() const;
+
+	/**
+	   Test if the permissions on the document allow interactive
+	   form fields (including signature fields) to be set, created and
+	   modified
+	*/
+	bool okToCreateFormFields() const;
+
+	/**
+	   Test if the permissions on the document allow content extraction
+	   (text and perhaps other content) for accessibility usage (eg for
+	   a screen reader)
+	*/
+	bool okToExtractForAccessibility() const;
+
+	/**
+	   Test if the permissions on the document allow it to be
+	   "assembled" - insertion, rotation and deletion of pages;
+	   or creation of bookmarks and thumbnail images.
+
+	   \note this can be true even if okToChange() is false
+	*/
+	bool okToAssemble() const;
+
+	/**
+	   The version of the PDF specification that the document
+	   conforms to
+
+	   \param major an optional pointer to a variable where store the
+	   "major" number of the version
+	   \param minor an optional pointer to a variable where store the
+	   "minor" number of the version
+
+	   \since 0.12
+	*/
+	void getPdfVersion(int *major, int *minor) const;
+  
+	/**
+	   The fonts within the PDF document.
+
+	   This is a shorthand for getting all the fonts at once.
+
+	   \note this can take a very long time to run with a large
+	   document. You may wish to use a FontIterator if you have more
+	   than say 20 pages
+
+	   \see newFontIterator()
+	*/
+	QList<FontInfo> fonts() const;
+
+	/**
+	   Creates a new FontIterator object for font scanning.
+
+	   The new iterator can be used for reading the font information of the
+	   document, reading page by page.
+
+	   The caller is responsible for the returned object, ie it should freed
+	   it when no more useful.
+
+	   \param startPage the initial page from which start reading fonts
+
+	   \see fonts()
+
+	   \since 0.12
+	*/
+	FontIterator* newFontIterator( int startPage = 0 ) const;
+
+	/**
+	   The font data if the font is an embedded one.
+
+	   \since 0.10
+	*/
+	QByteArray fontData(const FontInfo &font) const;
+
+	/**
+	   The documents embedded within the PDF document.
+
+	   \note there are two types of embedded document - this call
+	   only accesses documents that are embedded at the document level.
+	*/
+	QList<EmbeddedFile*> embeddedFiles() const;
+
+	/**
+	   Whether there are any documents embedded in this PDF document.
+	*/
+	bool hasEmbeddedFiles() const;
+	
+	/**
+	  Gets the table of contents (TOC) of the Document.
+	
+	  The caller is responsable for the returned object.
+	
+	  In the tree the tag name is the 'screen' name of the entry. A tag can have
+	  attributes. Here follows the list of tag attributes with meaning:
+	  - Destination: A string description of the referred destination
+	  - DestinationName: A 'named reference' to the viewport
+	  - ExternalFileName: A link to a external filename
+	  - Open: A bool value that tells whether the subbranch of the item is open or not
+	
+	  Resolving the final destination for each item can be done in the following way:
+	  - first, checking for 'Destination': if not empty, then a LinkDestination
+	    can be constructed straight with it
+	  - as second step, if the 'DestinationName' is not empty, then the destination
+	    can be resolved using linkDestination()
+	
+	  Note also that if 'ExternalFileName' is not emtpy, then the destination refers
+	  to that document (and not to the current one).
+	
+	  \returns the TOC, or NULL if the Document does not have one
+	*/
+	QDomDocument *toc() const;
+	
+	/**
+	   Tries to resolve the named destination \p name.
+	
+	   \note this operation starts a search through the whole document
+	
+	   \returns a new LinkDestination object if the named destination was
+	   actually found, or NULL otherwise
+	*/
+	LinkDestination *linkDestination( const QString &name );
+	
+	/**
+	  Sets the paper color
+
+	  \param color the new paper color
+	 */
+	void setPaperColor(const QColor &color);
+	/**
+	  The paper color
+
+	  The default color is white.
+	 */
+	QColor paperColor() const;
+
+	/**
+	 Sets the backend used to render the pages.
+
+	 \param backend the new rendering backend
+
+	 \since 0.6
+	 */
+	void setRenderBackend( RenderBackend backend );
+	/**
+	  The currently set render backend
+
+	  The default backend is \ref SplashBackend
+
+	  \since 0.6
+	 */
+	RenderBackend renderBackend() const;
+
+	/**
+	  The available rendering backends.
+
+	  \since 0.6
+	 */
+	static QSet<RenderBackend> availableRenderBackends();
+
+	/**
+	 Sets the render \p hint .
+
+	 \note some hints may not be supported by some rendering backends.
+
+	 \param on whether the flag should be added or removed.
+
+	 \since 0.6
+	 */
+	void setRenderHint( RenderHint hint, bool on = true );
+	/**
+	  The currently set render hints.
+
+	  \since 0.6
+	 */
+	RenderHints renderHints() const;
+	
+	/**
+	  Gets a new PS converter for this document.
+
+	  The caller gets the ownership of the returned converter.
+
+	  \since 0.6
+	 */
+	PSConverter *psConverter() const;
+	
+	/**
+	  Gets a new PDF converter for this document.
+
+	  The caller gets the ownership of the returned converter.
+
+	  \since 0.8
+	 */
+	PDFConverter *pdfConverter() const;
+	
+	/**
+	  Gets the metadata stream contents
+
+	  \since 0.6
+	*/
+	QString metadata() const;
+
+	/**
+	   Test whether this document has "optional content".
+
+	   Optional content is used to optionally turn on (display)
+	   and turn off (not display) some elements of the document.
+	   The most common use of this is for layers in design
+	   applications, but it can be used for a range of things,
+	   such as not including some content in printing, and
+	   displaying content in the appropriate language.
+
+	   \since 0.8
+	*/
+	bool hasOptionalContent() const;
+
+	/**
+	   Itemviews model for optional content.
+
+	   The model is owned by the document.
+
+	   \since 0.8
+	*/
+	OptContentModel *optionalContentModel();
+
+	/**
+	   Document-level JavaScript scripts.
+
+	   Returns the list of document level JavaScript scripts to be always
+	   executed before any other script.
+
+	   \since 0.10
+	*/
+	QStringList scripts() const;
+
+	/**
+	   The PDF identifiers.
+
+	   \param permanentId an optional pointer to a variable where store the
+	   permanent ID of the document
+	   \param updateId an optional pointer to a variable where store the
+	   update ID of the document
+
+	   \return whether the document has the IDs
+
+	   \since 0.16
+	*/
+	bool getPdfId(QByteArray *permanentId, QByteArray *updateId) const;
+
+	/**
+	   Returns the type of forms contained in the document
+
+	   \since 0.22
+	*/
+	FormType formType() const;
+
+	/**
+	   Destructor.
+	*/
+	~Document();
+  
+    private:
+	Q_DISABLE_COPY(Document)
+
+	DocumentData *m_doc;
+	
+	Document(DocumentData *dataA);
+    };
+    
+    class BaseConverterPrivate;
+    class PSConverterPrivate;
+    class PDFConverterPrivate;
+    /**
+       \brief Base converter.
+
+       This is the base class for the converters.
+
+       \since 0.8
+    */
+    class POPPLER_QT5_EXPORT BaseConverter
+    {
+        friend class Document;
+        public:
+            /**
+              Destructor.
+            */
+            virtual ~BaseConverter();
+
+            /** Sets the output file name. You must set this or the output device. */
+            void setOutputFileName(const QString &outputFileName);
+
+            /**
+             * Sets the output device. You must set this or the output file name.
+             *
+             * \since 0.8
+             */
+            void setOutputDevice(QIODevice *device);
+
+            /**
+              Does the conversion.
+
+              \return whether the conversion succeeded
+            */
+            virtual bool convert() = 0;
+            
+            enum Error
+            {
+                NoError,
+                FileLockedError,
+                OpenOutputError,
+                NotSupportedInputFileError
+            };
+            
+            /**
+              Returns the last error
+              \since 0.12.1
+            */
+            Error lastError() const;
+
+        protected:
+            /// \cond PRIVATE
+            BaseConverter(BaseConverterPrivate &dd);
+            Q_DECLARE_PRIVATE(BaseConverter)
+            BaseConverterPrivate *d_ptr;
+            /// \endcond
+
+        private:
+            Q_DISABLE_COPY(BaseConverter)
+    };
+
+    /**
+       Converts a PDF to PS
+
+       Sizes have to be in Points (1/72 inch)
+
+       If you are using QPrinter you can get paper size by doing:
+       \code
+QPrinter dummy(QPrinter::PrinterResolution);
+dummy.setFullPage(true);
+dummy.setPageSize(myPageSize);
+width = dummy.width();
+height = dummy.height();
+       \endcode
+
+       \since 0.6
+    */
+    class POPPLER_QT5_EXPORT PSConverter : public BaseConverter
+    {
+        friend class Document;
+        public:
+            /**
+              Options for the PS export.
+
+              \since 0.10
+             */
+            enum PSOption {
+                Printing = 0x00000001,              ///< The PS is generated for printing purposes
+                StrictMargins = 0x00000002,
+                ForceRasterization = 0x00000004,
+                PrintToEPS = 0x00000008,            ///< Output EPS instead of PS \since 0.20
+                HideAnnotations = 0x00000010        ///< Don't print annotations \since 0.20
+            };
+            Q_DECLARE_FLAGS( PSOptions, PSOption )
+
+            /**
+              Destructor.
+            */
+            ~PSConverter();
+
+            /** Sets the list of pages to print. Mandatory. */
+            void setPageList(const QList<int> &pageList);
+
+            /**
+              Sets the title of the PS Document. Optional
+            */
+            void setTitle(const QString &title);
+
+            /**
+              Sets the horizontal DPI. Defaults to 72.0
+            */
+            void setHDPI(double hDPI);
+
+            /**
+              Sets the vertical DPI. Defaults to 72.0
+            */
+            void setVDPI(double vDPI);
+
+            /**
+              Sets the rotate. Defaults to not rotated
+            */
+            void setRotate(int rotate);
+
+            /**
+              Sets the output paper width. Has to be set.
+            */
+            void setPaperWidth(int paperWidth);
+
+            /**
+              Sets the output paper height. Has to be set.
+            */
+            void setPaperHeight(int paperHeight);
+
+            /**
+              Sets the output right margin. Defaults to 0
+            */
+            void setRightMargin(int marginRight);
+
+            /**
+              Sets the output bottom margin. Defaults to 0
+            */
+            void setBottomMargin(int marginBottom);
+
+            /**
+              Sets the output left margin. Defaults to 0
+            */
+            void setLeftMargin(int marginLeft);
+
+            /**
+              Sets the output top margin. Defaults to 0
+            */
+            void setTopMargin(int marginTop);
+
+            /**
+              Defines if margins have to be strictly followed (even if that
+              means changing aspect ratio), or if the margins can be adapted
+              to keep aspect ratio.
+
+              Defaults to false.
+            */
+            void setStrictMargins(bool strictMargins);
+
+            /** Defines if the page will be rasterized to an image before printing. Defaults to false */
+            void setForceRasterize(bool forceRasterize);
+
+            /**
+              Sets the options for the PS export.
+
+              \since 0.10
+             */
+            void setPSOptions(PSOptions options);
+
+            /**
+              The currently set options for the PS export.
+
+              The default flags are: Printing.
+
+              \since 0.10
+             */
+            PSOptions psOptions() const;
+
+            /**
+              Sets a function that will be called each time a page is converted.
+
+              The payload belongs to the caller.
+
+              \since 0.16
+             */
+            void setPageConvertedCallback(void (* callback)(int page, void *payload), void *payload);
+
+            bool convert();
+
+        private:
+            Q_DECLARE_PRIVATE(PSConverter)
+            Q_DISABLE_COPY(PSConverter)
+
+            PSConverter(DocumentData *document);
+    };
+
+    /**
+       Converts a PDF to PDF (thus saves a copy of the document).
+
+       \since 0.8
+    */
+    class POPPLER_QT5_EXPORT PDFConverter : public BaseConverter
+    {
+        friend class Document;
+        public:
+            /**
+              Options for the PDF export.
+             */
+            enum PDFOption {
+                WithChanges = 0x00000001        ///< The changes done to the document are saved as well
+            };
+            Q_DECLARE_FLAGS( PDFOptions, PDFOption )
+
+            /**
+              Destructor.
+            */
+            virtual ~PDFConverter();
+
+            /**
+              Sets the options for the PDF export.
+             */
+            void setPDFOptions(PDFOptions options);
+            /**
+              The currently set options for the PDF export.
+             */
+            PDFOptions pdfOptions() const;
+
+            bool convert();
+
+        private:
+            Q_DECLARE_PRIVATE(PDFConverter)
+            Q_DISABLE_COPY(PDFConverter)
+
+            PDFConverter(DocumentData *document);
+    };
+
+    /**
+       Conversion from PDF date string format to QDateTime
+    */
+    POPPLER_QT5_EXPORT QDateTime convertDate( char *dateString );
+
+    /**
+       Whether the color management functions are available.
+
+       \since 0.12
+    */
+    POPPLER_QT5_EXPORT bool isCmsAvailable();
+    
+    /**
+       Whether the overprint preview functionality is available.
+
+       \since 0.22
+    */
+    POPPLER_QT5_EXPORT bool isOverprintPreviewAvailable();
+
+    class SoundData;
+    /**
+       Container class for a sound file in a PDF document.
+
+	A sound can be either External (in that case should be loaded the file
+       whose url is represented by url() ), or Embedded, and the player has to
+       play the data contained in data().
+
+       \since 0.6
+    */
+    class POPPLER_QT5_EXPORT SoundObject {
+    public:
+	/**
+	   The type of sound
+	*/
+	enum SoundType {
+	    External,     ///< The real sound file is external
+	    Embedded      ///< The sound is contained in the data
+	};
+
+	/**
+	   The encoding format used for the sound
+	*/
+	enum SoundEncoding {
+	    Raw,          ///< Raw encoding, with unspecified or unsigned values in the range [ 0, 2^B - 1 ]
+	    Signed,       ///< Twos-complement values
+	    muLaw,        ///< mu-law-encoded samples
+	    ALaw          ///< A-law-encoded samples
+	};
+
+	/// \cond PRIVATE
+	SoundObject(Sound *popplersound);
+	/// \endcond
+	
+	~SoundObject();
+
+	/**
+	   Is the sound embedded (SoundObject::Embedded) or external (SoundObject::External)?
+	*/
+	SoundType soundType() const;
+
+	/**
+	   The URL of the sound file to be played, in case of SoundObject::External
+	*/
+	QString url() const;
+
+	/**
+	   The data of the sound, in case of SoundObject::Embedded
+	*/
+	QByteArray data() const;
+
+	/**
+	   The sampling rate of the sound
+	*/
+	double samplingRate() const;
+
+	/**
+	   The number of sound channels to use to play the sound
+	*/
+	int channels() const;
+
+	/**
+	   The number of bits per sample value per channel
+	*/
+	int bitsPerSample() const;
+
+	/**
+	   The encoding used for the sound
+	*/
+	SoundEncoding soundEncoding() const;
+
+    private:
+	Q_DISABLE_COPY(SoundObject)
+
+	SoundData *m_soundData;
+    };
+
+    class MovieData;
+    /**
+       Container class for a movie object in a PDF document.
+
+       \since 0.10
+    */
+    class POPPLER_QT5_EXPORT MovieObject {
+    friend class AnnotationPrivate;
+    public:
+	/**
+	   The play mode for playing the movie
+	*/
+	enum PlayMode {
+	    PlayOnce,         ///< Play the movie once, closing the movie controls at the end
+	    PlayOpen,         ///< Like PlayOnce, but leaving the controls open
+	    PlayRepeat,       ///< Play continuously until stopped
+	    PlayPalindrome    ///< Play forward, then backward, then again foward and so on until stopped
+	};
+
+	~MovieObject();
+
+	/**
+	   The URL of the movie to be played
+	*/
+	QString url() const;
+
+	/**
+	   The size of the movie
+	*/
+	QSize size() const;
+
+	/**
+	   The rotation (either 0, 90, 180, or 270 degrees clockwise) for the movie,
+	*/
+	int rotation() const;
+
+	/**
+	   Whether show a bar with movie controls
+	*/
+	bool showControls() const;
+
+	/**
+	   How to play the movie
+	*/
+	PlayMode playMode() const;
+
+	/**
+	   Returns whether a poster image should be shown if the movie is not playing.
+	   \since 0.22
+	*/
+	bool showPosterImage() const;
+
+	/**
+	   Returns the poster image that should be shown if the movie is not playing.
+	   If the image is null but showImagePoster() returns @c true, the first frame of the movie
+	   should be used as poster image.
+	   \since 0.22
+	*/
+	QImage posterImage() const;
+
+    private:
+	/// \cond PRIVATE
+	MovieObject( AnnotMovie *ann );
+	/// \endcond
+	
+	Q_DISABLE_COPY(MovieObject)
+
+	MovieData *m_movieData;
+    };
+
+}
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Page::PainterFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Document::RenderHints)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::PDFConverter::PDFOptions)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::PSConverter::PSOptions)
+
+#endif
diff --git a/qt5/src/poppler-sound.cc b/qt5/src/poppler-sound.cc
new file mode 100644
index 00000000..6e6cef7f
--- /dev/null
+++ b/qt5/src/poppler-sound.cc
@@ -0,0 +1,132 @@
+/* poppler-sound.cc: qt interface to poppler
+ * Copyright (C) 2006-2007, Pino Toscano <pino@kde.org>
+ * Copyright (C) 2008, Albert Astals Cid <aacid@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+
+#include "Object.h"
+#include "Stream.h"
+#include "Sound.h"
+
+namespace Poppler
+{
+
+class SoundData
+{
+public:
+	SoundData()
+	  : m_soundObj( 0 )
+	{
+	}
+
+	~SoundData()
+	{
+		delete m_soundObj;
+	}
+
+	SoundObject::SoundType m_type;
+	Sound *m_soundObj;
+};
+
+SoundObject::SoundObject(Sound *popplersound)
+{
+	m_soundData = new SoundData();
+	switch ( popplersound->getSoundKind() )
+	{
+		case soundEmbedded:
+			m_soundData->m_type = SoundObject::Embedded;
+			break;
+		case soundExternal:
+		default:
+			m_soundData->m_type = SoundObject::External;
+			break;
+	}
+
+	m_soundData->m_soundObj = popplersound->copy();
+}
+
+SoundObject::~SoundObject()
+{
+	delete m_soundData;
+}
+
+SoundObject::SoundType SoundObject::soundType() const
+{
+	return m_soundData->m_type;
+}
+
+QString SoundObject::url() const
+{
+	if ( m_soundData->m_type != SoundObject::External )
+		return QString();
+
+	GooString * goo = m_soundData->m_soundObj->getFileName();
+	return goo ? QString( goo->getCString() ) : QString();
+}
+
+QByteArray SoundObject::data() const
+{
+	if ( m_soundData->m_type != SoundObject::Embedded )
+		return QByteArray();
+
+	Stream *stream = m_soundData->m_soundObj->getStream();
+	stream->reset();
+	int dataLen = 0;
+	QByteArray fileArray;
+	int i;
+	while ( (i = stream->getChar()) != EOF) {
+		fileArray[dataLen] = (char)i;
+		++dataLen;
+	}
+	fileArray.resize(dataLen);
+
+	return fileArray;
+}
+
+double SoundObject::samplingRate() const
+{
+	return m_soundData->m_soundObj->getSamplingRate();
+}
+
+int SoundObject::channels() const
+{
+	return m_soundData->m_soundObj->getChannels();
+}
+
+int SoundObject::bitsPerSample() const
+{
+	return m_soundData->m_soundObj->getBitsPerSample();
+}
+
+SoundObject::SoundEncoding SoundObject::soundEncoding() const
+{
+	switch ( m_soundData->m_soundObj->getEncoding() )
+	{
+		case soundRaw:
+			return SoundObject::Raw;
+		case soundSigned:
+			return SoundObject::Signed;
+		case soundMuLaw:
+			return SoundObject::muLaw;
+		case soundALaw:
+			return SoundObject::ALaw;
+	}
+	return SoundObject::Raw;
+}
+
+}
diff --git a/qt5/src/poppler-textbox.cc b/qt5/src/poppler-textbox.cc
new file mode 100644
index 00000000..c600b32d
--- /dev/null
+++ b/qt5/src/poppler-textbox.cc
@@ -0,0 +1,63 @@
+/* poppler-qt.h: qt interface to poppler
+ * Copyright (C) 2005, Brad Hards <bradh@frogmouth.net>
+ * Copyright (C) 2006-2008, Albert Astals Cid <aacid@kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "poppler-qt5.h"
+#include "poppler-private.h"
+
+namespace Poppler {
+
+TextBox::TextBox(const QString& text, const QRectF &bBox)
+{
+	m_data = new TextBoxData();
+	m_data->text = text;
+	m_data->bBox = bBox;
+}
+
+TextBox::~TextBox()
+{
+	delete m_data;
+}
+
+QString TextBox::text() const
+{
+	return m_data->text;
+}
+
+QRectF TextBox::boundingBox() const
+{
+	return m_data->bBox;
+}
+
+TextBox *TextBox::nextWord() const
+{
+	return m_data->nextWord;
+}
+
+QRectF TextBox::charBoundingBox(int i) const
+{
+	return m_data->charBBoxes.value(i);
+}
+
+bool TextBox::hasSpaceAfter() const
+{
+	return m_data->hasSpaceAfter;
+}
+
+}
diff --git a/qt5/tests/CMakeLists.txt b/qt5/tests/CMakeLists.txt
new file mode 100644
index 00000000..dfeb1fb9
--- /dev/null
+++ b/qt5/tests/CMakeLists.txt
@@ -0,0 +1,75 @@
+set(CMAKE_AUTOMOC ON)
+
+add_definitions(${Qt5Core_DEFINITIONS})
+add_definitions(-DTESTDATADIR=\"${TESTDATADIR}\")
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../src
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Gui_INCLUDE_DIRS}
+  ${Qt5Xml_INCLUDE_DIRS}
+  ${Qt5Widgets_INCLUDE_DIRS}
+)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Gui_EXECUTABLE_COMPILE_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+macro(QT5_ADD_SIMPLETEST exe source)
+  string(REPLACE "-" "" test_name ${exe})
+  set(${test_name}_SOURCES
+    ${source}
+  )
+  poppler_add_test(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES})
+  target_link_libraries(${exe} poppler-qt5 ${Qt5Widgets_LIBRARIES})
+  if(MSVC)
+    target_link_libraries(${exe} poppler ${poppler_LIBS})
+  endif(MSVC)
+endmacro(QT5_ADD_SIMPLETEST)
+
+macro(QT5_ADD_QTEST exe source)
+  if (Qt5Test_FOUND)	
+    string(REPLACE "-" "" test_name ${exe})
+    set(${test_name}_SOURCES
+      ${source}
+    )
+    poppler_add_unittest(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES})
+	target_link_libraries(${exe} poppler-qt5 ${Qt5Widgets_LIBRARIES} ${Qt5Test_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES})
+    if(MSVC)
+		target_link_libraries(${exe} poppler ${poppler_LIBS})
+    endif(MSVC)
+  endif (Qt5Test_FOUND)
+endmacro(QT5_ADD_QTEST)
+
+
+qt5_add_simpletest(test-poppler-qt5 test-poppler-qt5.cpp)
+qt5_add_simpletest(test-password-qt5 test-password-qt5.cpp)
+qt5_add_simpletest(poppler-forms poppler-forms.cpp)
+qt5_add_simpletest(poppler-fonts poppler-fonts.cpp)
+qt5_add_simpletest(poppler_attachments poppler-attachments.cpp)
+qt5_add_simpletest(stress-poppler-qt5 stress-poppler-qt5.cpp)
+qt5_add_simpletest(stress-poppler-dir stress-poppler-dir.cpp)
+qt5_add_simpletest(stress-threads-qt5 stress-threads-qt5.cpp)
+qt5_add_simpletest(poppler-texts poppler-texts.cpp)
+
+qt5_add_qtest(check_attachments check_attachments.cpp)
+qt5_add_qtest(check_dateConversion check_dateConversion.cpp)
+qt5_add_qtest(check_fonts check_fonts.cpp)
+qt5_add_qtest(check_links check_links.cpp)
+qt5_add_qtest(check_metadata check_metadata.cpp)
+qt5_add_qtest(check_optcontent check_optcontent.cpp)
+qt5_add_qtest(check_pagelayout check_pagelayout.cpp)
+qt5_add_qtest(check_pagemode check_pagemode.cpp)
+qt5_add_qtest(check_password check_password.cpp)
+qt5_add_qtest(check_permissions check_permissions.cpp)
+qt5_add_qtest(check_search check_search.cpp)
+qt5_add_qtest(check_actualtext check_actualtext.cpp)
+qt5_add_qtest(check_lexer check_lexer.cpp)
+qt5_add_qtest(check_pagelabelinfo check_pagelabelinfo.cpp)
+qt5_add_qtest(check_goostring check_goostring.cpp)
+if (NOT WIN32)
+  qt5_add_qtest(check_strings check_strings.cpp)
+endif (NOT WIN32)
diff --git a/qt5/tests/Makefile.am b/qt5/tests/Makefile.am
new file mode 100644
index 00000000..be9fa446
--- /dev/null
+++ b/qt5/tests/Makefile.am
@@ -0,0 +1,163 @@
+AM_LDFLAGS = @auto_import_flags@
+
+INCLUDES =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler			\
+	-I$(top_srcdir)/qt5/src			\
+	-DTESTDATADIR=\"$(TESTDATADIR)\"        \
+	$(POPPLER_QT5_CFLAGS)
+
+LDADDS =					\
+	$(top_builddir)/poppler/libpoppler.la	\
+	$(top_builddir)/qt5/src/libpoppler-qt5.la	\
+	$(POPPLER_QT5_LIBS)
+
+SUFFIXES: .moc
+
+.cpp.moc:
+	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
+
+noinst_PROGRAMS = test-poppler-qt5 stress-poppler-qt5 \
+	poppler-fonts test-password-qt5 stress-poppler-dir \
+	poppler-attachments poppler-texts poppler-forms \
+	stress-threads-qt5
+
+
+test_poppler_qt5_SOURCES =			\
+       test-poppler-qt5.cpp
+
+test_poppler_qt5_LDADD = $(LDADDS)
+
+
+test_password_qt5_SOURCES =			\
+       test-password-qt5.cpp
+
+test_password_qt5_LDADD = $(LDADDS)
+
+
+poppler_fonts_SOURCES =			\
+       poppler-fonts.cpp
+
+poppler_fonts_LDADD = $(LDADDS)
+
+poppler_attachments_SOURCES =			\
+       poppler-attachments.cpp
+
+poppler_attachments_LDADD = $(LDADDS)
+
+poppler_texts_SOURCES =			\
+       poppler-texts.cpp
+
+poppler_texts_LDADD = $(LDADDS)
+
+poppler_forms_SOURCES =                        \
+       poppler-forms.cpp
+ 
+poppler_forms_LDADD = $(LDADDS)
+
+
+stress_poppler_qt5_SOURCES =			\
+       stress-poppler-qt5.cpp
+
+stress_poppler_qt5_LDADD = $(LDADDS)
+
+stress_poppler_dir_SOURCES =			\
+       stress-poppler-dir.cpp
+
+stress_poppler_dir_LDADD = $(LDADDS)
+
+stress_threads_qt5_SOURCES =                   \
+       stress-threads-qt5.cpp
+
+stress_threads_qt5_LDADD = $(LDADDS)
+
+clean-generic:
+	rm -f *.moc
+
+if BUILD_POPPLER_QT5
+TESTS = \
+	check_attachments	\
+	check_actualtext	\
+	check_dateConversion 	\
+	check_fonts		\
+	check_links		\
+	check_metadata         	\
+	check_optcontent	\
+	check_permissions      	\
+	check_pagelabelinfo    	\
+	check_pagemode    	\
+	check_password    	\
+	check_pagelayout	\
+	check_search		\
+	check_strings		\
+	check_lexer		\
+	check_goostring
+
+check_PROGRAMS = $(TESTS)
+
+check_attachments_SOURCES = check_attachments.cpp
+check_attachments.$(OBJEXT): check_attachments.moc
+check_attachments_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_actualtext_SOURCES = check_actualtext.cpp
+check_actualtext.$(OBJEXT): check_actualtext.moc
+check_actualtext_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_dateConversion_SOURCES = check_dateConversion.cpp
+check_dateConversion.$(OBJEXT): check_dateConversion.moc
+check_dateConversion_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_fonts_SOURCES = check_fonts.cpp
+check_fonts.$(OBJEXT): check_fonts.moc
+check_fonts_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_links_SOURCES = check_links.cpp
+check_links.$(OBJEXT): check_links.moc
+check_links_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_metadata_SOURCES = check_metadata.cpp
+check_metadata.$(OBJEXT): check_metadata.moc
+check_metadata_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_optcontent_SOURCES = check_optcontent.cpp
+check_optcontent.$(OBJEXT): check_optcontent.moc
+check_optcontent_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_pagemode_SOURCES = check_pagemode.cpp
+check_pagemode.$(OBJEXT): check_pagemode.moc
+check_pagemode_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_permissions_SOURCES = check_permissions.cpp
+check_permissions.$(OBJEXT): check_permissions.moc
+check_permissions_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_pagelayout_SOURCES = check_pagelayout.cpp
+check_pagelayout.$(OBJEXT): check_pagelayout.moc
+check_pagelayout_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_password_SOURCES = check_password.cpp
+check_password.$(OBJEXT): check_password.moc
+check_password_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_search_SOURCES = check_search.cpp
+check_search.$(OBJEXT): check_search.moc
+check_search_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_strings_SOURCES = check_strings.cpp
+check_strings.$(OBJEXT): check_strings.moc
+check_strings_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_lexer_SOURCES = check_lexer.cpp
+check_lexer.$(OBJEXT): check_lexer.moc
+check_lexer_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_pagelabelinfo_SOURCES = check_pagelabelinfo.cpp
+check_pagelabelinfo.$(OBJEXT): check_pagelabelinfo.moc
+check_pagelabelinfo_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+check_goostring_SOURCES = check_goostring.cpp
+check_goostring.$(OBJEXT): check_goostring.moc
+check_goostring_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+
+endif
+
diff --git a/qt5/tests/Makefile.in b/qt5/tests/Makefile.in
new file mode 100644
index 00000000..c4c71741
--- /dev/null
+++ b/qt5/tests/Makefile.in
@@ -0,0 +1,1586 @@
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = test-poppler-qt5$(EXEEXT) \
+	stress-poppler-qt5$(EXEEXT) poppler-fonts$(EXEEXT) \
+	test-password-qt5$(EXEEXT) stress-poppler-dir$(EXEEXT) \
+	poppler-attachments$(EXEEXT) poppler-texts$(EXEEXT) \
+	poppler-forms$(EXEEXT) stress-threads-qt5$(EXEEXT)
+@BUILD_POPPLER_QT5_TRUE@TESTS = check_attachments$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_actualtext$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_dateConversion$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_fonts$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_links$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_metadata$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_optcontent$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_permissions$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_pagelabelinfo$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_pagemode$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_password$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_pagelayout$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_search$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_strings$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_lexer$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_goostring$(EXEEXT)
+@BUILD_POPPLER_QT5_TRUE@check_PROGRAMS = $(am__EXEEXT_1)
+subdir = qt5/tests
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(top_srcdir)/test-driver
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
+	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h \
+	$(top_builddir)/poppler/poppler-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@BUILD_POPPLER_QT5_TRUE@am__EXEEXT_1 = check_attachments$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_actualtext$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_dateConversion$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_fonts$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_links$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_metadata$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_optcontent$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_permissions$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_pagelabelinfo$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_pagemode$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_password$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_pagelayout$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_search$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_strings$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_lexer$(EXEEXT) \
+@BUILD_POPPLER_QT5_TRUE@	check_goostring$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am__check_actualtext_SOURCES_DIST = check_actualtext.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_actualtext_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_actualtext.$(OBJEXT)
+check_actualtext_OBJECTS = $(am_check_actualtext_OBJECTS)
+am__DEPENDENCIES_1 =
+am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
+	$(top_builddir)/qt5/src/libpoppler-qt5.la \
+	$(am__DEPENDENCIES_1)
+@BUILD_POPPLER_QT5_TRUE@check_actualtext_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am__check_attachments_SOURCES_DIST = check_attachments.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_attachments_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_attachments.$(OBJEXT)
+check_attachments_OBJECTS = $(am_check_attachments_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_attachments_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_dateConversion_SOURCES_DIST = check_dateConversion.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_dateConversion_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_dateConversion.$(OBJEXT)
+check_dateConversion_OBJECTS = $(am_check_dateConversion_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_dateConversion_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_fonts_SOURCES_DIST = check_fonts.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_fonts_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_fonts.$(OBJEXT)
+check_fonts_OBJECTS = $(am_check_fonts_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_fonts_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_goostring_SOURCES_DIST = check_goostring.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_goostring_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_goostring.$(OBJEXT)
+check_goostring_OBJECTS = $(am_check_goostring_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_goostring_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_lexer_SOURCES_DIST = check_lexer.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_lexer_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_lexer.$(OBJEXT)
+check_lexer_OBJECTS = $(am_check_lexer_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_lexer_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_links_SOURCES_DIST = check_links.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_links_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_links.$(OBJEXT)
+check_links_OBJECTS = $(am_check_links_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_links_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_metadata_SOURCES_DIST = check_metadata.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_metadata_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_metadata.$(OBJEXT)
+check_metadata_OBJECTS = $(am_check_metadata_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_metadata_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_optcontent_SOURCES_DIST = check_optcontent.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_optcontent_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_optcontent.$(OBJEXT)
+check_optcontent_OBJECTS = $(am_check_optcontent_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_optcontent_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_pagelabelinfo_SOURCES_DIST = check_pagelabelinfo.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_pagelabelinfo_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_pagelabelinfo.$(OBJEXT)
+check_pagelabelinfo_OBJECTS = $(am_check_pagelabelinfo_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_pagelabelinfo_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_pagelayout_SOURCES_DIST = check_pagelayout.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_pagelayout_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_pagelayout.$(OBJEXT)
+check_pagelayout_OBJECTS = $(am_check_pagelayout_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_pagelayout_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_pagemode_SOURCES_DIST = check_pagemode.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_pagemode_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_pagemode.$(OBJEXT)
+check_pagemode_OBJECTS = $(am_check_pagemode_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_pagemode_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_password_SOURCES_DIST = check_password.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_password_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_password.$(OBJEXT)
+check_password_OBJECTS = $(am_check_password_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_password_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_permissions_SOURCES_DIST = check_permissions.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_permissions_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_permissions.$(OBJEXT)
+check_permissions_OBJECTS = $(am_check_permissions_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_permissions_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_search_SOURCES_DIST = check_search.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_search_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_search.$(OBJEXT)
+check_search_OBJECTS = $(am_check_search_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_search_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am__check_strings_SOURCES_DIST = check_strings.cpp
+@BUILD_POPPLER_QT5_TRUE@am_check_strings_OBJECTS =  \
+@BUILD_POPPLER_QT5_TRUE@	check_strings.$(OBJEXT)
+check_strings_OBJECTS = $(am_check_strings_OBJECTS)
+@BUILD_POPPLER_QT5_TRUE@check_strings_DEPENDENCIES =  \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_2) \
+@BUILD_POPPLER_QT5_TRUE@	$(am__DEPENDENCIES_1)
+am_poppler_attachments_OBJECTS = poppler-attachments.$(OBJEXT)
+poppler_attachments_OBJECTS = $(am_poppler_attachments_OBJECTS)
+poppler_attachments_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_poppler_fonts_OBJECTS = poppler-fonts.$(OBJEXT)
+poppler_fonts_OBJECTS = $(am_poppler_fonts_OBJECTS)
+poppler_fonts_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_poppler_forms_OBJECTS = poppler-forms.$(OBJEXT)
+poppler_forms_OBJECTS = $(am_poppler_forms_OBJECTS)
+poppler_forms_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_poppler_texts_OBJECTS = poppler-texts.$(OBJEXT)
+poppler_texts_OBJECTS = $(am_poppler_texts_OBJECTS)
+poppler_texts_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_stress_poppler_dir_OBJECTS = stress-poppler-dir.$(OBJEXT)
+stress_poppler_dir_OBJECTS = $(am_stress_poppler_dir_OBJECTS)
+stress_poppler_dir_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_stress_poppler_qt5_OBJECTS = stress-poppler-qt5.$(OBJEXT)
+stress_poppler_qt5_OBJECTS = $(am_stress_poppler_qt5_OBJECTS)
+stress_poppler_qt5_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_stress_threads_qt5_OBJECTS = stress-threads-qt5.$(OBJEXT)
+stress_threads_qt5_OBJECTS = $(am_stress_threads_qt5_OBJECTS)
+stress_threads_qt5_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_password_qt5_OBJECTS = test-password-qt5.$(OBJEXT)
+test_password_qt5_OBJECTS = $(am_test_password_qt5_OBJECTS)
+test_password_qt5_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am_test_poppler_qt5_OBJECTS = test-poppler-qt5.$(OBJEXT)
+test_poppler_qt5_OBJECTS = $(am_test_poppler_qt5_OBJECTS)
+test_poppler_qt5_DEPENDENCIES = $(am__DEPENDENCIES_2)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(check_actualtext_SOURCES) $(check_attachments_SOURCES) \
+	$(check_dateConversion_SOURCES) $(check_fonts_SOURCES) \
+	$(check_goostring_SOURCES) $(check_lexer_SOURCES) \
+	$(check_links_SOURCES) $(check_metadata_SOURCES) \
+	$(check_optcontent_SOURCES) $(check_pagelabelinfo_SOURCES) \
+	$(check_pagelayout_SOURCES) $(check_pagemode_SOURCES) \
+	$(check_password_SOURCES) $(check_permissions_SOURCES) \
+	$(check_search_SOURCES) $(check_strings_SOURCES) \
+	$(poppler_attachments_SOURCES) $(poppler_fonts_SOURCES) \
+	$(poppler_forms_SOURCES) $(poppler_texts_SOURCES) \
+	$(stress_poppler_dir_SOURCES) $(stress_poppler_qt5_SOURCES) \
+	$(stress_threads_qt5_SOURCES) $(test_password_qt5_SOURCES) \
+	$(test_poppler_qt5_SOURCES)
+DIST_SOURCES = $(am__check_actualtext_SOURCES_DIST) \
+	$(am__check_attachments_SOURCES_DIST) \
+	$(am__check_dateConversion_SOURCES_DIST) \
+	$(am__check_fonts_SOURCES_DIST) \
+	$(am__check_goostring_SOURCES_DIST) \
+	$(am__check_lexer_SOURCES_DIST) \
+	$(am__check_links_SOURCES_DIST) \
+	$(am__check_metadata_SOURCES_DIST) \
+	$(am__check_optcontent_SOURCES_DIST) \
+	$(am__check_pagelabelinfo_SOURCES_DIST) \
+	$(am__check_pagelayout_SOURCES_DIST) \
+	$(am__check_pagemode_SOURCES_DIST) \
+	$(am__check_password_SOURCES_DIST) \
+	$(am__check_permissions_SOURCES_DIST) \
+	$(am__check_search_SOURCES_DIST) \
+	$(am__check_strings_SOURCES_DIST) \
+	$(poppler_attachments_SOURCES) $(poppler_fonts_SOURCES) \
+	$(poppler_forms_SOURCES) $(poppler_texts_SOURCES) \
+	$(stress_poppler_dir_SOURCES) $(stress_poppler_qt5_SOURCES) \
+	$(stress_threads_qt5_SOURCES) $(test_password_qt5_SOURCES) \
+	$(test_poppler_qt5_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_CFLAGS = @CAIRO_CFLAGS@
+CAIRO_FEATURE = @CAIRO_FEATURE@
+CAIRO_LIBS = @CAIRO_LIBS@
+CAIRO_REQ = @CAIRO_REQ@
+CAIRO_VERSION = @CAIRO_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_CONFIG = @FREETYPE_CONFIG@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQ = @GLIB_REQ@
+GLIB_REQUIRED = @GLIB_REQUIRED@
+GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_TEST_CFLAGS = @GTK_TEST_CFLAGS@
+GTK_TEST_LIBS = @GTK_TEST_LIBS@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCMS_CFLAGS = @LCMS_CFLAGS@
+LCMS_LIBS = @LCMS_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
+LIBCURL_LIBS = @LIBCURL_LIBS@
+LIBICONV = @LIBICONV@
+LIBJPEG_CFLAGS = @LIBJPEG_CFLAGS@
+LIBJPEG_LIBS = @LIBJPEG_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBOPENJPEG_CFLAGS = @LIBOPENJPEG_CFLAGS@
+LIBOPENJPEG_LIBS = @LIBOPENJPEG_LIBS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTIFF_CFLAGS = @LIBTIFF_CFLAGS@
+LIBTIFF_CFLAGSS = @LIBTIFF_CFLAGSS@
+LIBTIFF_LIBS = @LIBTIFF_LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PC_REQUIRES = @PC_REQUIRES@
+PC_REQUIRES_PRIVATE = @PC_REQUIRES_PRIVATE@
+PDFTOCAIRO_CFLAGS = @PDFTOCAIRO_CFLAGS@
+PDFTOCAIRO_LIBS = @PDFTOCAIRO_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POPPLER_DATADIR = @POPPLER_DATADIR@
+POPPLER_GLIB_CFLAGS = @POPPLER_GLIB_CFLAGS@
+POPPLER_GLIB_DISABLE_DEPRECATED = @POPPLER_GLIB_DISABLE_DEPRECATED@
+POPPLER_GLIB_DISABLE_SINGLE_INCLUDES = @POPPLER_GLIB_DISABLE_SINGLE_INCLUDES@
+POPPLER_GLIB_LIBS = @POPPLER_GLIB_LIBS@
+POPPLER_MAJOR_VERSION = @POPPLER_MAJOR_VERSION@
+POPPLER_MICRO_VERSION = @POPPLER_MICRO_VERSION@
+POPPLER_MINOR_VERSION = @POPPLER_MINOR_VERSION@
+POPPLER_QT4_CFLAGS = @POPPLER_QT4_CFLAGS@
+POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
+POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
+POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
+POPPLER_VERSION = @POPPLER_VERSION@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TESTDATADIR = @TESTDATADIR@
+VERSION = @VERSION@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+create_shared_lib = @create_shared_lib@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+win32_libs = @win32_libs@
+AM_LDFLAGS = @auto_import_flags@
+INCLUDES = \
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler			\
+	-I$(top_srcdir)/qt5/src			\
+	-DTESTDATADIR=\"$(TESTDATADIR)\"        \
+	$(POPPLER_QT5_CFLAGS)
+
+LDADDS = \
+	$(top_builddir)/poppler/libpoppler.la	\
+	$(top_builddir)/qt5/src/libpoppler-qt5.la	\
+	$(POPPLER_QT5_LIBS)
+
+test_poppler_qt5_SOURCES = \
+       test-poppler-qt5.cpp
+
+test_poppler_qt5_LDADD = $(LDADDS)
+test_password_qt5_SOURCES = \
+       test-password-qt5.cpp
+
+test_password_qt5_LDADD = $(LDADDS)
+poppler_fonts_SOURCES = \
+       poppler-fonts.cpp
+
+poppler_fonts_LDADD = $(LDADDS)
+poppler_attachments_SOURCES = \
+       poppler-attachments.cpp
+
+poppler_attachments_LDADD = $(LDADDS)
+poppler_texts_SOURCES = \
+       poppler-texts.cpp
+
+poppler_texts_LDADD = $(LDADDS)
+poppler_forms_SOURCES = \
+       poppler-forms.cpp
+
+poppler_forms_LDADD = $(LDADDS)
+stress_poppler_qt5_SOURCES = \
+       stress-poppler-qt5.cpp
+
+stress_poppler_qt5_LDADD = $(LDADDS)
+stress_poppler_dir_SOURCES = \
+       stress-poppler-dir.cpp
+
+stress_poppler_dir_LDADD = $(LDADDS)
+stress_threads_qt5_SOURCES = \
+       stress-threads-qt5.cpp
+
+stress_threads_qt5_LDADD = $(LDADDS)
+@BUILD_POPPLER_QT5_TRUE@check_attachments_SOURCES = check_attachments.cpp
+@BUILD_POPPLER_QT5_TRUE@check_attachments_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_actualtext_SOURCES = check_actualtext.cpp
+@BUILD_POPPLER_QT5_TRUE@check_actualtext_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_dateConversion_SOURCES = check_dateConversion.cpp
+@BUILD_POPPLER_QT5_TRUE@check_dateConversion_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_fonts_SOURCES = check_fonts.cpp
+@BUILD_POPPLER_QT5_TRUE@check_fonts_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_links_SOURCES = check_links.cpp
+@BUILD_POPPLER_QT5_TRUE@check_links_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_metadata_SOURCES = check_metadata.cpp
+@BUILD_POPPLER_QT5_TRUE@check_metadata_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_optcontent_SOURCES = check_optcontent.cpp
+@BUILD_POPPLER_QT5_TRUE@check_optcontent_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_pagemode_SOURCES = check_pagemode.cpp
+@BUILD_POPPLER_QT5_TRUE@check_pagemode_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_permissions_SOURCES = check_permissions.cpp
+@BUILD_POPPLER_QT5_TRUE@check_permissions_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_pagelayout_SOURCES = check_pagelayout.cpp
+@BUILD_POPPLER_QT5_TRUE@check_pagelayout_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_password_SOURCES = check_password.cpp
+@BUILD_POPPLER_QT5_TRUE@check_password_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_search_SOURCES = check_search.cpp
+@BUILD_POPPLER_QT5_TRUE@check_search_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_strings_SOURCES = check_strings.cpp
+@BUILD_POPPLER_QT5_TRUE@check_strings_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_lexer_SOURCES = check_lexer.cpp
+@BUILD_POPPLER_QT5_TRUE@check_lexer_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_pagelabelinfo_SOURCES = check_pagelabelinfo.cpp
+@BUILD_POPPLER_QT5_TRUE@check_pagelabelinfo_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+@BUILD_POPPLER_QT5_TRUE@check_goostring_SOURCES = check_goostring.cpp
+@BUILD_POPPLER_QT5_TRUE@check_goostring_LDADD = $(LDADDS) $(POPPLER_QT5_TEST_LIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .log .moc .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign qt5/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign qt5/tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+check_actualtext$(EXEEXT): $(check_actualtext_OBJECTS) $(check_actualtext_DEPENDENCIES) $(EXTRA_check_actualtext_DEPENDENCIES) 
+	@rm -f check_actualtext$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_actualtext_OBJECTS) $(check_actualtext_LDADD) $(LIBS)
+
+check_attachments$(EXEEXT): $(check_attachments_OBJECTS) $(check_attachments_DEPENDENCIES) $(EXTRA_check_attachments_DEPENDENCIES) 
+	@rm -f check_attachments$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_attachments_OBJECTS) $(check_attachments_LDADD) $(LIBS)
+
+check_dateConversion$(EXEEXT): $(check_dateConversion_OBJECTS) $(check_dateConversion_DEPENDENCIES) $(EXTRA_check_dateConversion_DEPENDENCIES) 
+	@rm -f check_dateConversion$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_dateConversion_OBJECTS) $(check_dateConversion_LDADD) $(LIBS)
+
+check_fonts$(EXEEXT): $(check_fonts_OBJECTS) $(check_fonts_DEPENDENCIES) $(EXTRA_check_fonts_DEPENDENCIES) 
+	@rm -f check_fonts$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_fonts_OBJECTS) $(check_fonts_LDADD) $(LIBS)
+
+check_goostring$(EXEEXT): $(check_goostring_OBJECTS) $(check_goostring_DEPENDENCIES) $(EXTRA_check_goostring_DEPENDENCIES) 
+	@rm -f check_goostring$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_goostring_OBJECTS) $(check_goostring_LDADD) $(LIBS)
+
+check_lexer$(EXEEXT): $(check_lexer_OBJECTS) $(check_lexer_DEPENDENCIES) $(EXTRA_check_lexer_DEPENDENCIES) 
+	@rm -f check_lexer$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_lexer_OBJECTS) $(check_lexer_LDADD) $(LIBS)
+
+check_links$(EXEEXT): $(check_links_OBJECTS) $(check_links_DEPENDENCIES) $(EXTRA_check_links_DEPENDENCIES) 
+	@rm -f check_links$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_links_OBJECTS) $(check_links_LDADD) $(LIBS)
+
+check_metadata$(EXEEXT): $(check_metadata_OBJECTS) $(check_metadata_DEPENDENCIES) $(EXTRA_check_metadata_DEPENDENCIES) 
+	@rm -f check_metadata$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_metadata_OBJECTS) $(check_metadata_LDADD) $(LIBS)
+
+check_optcontent$(EXEEXT): $(check_optcontent_OBJECTS) $(check_optcontent_DEPENDENCIES) $(EXTRA_check_optcontent_DEPENDENCIES) 
+	@rm -f check_optcontent$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_optcontent_OBJECTS) $(check_optcontent_LDADD) $(LIBS)
+
+check_pagelabelinfo$(EXEEXT): $(check_pagelabelinfo_OBJECTS) $(check_pagelabelinfo_DEPENDENCIES) $(EXTRA_check_pagelabelinfo_DEPENDENCIES) 
+	@rm -f check_pagelabelinfo$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_pagelabelinfo_OBJECTS) $(check_pagelabelinfo_LDADD) $(LIBS)
+
+check_pagelayout$(EXEEXT): $(check_pagelayout_OBJECTS) $(check_pagelayout_DEPENDENCIES) $(EXTRA_check_pagelayout_DEPENDENCIES) 
+	@rm -f check_pagelayout$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_pagelayout_OBJECTS) $(check_pagelayout_LDADD) $(LIBS)
+
+check_pagemode$(EXEEXT): $(check_pagemode_OBJECTS) $(check_pagemode_DEPENDENCIES) $(EXTRA_check_pagemode_DEPENDENCIES) 
+	@rm -f check_pagemode$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_pagemode_OBJECTS) $(check_pagemode_LDADD) $(LIBS)
+
+check_password$(EXEEXT): $(check_password_OBJECTS) $(check_password_DEPENDENCIES) $(EXTRA_check_password_DEPENDENCIES) 
+	@rm -f check_password$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_password_OBJECTS) $(check_password_LDADD) $(LIBS)
+
+check_permissions$(EXEEXT): $(check_permissions_OBJECTS) $(check_permissions_DEPENDENCIES) $(EXTRA_check_permissions_DEPENDENCIES) 
+	@rm -f check_permissions$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_permissions_OBJECTS) $(check_permissions_LDADD) $(LIBS)
+
+check_search$(EXEEXT): $(check_search_OBJECTS) $(check_search_DEPENDENCIES) $(EXTRA_check_search_DEPENDENCIES) 
+	@rm -f check_search$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_search_OBJECTS) $(check_search_LDADD) $(LIBS)
+
+check_strings$(EXEEXT): $(check_strings_OBJECTS) $(check_strings_DEPENDENCIES) $(EXTRA_check_strings_DEPENDENCIES) 
+	@rm -f check_strings$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(check_strings_OBJECTS) $(check_strings_LDADD) $(LIBS)
+
+poppler-attachments$(EXEEXT): $(poppler_attachments_OBJECTS) $(poppler_attachments_DEPENDENCIES) $(EXTRA_poppler_attachments_DEPENDENCIES) 
+	@rm -f poppler-attachments$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(poppler_attachments_OBJECTS) $(poppler_attachments_LDADD) $(LIBS)
+
+poppler-fonts$(EXEEXT): $(poppler_fonts_OBJECTS) $(poppler_fonts_DEPENDENCIES) $(EXTRA_poppler_fonts_DEPENDENCIES) 
+	@rm -f poppler-fonts$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(poppler_fonts_OBJECTS) $(poppler_fonts_LDADD) $(LIBS)
+
+poppler-forms$(EXEEXT): $(poppler_forms_OBJECTS) $(poppler_forms_DEPENDENCIES) $(EXTRA_poppler_forms_DEPENDENCIES) 
+	@rm -f poppler-forms$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(poppler_forms_OBJECTS) $(poppler_forms_LDADD) $(LIBS)
+
+poppler-texts$(EXEEXT): $(poppler_texts_OBJECTS) $(poppler_texts_DEPENDENCIES) $(EXTRA_poppler_texts_DEPENDENCIES) 
+	@rm -f poppler-texts$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(poppler_texts_OBJECTS) $(poppler_texts_LDADD) $(LIBS)
+
+stress-poppler-dir$(EXEEXT): $(stress_poppler_dir_OBJECTS) $(stress_poppler_dir_DEPENDENCIES) $(EXTRA_stress_poppler_dir_DEPENDENCIES) 
+	@rm -f stress-poppler-dir$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(stress_poppler_dir_OBJECTS) $(stress_poppler_dir_LDADD) $(LIBS)
+
+stress-poppler-qt5$(EXEEXT): $(stress_poppler_qt5_OBJECTS) $(stress_poppler_qt5_DEPENDENCIES) $(EXTRA_stress_poppler_qt5_DEPENDENCIES) 
+	@rm -f stress-poppler-qt5$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(stress_poppler_qt5_OBJECTS) $(stress_poppler_qt5_LDADD) $(LIBS)
+
+stress-threads-qt5$(EXEEXT): $(stress_threads_qt5_OBJECTS) $(stress_threads_qt5_DEPENDENCIES) $(EXTRA_stress_threads_qt5_DEPENDENCIES) 
+	@rm -f stress-threads-qt5$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(stress_threads_qt5_OBJECTS) $(stress_threads_qt5_LDADD) $(LIBS)
+
+test-password-qt5$(EXEEXT): $(test_password_qt5_OBJECTS) $(test_password_qt5_DEPENDENCIES) $(EXTRA_test_password_qt5_DEPENDENCIES) 
+	@rm -f test-password-qt5$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(test_password_qt5_OBJECTS) $(test_password_qt5_LDADD) $(LIBS)
+
+test-poppler-qt5$(EXEEXT): $(test_poppler_qt5_OBJECTS) $(test_poppler_qt5_DEPENDENCIES) $(EXTRA_test_poppler_qt5_DEPENDENCIES) 
+	@rm -f test-poppler-qt5$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(test_poppler_qt5_OBJECTS) $(test_poppler_qt5_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_actualtext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_attachments.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dateConversion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_fonts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_goostring.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_lexer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_links.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_metadata.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_optcontent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pagelabelinfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pagelayout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pagemode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_password.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_permissions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_search.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_strings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-attachments.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-fonts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-forms.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poppler-texts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-poppler-dir.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-poppler-qt5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stress-threads-qt5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-password-qt5.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-poppler-qt5.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+check_attachments.log: check_attachments$(EXEEXT)
+	@p='check_attachments$(EXEEXT)'; \
+	b='check_attachments'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_actualtext.log: check_actualtext$(EXEEXT)
+	@p='check_actualtext$(EXEEXT)'; \
+	b='check_actualtext'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_dateConversion.log: check_dateConversion$(EXEEXT)
+	@p='check_dateConversion$(EXEEXT)'; \
+	b='check_dateConversion'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_fonts.log: check_fonts$(EXEEXT)
+	@p='check_fonts$(EXEEXT)'; \
+	b='check_fonts'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_links.log: check_links$(EXEEXT)
+	@p='check_links$(EXEEXT)'; \
+	b='check_links'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_metadata.log: check_metadata$(EXEEXT)
+	@p='check_metadata$(EXEEXT)'; \
+	b='check_metadata'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_optcontent.log: check_optcontent$(EXEEXT)
+	@p='check_optcontent$(EXEEXT)'; \
+	b='check_optcontent'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_permissions.log: check_permissions$(EXEEXT)
+	@p='check_permissions$(EXEEXT)'; \
+	b='check_permissions'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_pagelabelinfo.log: check_pagelabelinfo$(EXEEXT)
+	@p='check_pagelabelinfo$(EXEEXT)'; \
+	b='check_pagelabelinfo'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_pagemode.log: check_pagemode$(EXEEXT)
+	@p='check_pagemode$(EXEEXT)'; \
+	b='check_pagemode'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_password.log: check_password$(EXEEXT)
+	@p='check_password$(EXEEXT)'; \
+	b='check_password'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_pagelayout.log: check_pagelayout$(EXEEXT)
+	@p='check_pagelayout$(EXEEXT)'; \
+	b='check_pagelayout'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_search.log: check_search$(EXEEXT)
+	@p='check_search$(EXEEXT)'; \
+	b='check_search'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_strings.log: check_strings$(EXEEXT)
+	@p='check_strings$(EXEEXT)'; \
+	b='check_strings'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_lexer.log: check_lexer$(EXEEXT)
+	@p='check_lexer$(EXEEXT)'; \
+	b='check_lexer'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+check_goostring.log: check_goostring$(EXEEXT)
+	@p='check_goostring$(EXEEXT)'; \
+	b='check_goostring'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+	uninstall-am
+
+
+SUFFIXES: .moc
+
+.cpp.moc:
+	$(AM_V_GEN) $(MOCQT5) -i $< -o $@
+
+clean-generic:
+	rm -f *.moc
+@BUILD_POPPLER_QT5_TRUE@check_attachments.$(OBJEXT): check_attachments.moc
+@BUILD_POPPLER_QT5_TRUE@check_actualtext.$(OBJEXT): check_actualtext.moc
+@BUILD_POPPLER_QT5_TRUE@check_dateConversion.$(OBJEXT): check_dateConversion.moc
+@BUILD_POPPLER_QT5_TRUE@check_fonts.$(OBJEXT): check_fonts.moc
+@BUILD_POPPLER_QT5_TRUE@check_links.$(OBJEXT): check_links.moc
+@BUILD_POPPLER_QT5_TRUE@check_metadata.$(OBJEXT): check_metadata.moc
+@BUILD_POPPLER_QT5_TRUE@check_optcontent.$(OBJEXT): check_optcontent.moc
+@BUILD_POPPLER_QT5_TRUE@check_pagemode.$(OBJEXT): check_pagemode.moc
+@BUILD_POPPLER_QT5_TRUE@check_permissions.$(OBJEXT): check_permissions.moc
+@BUILD_POPPLER_QT5_TRUE@check_pagelayout.$(OBJEXT): check_pagelayout.moc
+@BUILD_POPPLER_QT5_TRUE@check_password.$(OBJEXT): check_password.moc
+@BUILD_POPPLER_QT5_TRUE@check_search.$(OBJEXT): check_search.moc
+@BUILD_POPPLER_QT5_TRUE@check_strings.$(OBJEXT): check_strings.moc
+@BUILD_POPPLER_QT5_TRUE@check_lexer.$(OBJEXT): check_lexer.moc
+@BUILD_POPPLER_QT5_TRUE@check_pagelabelinfo.$(OBJEXT): check_pagelabelinfo.moc
+@BUILD_POPPLER_QT5_TRUE@check_goostring.$(OBJEXT): check_goostring.moc
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/qt5/tests/check_actualtext.cpp b/qt5/tests/check_actualtext.cpp
new file mode 100644
index 00000000..a7bbcce6
--- /dev/null
+++ b/qt5/tests/check_actualtext.cpp
@@ -0,0 +1,33 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+#include <QtCore/QFile>
+
+class TestActualText: public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkActualText1();
+};
+
+void TestActualText::checkActualText1()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf");
+    QVERIFY( doc );
+
+    Poppler::Page *page = doc->page(0);
+    QVERIFY( page );
+
+    QCOMPARE( page->text(QRectF()), QString("The slow brown fox jumps over the black dog.") );
+
+    delete page;
+
+    delete doc;
+}
+
+QTEST_MAIN(TestActualText)
+
+#include "check_actualtext.moc"
+
diff --git a/qt5/tests/check_attachments.cpp b/qt5/tests/check_attachments.cpp
new file mode 100644
index 00000000..d780919a
--- /dev/null
+++ b/qt5/tests/check_attachments.cpp
@@ -0,0 +1,157 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+#include <QtCore/QFile>
+
+class TestAttachments: public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkNoAttachments();
+    void checkAttach1();
+    void checkAttach2();
+    void checkAttach3();
+    void checkAttach4();
+};
+
+void TestAttachments::checkNoAttachments()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+
+    QCOMPARE( doc->hasEmbeddedFiles(), false );
+
+    delete doc;
+}
+
+void TestAttachments::checkAttach1()
+{
+
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithAttachments.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->hasEmbeddedFiles() );
+
+    QList<Poppler::EmbeddedFile*> fileList = doc->embeddedFiles();
+    QCOMPARE( fileList.size(), 2 );
+
+    Poppler::EmbeddedFile *embfile = fileList.at(0);
+    QCOMPARE( embfile->name(), QString( "kroller.png" ) );
+    QCOMPARE( embfile->description(), QString() );
+    QCOMPARE( embfile->createDate(), QDateTime( QDate(), QTime() ) );
+    QCOMPARE( embfile->modDate(), QDateTime( QDate(), QTime() ) );
+    QCOMPARE( embfile->mimeType(), QString() );
+
+    QFile file(TESTDATADIR "/unittestcases/kroller.png" );
+    QVERIFY(  file.open( QIODevice::ReadOnly ) );
+    QByteArray krollerData = file.readAll();
+    QByteArray embdata = embfile->data();
+    QCOMPARE( krollerData, embdata );
+	    
+
+    Poppler::EmbeddedFile *embfile2 = fileList.at(1);
+    QCOMPARE( embfile2->name(), QString("gnome-64.gif") );
+    QCOMPARE( embfile2->description(), QString() );
+    QCOMPARE( embfile2->modDate(), QDateTime( QDate(), QTime() ) );
+    QCOMPARE( embfile2->createDate(), QDateTime( QDate(), QTime() ) );
+    QCOMPARE( embfile2->mimeType(), QString() );
+
+    QFile file2(TESTDATADIR "/unittestcases/gnome-64.gif" );
+    QVERIFY(  file2.open( QIODevice::ReadOnly ) );
+    QByteArray g64Data = file2.readAll();
+    QByteArray emb2data = embfile2->data();
+    QCOMPARE( g64Data, emb2data );
+
+    delete doc;
+}
+
+
+void TestAttachments::checkAttach2()
+{
+
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/A6EmbeddedFiles.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->hasEmbeddedFiles() );
+
+    QList<Poppler::EmbeddedFile*> fileList;
+    fileList = doc->embeddedFiles();
+    QCOMPARE( fileList.size(), 3 );
+
+    Poppler::EmbeddedFile *embfile1 = fileList.at(0);
+    QCOMPARE( embfile1->name(), QString("Acro7 thoughts") );
+    QCOMPARE( embfile1->description(), QString() );
+    QCOMPARE( embfile1->createDate(), QDateTime( QDate( 2003, 8, 4 ), QTime( 13, 54, 54), Qt::UTC ) );
+    QCOMPARE( embfile1->modDate(), QDateTime( QDate( 2003, 8, 4 ), QTime( 14, 15, 27), Qt::UTC ) );
+    QCOMPARE( embfile1->mimeType(), QString("text/xml") );
+
+    Poppler::EmbeddedFile *embfile2 = fileList.at(1);
+    QCOMPARE( embfile2->name(), QString("acro transitions 1.xls") );
+    QCOMPARE( embfile2->description(), QString() );
+    QCOMPARE( embfile2->createDate(), QDateTime( QDate( 2003, 7, 18 ), QTime( 21, 7, 16), Qt::UTC ) );
+    QCOMPARE( embfile2->modDate(), QDateTime( QDate( 2003, 7, 22 ), QTime( 13, 4, 40), Qt::UTC ) );
+    QCOMPARE( embfile2->mimeType(), QString("application/excel") );
+
+    Poppler::EmbeddedFile *embfile3 = fileList.at(2);
+    QCOMPARE( embfile3->name(), QString("apago_pdfe_wide.gif") );
+    QCOMPARE( embfile3->description(), QString() );
+    QCOMPARE( embfile3->createDate(), QDateTime( QDate( 2003, 1, 31 ), QTime( 15, 54, 29), Qt::UTC ) );
+    QCOMPARE( embfile3->modDate(), QDateTime( QDate( 2003, 1, 31 ), QTime( 15, 52, 58), Qt::UTC ) );
+    QCOMPARE( embfile3->mimeType(), QString() );
+
+    delete doc;
+}
+
+void TestAttachments::checkAttach3()
+{
+
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/shapes+attachments.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->hasEmbeddedFiles() );
+
+    QList<Poppler::EmbeddedFile*> fileList;
+    fileList = doc->embeddedFiles();
+    QCOMPARE( fileList.size(), 1 );
+
+    Poppler::EmbeddedFile *embfile = fileList.at(0);
+    QCOMPARE( embfile->name(), QString( "ADEX1.xpdf.pgp" ) );
+    QCOMPARE( embfile->description(), QString() );
+    QCOMPARE( embfile->createDate(), QDateTime( QDate( 2004, 3, 29 ), QTime( 19, 37, 16), Qt::UTC ) );
+    QCOMPARE( embfile->modDate(), QDateTime( QDate( 2004, 3, 29 ), QTime( 19, 37, 16), Qt::UTC ) );
+    QCOMPARE( embfile->mimeType(), QString() );
+    delete doc;
+
+}
+
+void TestAttachments::checkAttach4()
+{
+
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/imageretrieve+attachment.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->hasEmbeddedFiles() );
+
+    QList<Poppler::EmbeddedFile*> fileList;
+    fileList = doc->embeddedFiles();
+    QCOMPARE( fileList.size(), 1 );
+
+    Poppler::EmbeddedFile *embfile = fileList.at(0);
+    QCOMPARE( embfile->name(), QString( "export-altona.csv" ) );
+    QCOMPARE( embfile->description(), QString("Altona Export") );
+    QCOMPARE( embfile->createDate(), QDateTime( QDate( 2005, 8, 30 ), QTime( 20, 49, 35), Qt::UTC ) );
+    QCOMPARE( embfile->modDate(), QDateTime( QDate( 2005, 8, 30 ), QTime( 20, 49, 52), Qt::UTC ) );
+    QCOMPARE( embfile->mimeType(), QString("application/vnd.ms-excel") );
+    delete doc;
+
+}
+
+QTEST_MAIN(TestAttachments)
+#include "check_attachments.moc"
+
diff --git a/qt5/tests/check_dateConversion.cpp b/qt5/tests/check_dateConversion.cpp
new file mode 100644
index 00000000..b1cb8e01
--- /dev/null
+++ b/qt5/tests/check_dateConversion.cpp
@@ -0,0 +1,142 @@
+#include <QtTest/QtTest>
+
+Q_DECLARE_METATYPE(QDate)
+Q_DECLARE_METATYPE(QTime)
+
+#include <poppler-qt5.h>
+
+class TestDateConv: public QObject
+{
+    Q_OBJECT
+private slots:
+    void initTestCase();
+    void checkDates_data();
+    void checkDates();
+    void checkInvalidDates_data();
+    void checkInvalidDates();
+};
+
+void TestDateConv::initTestCase()
+{
+    qRegisterMetaType<QDate>("QDate");
+    qRegisterMetaType<QTime>("QTime");
+}
+
+void TestDateConv::checkDates_data()
+{
+    QTest::addColumn<QByteArray>("input");
+    QTest::addColumn<QDate>("day");
+    QTest::addColumn<QTime>("time");
+
+    // This is a typical case - all data provided
+    QTest::newRow("D:20040101121110")
+      << QByteArray("D:20040101121110Z")
+      << QDate( 2004, 1, 1)
+      << QTime( 12, 11, 10);
+
+    // The D: is strongly recommended, but optional
+    QTest::newRow("20040101121110")
+      << QByteArray("20040101121110Z")
+      << QDate( 2004, 1, 1)
+      << QTime( 12, 11, 10);
+
+    // Only the year is actually required
+    QTest::newRow("D:2006")
+      << QByteArray("D:2006")
+      << QDate( 2006, 1, 1)
+      << QTime( 0, 0, 0);
+
+    QTest::newRow("D:200602")
+      << QByteArray("D:200602")
+      << QDate( 2006, 2, 1)
+      << QTime( 0, 0, 0);
+
+    QTest::newRow("D:20060304")
+      << QByteArray("D:20060304")
+      << QDate( 2006, 3, 4)
+      << QTime( 0, 0, 0);
+
+    QTest::newRow("D:2006030405")
+      << QByteArray("D:2006030405")
+      << QDate( 2006, 3, 4)
+      << QTime( 5, 0, 0);
+
+    QTest::newRow("D:200603040512")
+      << QByteArray("D:200603040512")
+      << QDate( 2006, 3, 4)
+      << QTime( 5, 12, 0);
+
+    // If the timezone isn't specified, I assume UTC
+    QTest::newRow("D:20060304051226")
+      << QByteArray("D:20060304051226")
+      << QDate( 2006, 3, 4)
+      << QTime( 5, 12, 26);
+
+    // Check for real timezone conversions
+    QTest::newRow("D:20030131115258-04'00'")
+      << QByteArray("D:20030131115258-04'00'")
+      << QDate( 2003, 1, 31)
+      << QTime( 15, 52, 58);
+
+    QTest::newRow("D:20030131115258+05'00'")
+      << QByteArray("D:20030131115258+05'00'")
+      << QDate( 2003, 1, 31)
+      << QTime( 6, 52, 58);
+
+    // There are places that have non-hour offsets
+    // Yep, that means you Adelaide.
+    QTest::newRow("D:20030131115258+08'30'")
+      << QByteArray("D:20030131115258+08'30'")
+      << QDate( 2003, 1, 31)
+      << QTime( 3, 22, 58);
+
+    QTest::newRow("D:20030131115258-08'30'")
+      << QByteArray("D:20030131115258-08'30'")
+      << QDate( 2003, 1, 31)
+      << QTime( 20, 22, 58);
+}
+
+void TestDateConv::checkDates()
+{
+    QFETCH(QByteArray, input);
+    QFETCH(QDate, day);
+    QFETCH(QTime, time);
+
+    QCOMPARE( Poppler::convertDate(input.data()), QDateTime(day, time, Qt::UTC) );
+}
+
+void TestDateConv::checkInvalidDates_data()
+{
+    QTest::addColumn<QByteArray>("input");
+
+    // Null data
+    QTest::newRow("Null data")
+      << QByteArray();
+
+    // Empty data
+    QTest::newRow("Empty data")
+      << QByteArray("");
+
+    // Empty data
+    QTest::newRow("One character")
+      << QByteArray("D");
+
+    // Empty data
+    QTest::newRow("'D:'")
+      << QByteArray("D:");
+
+    // Empty data
+    QTest::newRow("Not a date")
+      << QByteArray("D:IAmNotAValidDate");
+}
+
+void TestDateConv::checkInvalidDates()
+{
+    QFETCH(QByteArray, input);
+
+    QCOMPARE(Poppler::convertDate(input.data()), QDateTime());
+}
+
+QTEST_MAIN(TestDateConv)
+
+#include "check_dateConversion.moc"
diff --git a/qt5/tests/check_fonts.cpp b/qt5/tests/check_fonts.cpp
new file mode 100644
index 00000000..5d3c38e9
--- /dev/null
+++ b/qt5/tests/check_fonts.cpp
@@ -0,0 +1,237 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+#include <memory>
+
+class TestFontsData: public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkNoFonts();
+    void checkType1();
+    void checkType3();
+    void checkTrueType();
+    void checkFontIterator();
+    void checkSecondDocumentQuery();
+    void checkMultipleIterations();
+    void checkIteratorFonts();
+};
+
+
+static QList<Poppler::FontInfo> loadFontsViaIterator( Poppler::Document *doc, int from = 0, int count = -1 )
+{
+    int num = count == -1 ? doc->numPages() - from : count;
+    QList<Poppler::FontInfo> list;
+    std::auto_ptr< Poppler::FontIterator > it( doc->newFontIterator( from ) );
+    while ( it->hasNext() && num )
+    {
+        list += it->next();
+        --num;
+    }
+    return list;
+}
+
+namespace Poppler
+{
+static bool operator==( const FontInfo &f1, const FontInfo &f2 )
+{
+    if ( f1.name() != f2.name() )
+        return false;
+    if ( f1.file() != f2.file() )
+        return false;
+    if ( f1.isEmbedded() != f2.isEmbedded() )
+        return false;
+    if ( f1.isSubset() != f2.isSubset() )
+        return false;
+    if ( f1.type() != f2.type() )
+        return false;
+    if ( f1.typeName() != f2.typeName() )
+        return false;
+    return true;
+}
+}
+
+void TestFontsData::checkNoFonts()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/tests/image.pdf");
+    QVERIFY( doc );
+
+    QList<Poppler::FontInfo> listOfFonts = doc->fonts();
+    QCOMPARE( listOfFonts.size(), 0 );
+
+    delete doc;
+}
+
+void TestFontsData::checkType1()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/tests/text.pdf");
+    QVERIFY( doc );
+
+    QList<Poppler::FontInfo> listOfFonts = doc->fonts();
+    QCOMPARE( listOfFonts.size(), 1 );
+    QCOMPARE( listOfFonts.at(0).name(), QString("Helvetica") );
+    QCOMPARE( listOfFonts.at(0).type(), Poppler::FontInfo::Type1 );
+    QCOMPARE( listOfFonts.at(0).typeName(), QString("Type 1") );
+
+    QCOMPARE( listOfFonts.at(0).isEmbedded(), false );
+    QCOMPARE( listOfFonts.at(0).isSubset(), false );
+
+    delete doc;
+}
+
+void TestFontsData::checkType3()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf");
+    QVERIFY( doc );
+
+    QList<Poppler::FontInfo> listOfFonts = doc->fonts();
+    QCOMPARE( listOfFonts.size(), 2 );
+    QCOMPARE( listOfFonts.at(0).name(), QString("Helvetica") );
+    QCOMPARE( listOfFonts.at(0).type(), Poppler::FontInfo::Type1 );
+    QCOMPARE( listOfFonts.at(0).typeName(), QString("Type 1") );
+
+    QCOMPARE( listOfFonts.at(0).isEmbedded(), false );
+    QCOMPARE( listOfFonts.at(0).isSubset(), false );
+
+    QCOMPARE( listOfFonts.at(1).name(), QString("") );
+    QCOMPARE( listOfFonts.at(1).type(), Poppler::FontInfo::Type3 );
+    QCOMPARE( listOfFonts.at(1).typeName(), QString("Type 3") );
+
+    QCOMPARE( listOfFonts.at(1).isEmbedded(), true );
+    QCOMPARE( listOfFonts.at(1).isSubset(), false );
+
+    delete doc;
+}
+
+void TestFontsData::checkTrueType()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+
+    QList<Poppler::FontInfo> listOfFonts = doc->fonts();
+    QCOMPARE( listOfFonts.size(), 2 );
+    QCOMPARE( listOfFonts.at(0).name(), QString("Arial-BoldMT") );
+    QCOMPARE( listOfFonts.at(0).type(), Poppler::FontInfo::TrueType );
+    QCOMPARE( listOfFonts.at(0).typeName(), QString("TrueType") );
+
+    QCOMPARE( listOfFonts.at(0).isEmbedded(), false );
+    QCOMPARE( listOfFonts.at(0).isSubset(), false );
+
+    QCOMPARE( listOfFonts.at(1).name(), QString("ArialMT") );
+    QCOMPARE( listOfFonts.at(1).type(), Poppler::FontInfo::TrueType );
+    QCOMPARE( listOfFonts.at(1).typeName(), QString("TrueType") );
+
+    QCOMPARE( listOfFonts.at(1).isEmbedded(), false );
+    QCOMPARE( listOfFonts.at(1).isSubset(), false );
+
+    delete doc;
+}
+
+void TestFontsData::checkFontIterator()
+{
+    // loading a 1-page document
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf");
+    QVERIFY( doc );
+    // loading a 6-pages document
+    Poppler::Document *doc6 = Poppler::Document::load(TESTDATADIR "/tests/cropbox.pdf");
+    QVERIFY( doc6 );
+
+    std::auto_ptr< Poppler::FontIterator > it;
+
+    // some tests with the 1-page document:
+    // - check a default iterator
+    it.reset( doc->newFontIterator() );
+    QVERIFY( it->hasNext() );
+    // - check an iterator for negative pages to behave as 0
+    it.reset( doc->newFontIterator( -1 ) );
+    QVERIFY( it->hasNext() );
+    // - check an iterator for pages out of the page limit
+    it.reset( doc->newFontIterator( 1 ) );
+    QVERIFY( !it->hasNext() );
+    // - check that it reaches the end after 1 iteration
+    it.reset( doc->newFontIterator() );
+    QVERIFY( it->hasNext() );
+    it->next();
+    QVERIFY( !it->hasNext() );
+
+    // some tests with the 6-page document:
+    // - check a default iterator
+    it.reset( doc6->newFontIterator() );
+    QVERIFY( it->hasNext() );
+    // - check an iterator for pages out of the page limit
+    it.reset( doc6->newFontIterator( 6 ) );
+    QVERIFY( !it->hasNext() );
+    // - check that it reaches the end after 6 iterations
+    it.reset( doc6->newFontIterator() );
+    QVERIFY( it->hasNext() );
+    it->next();
+    QVERIFY( it->hasNext() );
+    it->next();
+    QVERIFY( it->hasNext() );
+    it->next();
+    QVERIFY( it->hasNext() );
+    it->next();
+    QVERIFY( it->hasNext() );
+    it->next();
+    QVERIFY( it->hasNext() );
+    it->next();
+    QVERIFY( !it->hasNext() );
+
+    delete doc;
+    delete doc6;
+}
+
+void TestFontsData::checkSecondDocumentQuery()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf");
+    QVERIFY( doc );
+
+    QList<Poppler::FontInfo> listOfFonts = doc->fonts();
+    QCOMPARE( listOfFonts.size(), 2 );
+    // check we get the very same result when calling fonts() again (#19405)
+    QList<Poppler::FontInfo> listOfFonts2 = doc->fonts();
+    QCOMPARE( listOfFonts, listOfFonts2 );
+
+    delete doc;
+}
+
+void TestFontsData::checkMultipleIterations()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf");
+    QVERIFY( doc );
+
+    QList<Poppler::FontInfo> listOfFonts = loadFontsViaIterator( doc );
+    QCOMPARE( listOfFonts.size(), 2 );
+    QList<Poppler::FontInfo> listOfFonts2 = loadFontsViaIterator( doc );
+    QCOMPARE( listOfFonts, listOfFonts2 );
+
+    delete doc;
+}
+
+void TestFontsData::checkIteratorFonts()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/tests/fonts.pdf");
+    QVERIFY( doc );
+
+    QList<Poppler::FontInfo> listOfFonts = doc->fonts();
+    QCOMPARE( listOfFonts.size(), 3 );
+    
+    // check we get the very same result when gatering fonts using the iterator
+    QList<Poppler::FontInfo> listOfFonts2 = loadFontsViaIterator( doc );
+    QCOMPARE( listOfFonts, listOfFonts2 );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestFontsData)
+#include "check_fonts.moc"
+
diff --git a/qt5/tests/check_goostring.cpp b/qt5/tests/check_goostring.cpp
new file mode 100644
index 00000000..07999b5d
--- /dev/null
+++ b/qt5/tests/check_goostring.cpp
@@ -0,0 +1,61 @@
+#include <QtTest/QtTest>
+
+#include "goo/GooString.h"
+
+class TestGooString : public QObject
+{
+    Q_OBJECT
+private slots:
+    void testInsertData_data();
+    void testInsertData();
+    void testInsert();
+};
+
+void TestGooString::testInsertData_data()
+{
+    QTest::addColumn<QByteArray>("string");
+    QTest::addColumn<QByteArray>("addition");
+    QTest::addColumn<int>("position");
+    QTest::addColumn<QByteArray>("result");
+
+    QTest::newRow("foo") << QByteArray("foo") << QByteArray("bar") << 0 << QByteArray("barfoo");
+    QTest::newRow("<empty>") << QByteArray() << QByteArray("bar") << 0 << QByteArray("bar");
+    QTest::newRow("foo+bar #1") << QByteArray("f+bar") << QByteArray("oo") << 1 << QByteArray("foo+bar");
+    QTest::newRow("foo+bar #2") << QByteArray("fobar") << QByteArray("o+") << 2 << QByteArray("foo+bar");
+    QTest::newRow("foo+bar #last") << QByteArray("foo+r") << QByteArray("ba") << 4 << QByteArray("foo+bar");
+    QTest::newRow("foo+bar #end") << QByteArray("foo+") << QByteArray("bar") << 4 << QByteArray("foo+bar");
+    QTest::newRow("long #start") << QByteArray("very string") << QByteArray("long long long long long ") << 5 << QByteArray("very long long long long long string");
+}
+
+void TestGooString::testInsertData()
+{
+    QFETCH(QByteArray, string);
+    QFETCH(QByteArray, addition);
+    QFETCH(int, position);
+    QFETCH(QByteArray, result);
+
+    GooString goo(string.constData());
+    QCOMPARE(goo.getCString(), string.constData());
+    goo.insert(position, addition.constData());
+    QCOMPARE(goo.getCString(), result.constData());
+}
+
+void TestGooString::testInsert()
+{
+    {
+    GooString goo;
+    goo.insert(0, ".");
+    goo.insert(0, "This is a very long long test string");
+    QCOMPARE(goo.getCString(), "This is a very long long test string.");
+    }
+    {
+    GooString goo;
+    goo.insert(0, "second-part-third-part");
+    goo.insert(0, "first-part-");
+    QCOMPARE(goo.getCString(), "first-part-second-part-third-part");
+    }
+}
+
+QTEST_MAIN(TestGooString)
+#include "check_goostring.moc"
+
diff --git a/qt5/tests/check_lexer.cpp b/qt5/tests/check_lexer.cpp
new file mode 100644
index 00000000..ea834c83
--- /dev/null
+++ b/qt5/tests/check_lexer.cpp
@@ -0,0 +1,128 @@
+#include <QtTest/QtTest>
+
+#include "Object.h"
+#include "Lexer.h"
+
+class TestLexer : public QObject
+{
+    Q_OBJECT
+private slots:
+    void testNumbers();
+};
+
+void TestLexer::testNumbers()
+{
+    char *data = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615";
+    Object dummy;
+    MemStream *stream = new MemStream(data, 0, strlen(data), &dummy);
+    Lexer *lexer = new Lexer(NULL, stream);
+    QVERIFY( lexer );
+    
+    Object obj;
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt);
+    QCOMPARE(obj.getInt(), 0);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt);
+    QCOMPARE(obj.getInt(), 1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt);
+    QCOMPARE(obj.getInt(), -1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt);
+    QCOMPARE(obj.getInt(), 2147483647);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt);
+    QCOMPARE(obj.getInt(), -2147483647);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), 2147483648ll);
+    obj.free();
+      
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt);
+    QCOMPARE(obj.getInt(), -2147483647-1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), 4294967297ll);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), -2147483649ll);
+    obj.free();
+
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), 0.1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), 1.1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), -1.1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), 2147483647.1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), -2147483647.1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), 2147483648.1);
+    obj.free();
+      
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), -2147483648.1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), 4294967297.1);
+    obj.free();
+    
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), -2147483649.1);
+    obj.free();
+
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objInt64);
+    QCOMPARE(obj.getInt64(), 9223372036854775807ll);
+    obj.free();
+
+    lexer->getObj(&obj);
+    QCOMPARE(obj.getType(), objReal);
+    QCOMPARE(obj.getReal(), 18446744073709551616.);
+    obj.free();
+
+    delete lexer;
+}
+
+QTEST_MAIN(TestLexer)
+#include "check_lexer.moc"
+
diff --git a/qt5/tests/check_links.cpp b/qt5/tests/check_links.cpp
new file mode 100644
index 00000000..4d002723
--- /dev/null
+++ b/qt5/tests/check_links.cpp
@@ -0,0 +1,96 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+#include <memory>
+
+class TestLinks : public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkDocumentWithNoDests();
+    void checkDests_xr01();
+    void checkDests_xr02();
+};
+
+bool isDestinationValid_pageNumber( const Poppler::LinkDestination *dest, const Poppler::Document *doc )
+{
+    return dest->pageNumber() > 0 && dest->pageNumber() <= doc->numPages();
+}
+
+bool isDestinationValid_name( const Poppler::LinkDestination *dest )
+{
+    return !dest->destinationName().isEmpty();
+}
+
+
+void TestLinks::checkDocumentWithNoDests()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithAttachments.pdf");
+    QVERIFY( doc );
+
+    std::auto_ptr< Poppler::LinkDestination > dest;
+    dest.reset( doc->linkDestination("no.dests.in.this.document") );
+    QVERIFY( !isDestinationValid_pageNumber( dest.get(), doc ) );
+    QVERIFY( isDestinationValid_name( dest.get() ) );
+
+    delete doc;
+}
+
+void TestLinks::checkDests_xr01()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/xr01.pdf");
+    QVERIFY( doc );
+
+    Poppler::Page *page = doc->page(0);
+    QVERIFY( page );
+
+    QList< Poppler::Link* > links = page->links();
+    QCOMPARE( links.count(), 2 );
+
+    {
+    QCOMPARE( links.at(0)->linkType(), Poppler::Link::Goto );
+    Poppler::LinkGoto *link = static_cast< Poppler::LinkGoto * >( links.at(0) );
+    const Poppler::LinkDestination dest = link->destination();
+    QVERIFY( !isDestinationValid_pageNumber( &dest, doc ) );
+    QVERIFY( isDestinationValid_name( &dest ) );
+    QCOMPARE( dest.destinationName(), QString::fromLatin1("section.1") );
+    }
+
+    {
+    QCOMPARE( links.at(1)->linkType(), Poppler::Link::Goto );
+    Poppler::LinkGoto *link = static_cast< Poppler::LinkGoto * >( links.at(1) );
+    const Poppler::LinkDestination dest = link->destination();
+    QVERIFY( !isDestinationValid_pageNumber( &dest, doc ) );
+    QVERIFY( isDestinationValid_name( &dest ) );
+    QCOMPARE( dest.destinationName(), QString::fromLatin1("section.2") );
+    }
+
+    delete doc;
+}
+
+void TestLinks::checkDests_xr02()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/xr02.pdf");
+    QVERIFY( doc );
+
+    std::auto_ptr< Poppler::LinkDestination > dest;
+    dest.reset( doc->linkDestination("section.1") );
+    QVERIFY( isDestinationValid_pageNumber( dest.get(), doc ) );
+    QVERIFY( !isDestinationValid_name( dest.get() ) );
+    dest.reset( doc->linkDestination("section.2") );
+    QVERIFY( isDestinationValid_pageNumber( dest.get(), doc ) );
+    QVERIFY( !isDestinationValid_name( dest.get() ) );
+    dest.reset( doc->linkDestination("section.3") );
+    QVERIFY( !isDestinationValid_pageNumber( dest.get(), doc ) );
+    QVERIFY( isDestinationValid_name( dest.get() ) );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestLinks)
+
+#include "check_links.moc"
diff --git a/qt5/tests/check_metadata.cpp b/qt5/tests/check_metadata.cpp
new file mode 100644
index 00000000..05abbaf4
--- /dev/null
+++ b/qt5/tests/check_metadata.cpp
@@ -0,0 +1,274 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+class TestMetaData: public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkStrings_data();
+    void checkStrings();
+    void checkStrings2_data();
+    void checkStrings2();
+    void checkStringKeys();
+    void checkLinearised();
+    void checkNumPages();
+    void checkDate();
+    void checkPageSize();
+    void checkPortraitOrientation();
+    void checkLandscapeOrientation();
+    void checkUpsideDownOrientation();
+    void checkSeascapeOrientation();
+    void checkVersion();
+    void checkPdfId();
+    void checkNoPdfId();
+};
+
+void TestMetaData::checkStrings_data()
+{
+    QTest::addColumn<QString>("key");
+    QTest::addColumn<QString>("value");
+
+    QTest::newRow( "Author" ) << "Author" << "Brad Hards";
+    QTest::newRow( "Title" ) << "Title" << "Two pages";
+    QTest::newRow( "Subject" ) << "Subject"
+			       << "A two page layout for poppler testing";
+    QTest::newRow( "Keywords" ) << "Keywords" << "Qt4 bindings";
+    QTest::newRow( "Creator" ) << "Creator" << "iText: cgpdftops CUPS filter";
+    QTest::newRow( "Producer" ) << "Producer" << "Acrobat Distiller 7.0 for Macintosh";
+}
+
+void TestMetaData::checkStrings()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf");
+    QVERIFY( doc );
+
+    QFETCH( QString, key );
+    QFETCH( QString, value );
+    QCOMPARE( doc->info(key), value );
+
+    delete doc;
+}
+
+void TestMetaData::checkStrings2_data()
+{
+    QTest::addColumn<QString>("key");
+    QTest::addColumn<QString>("value");
+
+    QTest::newRow( "Title" ) << "Title" << "Malaga hotels";
+    QTest::newRow( "Author" ) << "Author" << "Brad Hards";
+    QTest::newRow( "Creator" ) << "Creator" << "Safari: cgpdftops CUPS filter";
+    QTest::newRow( "Producer" )  << "Producer" << "Acrobat Distiller 7.0 for Macintosh";
+    QTest::newRow( "Keywords" ) << "Keywords" << "First\rSecond\rthird";
+    QTest::newRow( "Custom1" ) << "Custom1" << "CustomValue1";
+    QTest::newRow( "Custom2" ) << "Custom2" << "CustomValue2";
+}
+
+void TestMetaData::checkStrings2()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+
+    QFETCH( QString, key );
+    QFETCH( QString, value );
+    QCOMPARE( doc->info(key), value );
+
+    delete doc;
+}
+
+void TestMetaData::checkStringKeys()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+
+    QStringList keyList;
+    keyList << "Title" << "Author" << "Creator" << "Keywords" << "CreationDate";
+    keyList << "Producer" << "ModDate" << "Custom1" << "Custom2";
+    keyList.sort();
+    QStringList keysInDoc = doc->infoKeys();
+    keysInDoc.sort();
+    QCOMPARE( keysInDoc, keyList );
+
+    delete doc;
+}
+
+void TestMetaData::checkLinearised()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->isLinearized() );
+
+    delete doc;
+
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+    QCOMPARE( doc->isLinearized(), false );
+
+    delete doc;
+}
+
+void TestMetaData::checkPortraitOrientation()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf");
+    QVERIFY( doc );
+  
+    Poppler::Page *page = doc->page(0);
+    QCOMPARE( page->orientation(), Poppler::Page::Portrait );
+
+    delete page;
+    delete doc;
+}
+
+void TestMetaData::checkNumPages()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf");
+    QVERIFY( doc );
+    QCOMPARE( doc->numPages(), 2 );
+
+    delete doc;
+
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+    QCOMPARE( doc->numPages(), 1 );
+
+    delete doc;
+}
+
+void TestMetaData::checkDate()
+{
+    Poppler::Document *doc;
+
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+    QCOMPARE( doc->date("ModDate"), QDateTime(QDate(2005, 12, 5), QTime(9,44,46), Qt::UTC ) );
+    QCOMPARE( doc->date("CreationDate"), QDateTime(QDate(2005, 8, 13), QTime(1,12,11), Qt::UTC ) );
+
+    delete doc;
+}
+
+void TestMetaData::checkPageSize()
+{
+    Poppler::Document *doc;
+
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf");
+    QVERIFY( doc );
+    Poppler::Page *page = doc->page(0);
+    QCOMPARE( page->pageSize(), QSize(595, 842) );
+    QCOMPARE( page->pageSizeF(), QSizeF(595.22, 842) );
+
+    delete page;
+    delete doc;
+}
+
+
+void TestMetaData::checkLandscapeOrientation()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf");
+    QVERIFY( doc );
+  
+    Poppler::Page *page = doc->page(1);
+    QCOMPARE( page->orientation(), Poppler::Page::Landscape );
+
+    delete page;
+    delete doc;
+}
+
+void TestMetaData::checkUpsideDownOrientation()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf");
+    QVERIFY( doc );
+
+    Poppler::Page *page = doc->page(2);
+    QCOMPARE( page->orientation(), Poppler::Page::UpsideDown );
+
+    delete page;
+    delete doc;
+}
+
+void TestMetaData::checkSeascapeOrientation()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf");
+    QVERIFY( doc );
+
+    Poppler::Page *page = doc->page(3);
+    QCOMPARE( page->orientation(), Poppler::Page::Seascape );
+
+    delete page;
+    delete doc;
+}
+
+void TestMetaData::checkVersion()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf");
+    QVERIFY( doc );
+
+    int major = 0, minor = 0;
+    doc->getPdfVersion( &major, &minor );
+    QCOMPARE( major, 1 );
+    QCOMPARE( minor, 6 );
+
+    delete doc;
+}
+
+void TestMetaData::checkPdfId()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/A6EmbeddedFiles.pdf");
+    QVERIFY( doc );
+
+    const QByteArray referencePermanentId( "00C9D5B6D8FB11D7A902003065D630AA" );
+    const QByteArray referenceUpdateId( "39AECAE6D8FB11D7A902003065D630AA" );
+
+    {
+    // no IDs wanted, just existance check
+    QVERIFY( doc->getPdfId( 0, 0 ) );
+    }
+    {
+    // only permanent ID
+    QByteArray permanentId;
+    QVERIFY( doc->getPdfId( &permanentId, 0 ) );
+    QCOMPARE( permanentId.toUpper(), referencePermanentId );
+    }
+    {
+    // only update ID
+    QByteArray updateId;
+    QVERIFY( doc->getPdfId( 0, &updateId ) );
+    QCOMPARE( updateId.toUpper(), referenceUpdateId );
+    }
+    {
+    // both IDs
+    QByteArray permanentId;
+    QByteArray updateId;
+    QVERIFY( doc->getPdfId( &permanentId, &updateId ) );
+    QCOMPARE( permanentId.toUpper(), referencePermanentId );
+    QCOMPARE( updateId.toUpper(), referenceUpdateId );
+    }
+
+    delete doc;
+}
+
+void TestMetaData::checkNoPdfId()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( !doc->getPdfId( 0, 0 ) );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestMetaData)
+#include "check_metadata.moc"
+
diff --git a/qt5/tests/check_optcontent.cpp b/qt5/tests/check_optcontent.cpp
new file mode 100644
index 00000000..cac1b433
--- /dev/null
+++ b/qt5/tests/check_optcontent.cpp
@@ -0,0 +1,484 @@
+#include <QtTest/QtTest>
+
+#include "PDFDoc.h"
+#include "GlobalParams.h"
+
+#include <poppler-qt5.h>
+
+class TestOptionalContent: public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkVisPolicy();
+    void checkNestedLayers();
+    void checkNoOptionalContent();
+    void checkIsVisible();
+    void checkVisibilitySetting();
+    void checkRadioButtons();
+};
+
+void TestOptionalContent::checkVisPolicy()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/vis_policy_test.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->hasOptionalContent() );
+
+    Poppler::OptContentModel *optContent = doc->optionalContentModel();
+    QModelIndex index;
+    index = optContent->index( 0, 0, QModelIndex() );
+    QCOMPARE( optContent->data( index, Qt::DisplayRole ).toString(), QString( "A" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+    index = optContent->index( 1, 0, QModelIndex() );
+    QCOMPARE( optContent->data( index, Qt::DisplayRole ).toString(), QString( "B" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+
+    delete doc;
+}
+
+void TestOptionalContent::checkNestedLayers()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/NestedLayers.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->hasOptionalContent() );
+
+    Poppler::OptContentModel *optContent = doc->optionalContentModel();
+    QModelIndex index;
+
+    index = optContent->index( 0, 0, QModelIndex() );
+    QCOMPARE( optContent->data( index, Qt::DisplayRole ).toString(), QString( "Black Text and Green Snow" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    index = optContent->index( 1, 0, QModelIndex() );
+    QCOMPARE( optContent->data( index, Qt::DisplayRole ).toString(), QString( "Mountains and Image" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+
+    // This is a sub-item of "Mountains and Image"
+    QModelIndex subindex = optContent->index( 0, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "Image" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+
+    index = optContent->index( 2, 0, QModelIndex() );
+    QCOMPARE( optContent->data( index, Qt::DisplayRole ).toString(), QString( "Starburst" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+
+    index = optContent->index( 3, 0, QModelIndex() );
+    QCOMPARE( optContent->data( index, Qt::DisplayRole ).toString(), QString( "Watermark" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    delete doc;
+}
+
+void TestOptionalContent::checkNoOptionalContent()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf");
+    QVERIFY( doc );
+
+    QCOMPARE( doc->hasOptionalContent(), false );
+
+    delete doc;
+}
+
+void TestOptionalContent::checkIsVisible()
+{
+    GooString *fileName = new GooString(TESTDATADIR "/unittestcases/vis_policy_test.pdf");
+    globalParams = new GlobalParams();
+    PDFDoc *doc = new PDFDoc( fileName );
+    QVERIFY( doc );
+
+    OCGs *ocgs = doc->getOptContentConfig();
+    QVERIFY( ocgs );
+
+    XRef *xref = doc->getXRef();
+
+    Object obj;
+
+    // In this test, both Ref(21,0) and Ref(2,0) are set to On
+
+    // AnyOn, one element array:
+    // 22 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOn>>endobj
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QVERIFY( ocgs->optContentIsVisible( &obj ) );
+    obj.free();
+
+    // Same again, looking for any leaks or dubious free()'s
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QVERIFY( ocgs->optContentIsVisible( &obj ) );
+    obj.free();
+
+    // AnyOff, one element array:
+    // 29 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOff>>endobj
+    xref->fetch( 29, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOn, one element array:
+    // 36 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOn>>endobj
+    xref->fetch( 36, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+
+    // AllOff, one element array:
+    // 43 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOff>>endobj
+    xref->fetch( 43, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AnyOn, multi-element array:
+    // 50 0 obj<</Type/OCMD/OCGs[21 0 R 28 0 R]/P/AnyOn>>endobj
+    xref->fetch( 50, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AnyOff, multi-element array:
+    // 57 0 obj<</Type/OCMD/P/AnyOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 57, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOn, multi-element array:
+    // 64 0 obj<</Type/OCMD/P/AllOn/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 64, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AllOff, multi-element array:
+    // 71 0 obj<</Type/OCMD/P/AllOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 71, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    delete doc;
+    delete globalParams;
+}
+
+void TestOptionalContent::checkVisibilitySetting()
+{
+    globalParams = new GlobalParams();
+    GooString *fileName = new GooString(TESTDATADIR "/unittestcases/vis_policy_test.pdf");
+    PDFDoc *doc = new PDFDoc( fileName );
+    QVERIFY( doc );
+
+    OCGs *ocgs = doc->getOptContentConfig();
+    QVERIFY( ocgs );
+
+    XRef *xref = doc->getXRef();
+
+    Object obj;
+
+    // In this test, both Ref(21,0) and Ref(28,0) start On,
+    // based on the file settings
+    Object ref21obj;
+    ref21obj.initRef( 21, 0 );
+    Ref ref21 = ref21obj.getRef();
+    OptionalContentGroup *ocgA = ocgs->findOcgByRef( ref21 );
+    QVERIFY( ocgA );
+
+    QVERIFY( (ocgA->getName()->cmp("A")) == 0 );
+    QCOMPARE( ocgA->getState(), OptionalContentGroup::On );
+
+    Object ref28obj;
+    ref28obj.initRef( 28, 0 );
+    Ref ref28 = ref28obj.getRef();
+    OptionalContentGroup *ocgB = ocgs->findOcgByRef( ref28 );
+    QVERIFY( ocgB );
+
+    QVERIFY( (ocgB->getName()->cmp("B")) == 0 );
+    QCOMPARE( ocgB->getState(), OptionalContentGroup::On );
+
+    // turn one Off
+    ocgA->setState( OptionalContentGroup::Off );
+
+    // AnyOn, one element array:
+    // 22 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOn>>endobj
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // Same again, looking for any leaks or dubious free()'s
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AnyOff, one element array:
+    // 29 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOff>>endobj
+    xref->fetch( 29, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AllOn, one element array:
+    // 36 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOn>>endobj
+    xref->fetch( 36, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AllOff, one element array:
+    // 43 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOff>>endobj
+    xref->fetch( 43, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AnyOn, multi-element array:
+    // 50 0 obj<</Type/OCMD/OCGs[21 0 R 28 0 R]/P/AnyOn>>endobj
+    xref->fetch( 50, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AnyOff, multi-element array:
+    // 57 0 obj<</Type/OCMD/P/AnyOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 57, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AllOn, multi-element array:
+    // 64 0 obj<</Type/OCMD/P/AllOn/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 64, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOff, multi-element array:
+    // 71 0 obj<</Type/OCMD/P/AllOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 71, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+
+    // Turn the other one off as well (i.e. both are Off)
+    ocgB->setState(OptionalContentGroup::Off);
+
+    // AnyOn, one element array:
+    // 22 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOn>>endobj
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // Same again, looking for any leaks or dubious free()'s
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AnyOff, one element array:
+    // 29 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOff>>endobj
+    xref->fetch( 29, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AllOn, one element array:
+    // 36 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOn>>endobj
+    xref->fetch( 36, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOff, one element array:
+    // 43 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOff>>endobj
+    xref->fetch( 43, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AnyOn, multi-element array:
+    // 50 0 obj<</Type/OCMD/OCGs[21 0 R 28 0 R]/P/AnyOn>>endobj
+    xref->fetch( 50, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AnyOff, multi-element array:
+    // 57 0 obj<</Type/OCMD/P/AnyOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 57, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AllOn, multi-element array:
+    // 64 0 obj<</Type/OCMD/P/AllOn/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 64, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOff, multi-element array:
+    // 71 0 obj<</Type/OCMD/P/AllOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 71, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+
+    // Turn the first one on again (21 is On, 28 is Off)
+    ocgA->setState(OptionalContentGroup::On);
+
+    // AnyOn, one element array:
+    // 22 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOn>>endobj
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // Same again, looking for any leaks or dubious free()'s
+    xref->fetch( 22, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AnyOff, one element array:
+    // 29 0 obj<</Type/OCMD/OCGs[21 0 R]/P/AnyOff>>endobj
+    xref->fetch( 29, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOn, one element array:
+    // 36 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOn>>endobj
+    xref->fetch( 36, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOff, one element array:
+    // 43 0 obj<</Type/OCMD/OCGs[28 0 R]/P/AllOff>>endobj
+    xref->fetch( 43, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AnyOn, multi-element array:
+    // 50 0 obj<</Type/OCMD/OCGs[21 0 R 28 0 R]/P/AnyOn>>endobj
+    xref->fetch( 50, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AnyOff, multi-element array:
+    // 57 0 obj<</Type/OCMD/P/AnyOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 57, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), true );
+    obj.free();
+
+    // AllOn, multi-element array:
+    // 64 0 obj<</Type/OCMD/P/AllOn/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 64, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    // AllOff, multi-element array:
+    // 71 0 obj<</Type/OCMD/P/AllOff/OCGs[21 0 R 28 0 R]>>endobj
+    xref->fetch( 71, 0, &obj );
+    QVERIFY( obj.isDict() );
+    QCOMPARE( ocgs->optContentIsVisible( &obj ), false );
+    obj.free();
+
+    delete doc;
+    delete globalParams;
+}
+
+void TestOptionalContent::checkRadioButtons()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/ClarityOCGs.pdf");
+    QVERIFY( doc );
+
+    QVERIFY( doc->hasOptionalContent() );
+
+    Poppler::OptContentModel *optContent = doc->optionalContentModel();
+    QModelIndex index;
+
+    index = optContent->index( 0, 0, QModelIndex() );
+    QCOMPARE( optContent->data( index, Qt::DisplayRole ).toString(), QString( "Languages" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( index, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    // These are sub-items of the "Languages" label
+    QModelIndex subindex = optContent->index( 0, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "English" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+
+    subindex = optContent->index( 1, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "French" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    subindex = optContent->index( 2, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "Japanese" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    // RBGroup of languages, so turning on Japanese should turn off English
+    QVERIFY( optContent->setData( subindex, QVariant( true ), Qt::CheckStateRole ) );
+
+    subindex = optContent->index( 0, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "English" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    subindex = optContent->index( 2, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "Japanese" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+
+    subindex = optContent->index( 1, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "French" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    // and turning on French should turn off Japanese
+    QVERIFY( optContent->setData( subindex, QVariant( true ), Qt::CheckStateRole ) );
+
+    subindex = optContent->index( 0, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "English" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    subindex = optContent->index( 2, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "Japanese" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    subindex = optContent->index( 1, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "French" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Checked );
+
+
+    // and turning off French should leave them all off
+    QVERIFY( optContent->setData( subindex, QVariant( false ), Qt::CheckStateRole ) );
+
+    subindex = optContent->index( 0, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "English" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    subindex = optContent->index( 2, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "Japanese" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    subindex = optContent->index( 1, 0, index );
+    QCOMPARE( optContent->data( subindex, Qt::DisplayRole ).toString(), QString( "French" ) );
+    QCOMPARE( static_cast<Qt::CheckState>( optContent->data( subindex, Qt::CheckStateRole ).toInt() ), Qt::Unchecked );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestOptionalContent)
+
+#include "check_optcontent.moc"
+
diff --git a/qt5/tests/check_pagelabelinfo.cpp b/qt5/tests/check_pagelabelinfo.cpp
new file mode 100644
index 00000000..4eb1ec36
--- /dev/null
+++ b/qt5/tests/check_pagelabelinfo.cpp
@@ -0,0 +1,43 @@
+#include <QtTest/QtTest>
+
+#include "PageLabelInfo_p.h"
+
+class TestPageLabelInfo : public QObject
+{
+    Q_OBJECT
+private slots:
+    void testToRoman();
+    void testFromRoman();
+    void testToLatin();
+    void testFromLatin();
+};
+
+void TestPageLabelInfo::testToRoman()
+{
+    GooString str;
+    toRoman(177, &str, gFalse);
+    QCOMPARE (str.getCString(), "clxxvii");
+}
+
+void TestPageLabelInfo::testFromRoman()
+{
+    GooString roman("clxxvii");
+    QCOMPARE(fromRoman(roman.getCString()), 177);
+}
+
+void TestPageLabelInfo::testToLatin()
+{
+    GooString str;
+    toLatin(54, &str, gFalse);
+    QCOMPARE(str.getCString(), "bbb");
+}
+
+void TestPageLabelInfo::testFromLatin()
+{
+    GooString latin("ddd");
+    QCOMPARE(fromLatin(latin.getCString()), 56);
+}
+
+QTEST_MAIN(TestPageLabelInfo)
+#include "check_pagelabelinfo.moc"
+
diff --git a/qt5/tests/check_pagelayout.cpp b/qt5/tests/check_pagelayout.cpp
new file mode 100644
index 00000000..5f918395
--- /dev/null
+++ b/qt5/tests/check_pagelayout.cpp
@@ -0,0 +1,49 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+class TestPageLayout: public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkNone();
+    void checkSingle();
+    void checkFacing();
+};
+
+void TestPageLayout::checkNone()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf");
+    QVERIFY( doc );
+  
+    QCOMPARE( doc->pageLayout(), Poppler::Document::NoLayout );
+
+    delete doc;
+}
+
+void TestPageLayout::checkSingle()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/FullScreen.pdf");
+    QVERIFY( doc );
+  
+    QCOMPARE( doc->pageLayout(), Poppler::Document::SinglePage );
+
+    delete doc;
+}
+
+void TestPageLayout::checkFacing()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf");
+    QVERIFY( doc );
+
+    QCOMPARE( doc->pageLayout(), Poppler::Document::TwoPageRight );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestPageLayout)
+#include "check_pagelayout.moc"
+
diff --git a/qt5/tests/check_pagemode.cpp b/qt5/tests/check_pagemode.cpp
new file mode 100644
index 00000000..66f8ea47
--- /dev/null
+++ b/qt5/tests/check_pagemode.cpp
@@ -0,0 +1,73 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+class TestPageMode: public QObject
+{
+    Q_OBJECT
+private slots:
+    void checkNone();
+    void checkFullScreen();
+    void checkAttachments();
+    void checkThumbs();
+    void checkOC();
+};
+
+void TestPageMode::checkNone()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf");
+    QVERIFY( doc );
+  
+    QCOMPARE( doc->pageMode(), Poppler::Document::UseNone );
+
+    delete doc;
+}
+
+void TestPageMode::checkFullScreen()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/FullScreen.pdf");
+    QVERIFY( doc );
+
+    QCOMPARE( doc->pageMode(), Poppler::Document::FullScreen );
+
+    delete doc;
+}
+
+void TestPageMode::checkAttachments()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseAttachments.pdf");
+    QVERIFY( doc );
+  
+    QCOMPARE( doc->pageMode(), Poppler::Document::UseAttach );
+
+    delete doc;
+}
+
+void TestPageMode::checkThumbs()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseThumbs.pdf");
+    QVERIFY( doc );
+
+    QCOMPARE( doc->pageMode(), Poppler::Document::UseThumbs );
+
+    delete doc;
+}
+
+void TestPageMode::checkOC()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseOC.pdf");
+    QVERIFY( doc );
+
+    QCOMPARE( doc->pageMode(), Poppler::Document::UseOC );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestPageMode)
+#include "check_pagemode.moc"
+
diff --git a/qt5/tests/check_password.cpp b/qt5/tests/check_password.cpp
new file mode 100644
index 00000000..7f071a13
--- /dev/null
+++ b/qt5/tests/check_password.cpp
@@ -0,0 +1,88 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+class TestPassword: public QObject
+{
+    Q_OBJECT
+private slots:
+    void password1();
+    void password1a();
+    void password2();
+    void password2a();
+    void password2b();
+    void password3();
+};
+
+
+// BUG:4557
+void TestPassword::password1()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - open.pdf"), "", QString::fromUtf8("garçon").toLatin1() );
+    QVERIFY( doc );
+    QVERIFY( !doc->isLocked() );
+
+    delete doc;
+}
+
+
+void TestPassword::password1a()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - open.pdf") );
+    QVERIFY( doc );
+    QVERIFY( doc->isLocked() );
+    QVERIFY( !doc->unlock( "", QString::fromUtf8("garçon").toLatin1() ) );
+    QVERIFY( !doc->isLocked() );
+
+    delete doc;
+}
+
+void TestPassword::password2()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf"), QString::fromUtf8("garçon").toLatin1(), "" );
+    QVERIFY( doc );
+    QVERIFY( !doc->isLocked() );
+
+    delete doc;
+}
+
+void TestPassword::password2a()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf"), QString::fromUtf8("garçon").toLatin1() );
+    QVERIFY( doc );
+    QVERIFY( !doc->isLocked() );
+
+    delete doc;
+}
+
+void TestPassword::password2b()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf") );
+    QVERIFY( doc );
+    QVERIFY( !doc->isLocked() );
+    QVERIFY( !doc->unlock( QString::fromUtf8("garçon").toLatin1(), "" ) );
+    QVERIFY( !doc->isLocked() );
+
+    delete doc;
+}
+
+void TestPassword::password3()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load( QString::fromUtf8(TESTDATADIR "/unittestcases/PasswordEncrypted.pdf") );
+    QVERIFY( doc );
+    QVERIFY( doc->isLocked() );
+    QVERIFY( !doc->unlock( "", "password" ) );
+    QVERIFY( !doc->isLocked() );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestPassword)
+#include "check_password.moc"
+
diff --git a/qt5/tests/check_permissions.cpp b/qt5/tests/check_permissions.cpp
new file mode 100644
index 00000000..f90e2bc8
--- /dev/null
+++ b/qt5/tests/check_permissions.cpp
@@ -0,0 +1,44 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+class TestPermissions: public QObject
+{
+    Q_OBJECT
+private slots:
+    void permissions1();
+};
+
+void TestPermissions::permissions1()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf");
+    QVERIFY( doc );
+  
+    // we are allowed to print
+    QVERIFY( doc->okToPrint() );
+
+    // we are not allowed to change
+    QVERIFY( !(doc->okToChange()) );
+
+    // we are not allowed to copy or extract content
+    QVERIFY( !(doc->okToCopy()) );
+
+    // we are not allowed to print at high resolution
+    QVERIFY( !(doc->okToPrintHighRes()) );
+
+    // we are not allowed to fill forms
+    QVERIFY( !(doc->okToFillForm()) );
+
+    // we are allowed to extract content for accessibility
+    QVERIFY( doc->okToExtractForAccessibility() );
+
+    // we are allowed to assemble this document
+    QVERIFY( doc->okToAssemble() );
+
+    delete doc;
+}
+
+QTEST_MAIN(TestPermissions)
+#include "check_permissions.moc"
+
diff --git a/qt5/tests/check_search.cpp b/qt5/tests/check_search.cpp
new file mode 100644
index 00000000..efb55562
--- /dev/null
+++ b/qt5/tests/check_search.cpp
@@ -0,0 +1,98 @@
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+
+class TestSearch: public QObject
+{
+    Q_OBJECT
+private slots:
+    void bug7063();
+    void testNextAndPrevious();
+};
+
+void TestSearch::bug7063()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/bug7063.pdf");
+    QVERIFY( doc );
+   
+    Poppler::Page *page = doc->page(0);
+    double rectLeft, rectTop, rectRight, rectBottom;
+    rectLeft = 0;
+    rectTop = 0;
+    rectRight = page->pageSize().width();
+    rectBottom = page->pageSize().height();
+    QCOMPARE( page->search(QString("non-ascii:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), true );
+
+    QCOMPARE( page->search(QString("Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), false );
+    QCOMPARE( page->search(QString("Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseInsensitive), true );
+
+    QCOMPARE( page->search(QString("latin1:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), false );
+
+    QCOMPARE( page->search(QString::fromUtf8("é"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), true );
+    QCOMPARE( page->search(QString::fromUtf8("à"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), true );
+    QCOMPARE( page->search(QString::fromUtf8("ç"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), true );
+    QCOMPARE( page->search(QString::fromUtf8("search \"é\", \"à\" or \"ç\""), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), true );
+    QCOMPARE( page->search(QString::fromUtf8("¥µ©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), true );
+    QCOMPARE( page->search(QString::fromUtf8("¥©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), false );
+  
+    delete doc;
+}
+
+void TestSearch::testNextAndPrevious()
+{
+    Poppler::Document *doc;
+    doc = Poppler::Document::load(TESTDATADIR "/unittestcases/xr01.pdf");
+    QVERIFY( doc );
+  
+    Poppler::Page *page = doc->page(0);
+    double rectLeft, rectTop, rectRight, rectBottom;
+    rectLeft = 0;
+    rectTop = 0;
+    rectRight = page->pageSize().width();
+    rectBottom = page->pageSize().height();
+    
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::CaseSensitive), true );
+    QVERIFY( qAbs(rectLeft - 161.44) < 0.01 );
+    QVERIFY( qAbs(rectTop - 127.85) < 0.01 );
+    QVERIFY( qAbs(rectRight - rectLeft - 6.70) < 0.01 );
+    QVERIFY( qAbs(rectBottom - rectTop - 8.85) < 0.01 );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult, Poppler::Page::CaseSensitive), true );
+    QVERIFY( qAbs(rectLeft - 171.46) < 0.01 );
+    QVERIFY( qAbs(rectTop - 127.85) < 0.01 );
+    QVERIFY( qAbs(rectRight - rectLeft - 6.70) < 0.01 );
+    QVERIFY( qAbs(rectBottom - rectTop - 8.85) < 0.01 );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult, Poppler::Page::CaseSensitive), true );
+    QVERIFY( qAbs(rectLeft - 161.44) < 0.01 );
+    QVERIFY( qAbs(rectTop - 139.81) < 0.01 );
+    QVERIFY( qAbs(rectRight - rectLeft - 6.70) < 0.01 );
+    QVERIFY( qAbs(rectBottom - rectTop - 8.85) < 0.01 );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult, Poppler::Page::CaseSensitive), true );
+    QVERIFY( qAbs(rectLeft - 171.46) < 0.01 );
+    QVERIFY( qAbs(rectTop - 139.81) < 0.01 );
+    QVERIFY( qAbs(rectRight - rectLeft - 6.70) < 0.01 );
+    QVERIFY( qAbs(rectBottom - rectTop - 8.85) < 0.01 );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult, Poppler::Page::CaseSensitive), false );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult, Poppler::Page::CaseSensitive), true );
+    QVERIFY( qAbs(rectLeft - 161.44) < 0.01 );
+    QVERIFY( qAbs(rectTop - 139.81) < 0.01 );
+    QVERIFY( qAbs(rectRight - rectLeft - 6.70) < 0.01 );
+    QVERIFY( qAbs(rectBottom - rectTop - 8.85) < 0.01 );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult, Poppler::Page::CaseSensitive), true );
+    QVERIFY( qAbs(rectLeft - 171.46) < 0.01 );
+    QVERIFY( qAbs(rectTop - 127.85) < 0.01 );
+    QVERIFY( qAbs(rectRight - rectLeft - 6.70) < 0.01 );
+    QVERIFY( qAbs(rectBottom - rectTop - 8.85) < 0.01 );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult, Poppler::Page::CaseSensitive), true );
+    QVERIFY( qAbs(rectLeft - 161.44) < 0.01 );
+    QVERIFY( qAbs(rectTop - 127.85) < 0.01 );
+    QVERIFY( qAbs(rectRight - rectLeft - 6.70) < 0.01 );
+    QVERIFY( qAbs(rectBottom - rectTop - 8.85) < 0.01 );
+    QCOMPARE( page->search(QString("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult, Poppler::Page::CaseSensitive), false );
+    
+    delete doc;
+}
+
+QTEST_MAIN(TestSearch)
+#include "check_search.moc"
+
diff --git a/qt5/tests/check_strings.cpp b/qt5/tests/check_strings.cpp
new file mode 100644
index 00000000..46556699
--- /dev/null
+++ b/qt5/tests/check_strings.cpp
@@ -0,0 +1,250 @@
+/*
+ * Copyright (C) 2010, 2011, Pino Toscano <pino@kde.org>
+ *
+ * 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
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <QtTest/QtTest>
+
+#include <poppler-qt5.h>
+#include <poppler-private.h>
+
+#include <GlobalParams.h>
+
+Q_DECLARE_METATYPE(GooString*)
+Q_DECLARE_METATYPE(Unicode*)
+
+class TestStrings : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void check_unicodeToQString_data();
+    void check_unicodeToQString();
+    void check_UnicodeParsedString_data();
+    void check_UnicodeParsedString();
+    void check_QStringToUnicodeGooString_data();
+    void check_QStringToUnicodeGooString();
+    void check_QStringToGooString_data();
+    void check_QStringToGooString();
+
+private:
+    GooString* newGooString(const char *s);
+    GooString* newGooString(const char *s, int l);
+
+    QVector<GooString *> m_gooStrings;
+};
+
+void TestStrings::initTestCase()
+{
+    qRegisterMetaType<GooString*>("GooString*");
+    qRegisterMetaType<Unicode*>("Unicode*");
+
+    globalParams = new GlobalParams();
+}
+
+void TestStrings::cleanupTestCase()
+{
+    qDeleteAll(m_gooStrings);
+
+    delete globalParams;
+}
+
+void TestStrings::check_unicodeToQString_data()
+{
+    QTest::addColumn<Unicode*>("data");
+    QTest::addColumn<int>("length");
+    QTest::addColumn<QString>("result");
+
+    {
+    const int l = 1;
+    Unicode *u = new Unicode[l];
+    u[0] = int('a');
+    QTest::newRow("a") << u << l << QString::fromUtf8("a");
+    }
+    {
+    const int l = 1;
+    Unicode *u = new Unicode[l];
+    u[0] = 0x0161;
+    QTest::newRow("\u0161") << u << l << QString::fromUtf8("\u0161");
+    }
+    {
+    const int l = 2;
+    Unicode *u = new Unicode[l];
+    u[0] = int('a');
+    u[1] = int('b');
+    QTest::newRow("ab") << u << l << QString::fromUtf8("ab");
+    }
+    {
+    const int l = 2;
+    Unicode *u = new Unicode[l];
+    u[0] = int('a');
+    u[1] = 0x0161;
+    QTest::newRow("a\u0161") << u << l << QString::fromUtf8("a\u0161");
+    }
+    {
+    const int l = 2;
+    Unicode *u = new Unicode[l];
+    u[0] = 0x5c01;
+    u[1] = 0x9762;
+    QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2") << u << l << QString::fromUtf8("\xe5\xb0\x81\xe9\x9d\xa2");
+    }
+    {
+    const int l = 3;
+    Unicode *u = new Unicode[l];
+    u[0] = 0x5c01;
+    u[1] = 0x9762;
+    u[2] = 0x0;
+    QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2 + 0") << u << l << QString::fromUtf8("\xe5\xb0\x81\xe9\x9d\xa2");
+    }
+}
+
+void TestStrings::check_unicodeToQString()
+{
+    QFETCH(Unicode*, data);
+    QFETCH(int, length);
+    QFETCH(QString, result);
+
+    QCOMPARE(Poppler::unicodeToQString(data, length), result);
+
+    delete [] data;
+}
+
+void TestStrings::check_UnicodeParsedString_data()
+{
+    QTest::addColumn<GooString*>("string");
+    QTest::addColumn<QString>("result");
+
+    // non-unicode strings
+    QTest::newRow("<empty>") << newGooString("")
+                             << QString();
+    QTest::newRow("a") << newGooString("a")
+                       << QString::fromUtf8("a");
+    QTest::newRow("ab") << newGooString("ab")
+                        << QString::fromUtf8("ab");
+    QTest::newRow("~") << newGooString("~")
+                       << QString::fromUtf8("~");
+    QTest::newRow("test string") << newGooString("test string")
+                                 << QString::fromUtf8("test string");
+
+    // unicode strings
+    QTest::newRow("<unicode marks>") << newGooString("\xFE\xFF")
+                                     << QString();
+    QTest::newRow("U a") << newGooString("\xFE\xFF\0a", 4)
+                         << QString::fromUtf8("a");
+    QTest::newRow("U ~") << newGooString("\xFE\xFF\0~", 4)
+                         << QString::fromUtf8("~");
+    QTest::newRow("U aa") << newGooString("\xFE\xFF\0a\0a", 6)
+                           << QString::fromUtf8("aa");
+    QTest::newRow("U \xC3\x9F") << newGooString("\xFE\xFF\0\xDF", 4)
+                                << QString::fromUtf8("\xC3\x9F");
+    QTest::newRow("U \xC3\x9F\x61") << newGooString("\xFE\xFF\0\xDF\0\x61", 6)
+                                    << QString::fromUtf8("\xC3\x9F\x61");
+    QTest::newRow("U \xC5\xA1") << newGooString("\xFE\xFF\x01\x61", 4)
+                                << QString::fromUtf8("\xC5\xA1");
+    QTest::newRow("U \xC5\xA1\x61") << newGooString("\xFE\xFF\x01\x61\0\x61", 6)
+                                << QString::fromUtf8("\xC5\xA1\x61");
+    QTest::newRow("test string") << newGooString("\xFE\xFF\0t\0e\0s\0t\0 \0s\0t\0r\0i\0n\0g", 24)
+                                 << QString::fromUtf8("test string");
+}
+
+void TestStrings::check_UnicodeParsedString()
+{
+    QFETCH(GooString*, string);
+    QFETCH(QString, result);
+
+    QCOMPARE(Poppler::UnicodeParsedString(string), result);
+}
+
+void TestStrings::check_QStringToUnicodeGooString_data()
+{
+    QTest::addColumn<QString>("string");
+    QTest::addColumn<QByteArray>("result");
+
+
+    QTest::newRow("<null>") << QString()
+                            << QByteArray("");
+    QTest::newRow("<empty>") << QString::fromUtf8("")
+                             << QByteArray("");
+    QTest::newRow("a") << QString::fromUtf8("a")
+                       << QByteArray("\0a", 2);
+    QTest::newRow("ab") << QString::fromUtf8("ab")
+                        << QByteArray("\0a\0b", 4);
+    QTest::newRow("test string") << QString::fromUtf8("test string")
+                                 << QByteArray("\0t\0e\0s\0t\0 \0s\0t\0r\0i\0n\0g", 22);
+    QTest::newRow("\xC3\x9F") << QString::fromUtf8("\xC3\x9F")
+                              << QByteArray("\0\xDF", 2);
+    QTest::newRow("\xC3\x9F\x61") << QString::fromUtf8("\xC3\x9F\x61")
+                                  << QByteArray("\0\xDF\0\x61", 4);
+}
+
+void TestStrings::check_QStringToUnicodeGooString()
+{
+    QFETCH(QString, string);
+    QFETCH(QByteArray, result);
+
+    GooString *goo = Poppler::QStringToUnicodeGooString(string);
+    QVERIFY(goo->hasUnicodeMarker());
+    QCOMPARE(goo->getLength(), string.length() * 2 + 2);
+    QCOMPARE(result, QByteArray::fromRawData(goo->getCString() + 2, goo->getLength() - 2));
+
+    delete goo;
+}
+
+void TestStrings::check_QStringToGooString_data()
+{
+    QTest::addColumn<QString>("string");
+    QTest::addColumn<GooString*>("result");
+
+    QTest::newRow("<null>") << QString()
+                            << newGooString("");
+    QTest::newRow("<empty>") << QString::fromUtf8("")
+                             << newGooString("");
+    QTest::newRow("a") << QString::fromUtf8("a")
+                       << newGooString("a");
+    QTest::newRow("ab") << QString::fromUtf8("ab")
+                        << newGooString("ab");
+}
+
+void TestStrings::check_QStringToGooString()
+{
+    QFETCH(QString, string);
+    QFETCH(GooString*, result);
+
+    GooString *goo = Poppler::QStringToGooString(string);
+    QCOMPARE(goo->getCString(), result->getCString());
+
+    delete goo;
+}
+
+GooString* TestStrings::newGooString(const char *s)
+{
+    GooString *goo = new GooString(s);
+    m_gooStrings.append(goo);
+    return goo;
+}
+
+GooString* TestStrings::newGooString(const char *s, int l)
+{
+    GooString *goo = new GooString(s, l);
+    m_gooStrings.append(goo);
+    return goo;
+}
+
+QTEST_MAIN(TestStrings)
+
+#include "check_strings.moc"
diff --git a/qt5/tests/poppler-attachments.cpp b/qt5/tests/poppler-attachments.cpp
new file mode 100644
index 00000000..7445eddc
--- /dev/null
+++ b/qt5/tests/poppler-attachments.cpp
@@ -0,0 +1,39 @@
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+
+#include <iostream>
+
+#include <poppler-qt5.h>
+
+int main( int argc, char **argv )
+{
+    QCoreApplication a( argc, argv );               // QApplication required!
+
+    if (!( argc == 2 ))
+    {
+	qWarning() << "usage: poppler-attachments filename";
+	exit(1);
+    }
+  
+    Poppler::Document *doc = Poppler::Document::load(argv[1]);
+    if (!doc)
+    {
+	qWarning() << "doc not loaded";
+	exit(1);
+    }
+
+    if (doc->hasEmbeddedFiles()) {
+	std::cout << "Embedded files: " << std::endl;
+	foreach(Poppler::EmbeddedFile *file, doc->embeddedFiles()) {
+	    std::cout << "    " << qPrintable(file->name()) << std::endl;
+	    std::cout << "    desc:" << qPrintable(file->description()) << std::endl;
+	    QByteArray data = file->data();
+	    std::cout << "       data: " << data.constData() << std::endl;
+	}
+	
+    } else {
+	std::cout << "There are no embedded document at the top level" << std::endl;
+    }
+    delete doc;
+  
+}
diff --git a/qt5/tests/poppler-fonts.cpp b/qt5/tests/poppler-fonts.cpp
new file mode 100644
index 00000000..1d7b9ad0
--- /dev/null
+++ b/qt5/tests/poppler-fonts.cpp
@@ -0,0 +1,89 @@
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+
+#include <iostream>
+
+#include <poppler-qt5.h>
+
+int main( int argc, char **argv )
+{
+    QCoreApplication a( argc, argv );               // QApplication required!
+
+    if (!( argc == 2 ))
+    {
+	qWarning() << "usage: poppler-fonts filename";
+	exit(1);
+    }
+  
+    Poppler::Document *doc = Poppler::Document::load(argv[1]);
+    if (!doc)
+    {
+	qWarning() << "doc not loaded";
+	exit(1);
+    }
+
+    std::cout << "name                                 type         emb sub font file";
+    std::cout << std::endl;
+    std::cout << "------------------------------------ ------------ --- --- ---------";
+    std::cout << std::endl;
+  
+    foreach( const Poppler::FontInfo &font, doc->fonts() ) {
+	if (font.name().isNull()) {
+	    std::cout << qPrintable( QString("%1").arg(QString("[none]"), -37) );
+	} else {
+	    std::cout << qPrintable( QString("%1").arg(font.name(), -37) );
+	}
+	switch( font.type() ) {
+	case Poppler::FontInfo::unknown:
+	    std::cout << "unknown           ";
+	    break;
+	case Poppler::FontInfo::Type1:
+	    std::cout << "Type 1            ";
+	    break;
+	case Poppler::FontInfo::Type1C:
+	    std::cout << "Type 1C           ";
+	    break;
+	case Poppler::FontInfo::Type3:
+	    std::cout << "Type 3            ";
+	    break;
+	case Poppler::FontInfo::TrueType:
+	    std::cout << "TrueType          ";
+	    break;
+	case Poppler::FontInfo::CIDType0:
+	    std::cout << "CID Type 0        ";
+	    break;
+	case Poppler::FontInfo::CIDType0C:
+	    std::cout << "CID Type 0C       ";
+	    break;
+	case Poppler::FontInfo::CIDTrueType:
+	    std::cout << "CID TrueType      ";
+	    break;
+	case Poppler::FontInfo::Type1COT:
+	    std::cout << "Type 1C (OT)      ";
+	    break;
+	case Poppler::FontInfo::TrueTypeOT:
+	    std::cout << "TrueType (OT)     ";
+	    break;
+	case Poppler::FontInfo::CIDType0COT:
+	    std::cout << "CID Type 0C (OT)  ";
+	    break;
+	case Poppler::FontInfo::CIDTrueTypeOT:
+	    std::cout << "CID TrueType (OT) ";
+	    break;
+	}
+
+	if ( font.isEmbedded() ) {
+	    std::cout << "yes ";
+	} else {
+	    std::cout << "no  ";
+	}
+	if ( font.isSubset() ) {
+	    std::cout << "yes ";
+	} else {
+	    std::cout << "no  ";
+	}
+	std::cout << qPrintable( QString("%1").arg(font.file()) );
+	std::cout << std::endl;
+    }
+    delete doc;
+}
diff --git a/qt5/tests/poppler-forms.cpp b/qt5/tests/poppler-forms.cpp
new file mode 100644
index 00000000..40b6cdd0
--- /dev/null
+++ b/qt5/tests/poppler-forms.cpp
@@ -0,0 +1,166 @@
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+
+#include <iostream>
+
+#include <poppler-qt5.h>
+#include <poppler-form.h>
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormField::FormType type)
+{
+    switch (type) {
+        case Poppler::FormField::FormButton:    out << "Button";    break;
+        case Poppler::FormField::FormText:      out << "Text";      break;
+        case Poppler::FormField::FormChoice:    out << "Choice";    break;
+        case Poppler::FormField::FormSignature: out << "Signature"; break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormFieldButton::ButtonType type)
+{
+    switch (type) {
+        case Poppler::FormFieldButton::Push:        out << "Push";      break;
+        case Poppler::FormFieldButton::CheckBox:    out << "CheckBox";  break;
+        case Poppler::FormFieldButton::Radio:       out << "Radio";     break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormFieldText::TextType type)
+{
+    switch (type) {
+        case Poppler::FormFieldText::Normal:        out << "Normal";        break;
+        case Poppler::FormFieldText::Multiline:     out << "Multiline";     break;
+        case Poppler::FormFieldText::FileSelect:    out << "FileSelect";    break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Poppler::FormFieldChoice::ChoiceType type)
+{
+    switch (type) {
+        case Poppler::FormFieldChoice::ComboBox:      out << "ComboBox";    break;
+        case Poppler::FormFieldChoice::ListBox:       out << "ListBox";     break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, Qt::Alignment alignment)
+{
+    switch (alignment) {
+        case Qt::AlignLeft:     out << "Left";      break;
+        case Qt::AlignRight:    out << "Right";     break;
+        case Qt::AlignHCenter:  out << "HCenter";   break;
+        case Qt::AlignJustify:  out << "Justify";   break;
+        case Qt::AlignTop:      out << "Top";       break;
+        case Qt::AlignBottom:   out << "Bottom";    break;
+        case Qt::AlignVCenter:  out << "VCenter";   break;
+        case Qt::AlignCenter:   out << "Center";    break;
+        case Qt::AlignAbsolute: out << "Absolute";  break;
+    }
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, const QString &string)
+{
+    out << string.toUtf8().constData();
+    return out;
+}
+
+std::ostream& operator<< (std::ostream &out, const QRectF &rect)
+{
+    out << QString("top: %1 left: %2 width: %3 height: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height());
+    return out;
+}
+
+template<typename T>
+std::ostream& operator<< (std::ostream &out, const QList<T> &elems)
+{
+    bool isFirst = true;
+    for (int i = 0; i < elems.count(); ++i) {
+        if (!isFirst)
+            out << " ";
+        out << elems[i];
+        isFirst = false;
+    }
+    return out;
+}
+
+int main( int argc, char **argv )
+{
+    QCoreApplication a( argc, argv );
+
+    if (!( argc == 2 ))
+    {
+        qWarning() << "usage: poppler-forms filename";
+        exit(1);
+    }
+
+    Poppler::Document *doc = Poppler::Document::load(argv[1]);
+    if (!doc)
+    {
+        qWarning() << "doc not loaded";
+        exit(1);
+    }
+
+    std::cout << "Forms for file " << argv[1] << std::endl;
+    for (int i = 0; i < doc->numPages(); ++i) {
+        Poppler::Page *page = doc->page(i);
+        if (page) {
+            QList<Poppler::FormField*> forms = page->formFields();
+            std::cout << "\tPage " << i + 1 << std::endl;
+            foreach( const Poppler::FormField *form, forms ) {
+                std::cout << "\t\tForm" << std::endl;
+                std::cout << "\t\t\tType: " << form->type() << std::endl;
+                std::cout << "\t\t\tRect: " << form->rect() << std::endl;
+                std::cout << "\t\t\tID: " << form->id() << std::endl;
+                std::cout << "\t\t\tName: " << form->name() << std::endl;
+                std::cout << "\t\t\tFullyQualifiedName: " << form->fullyQualifiedName() << std::endl;
+                std::cout << "\t\t\tUIName: " << form->uiName() << std::endl;
+                std::cout << "\t\t\tReadOnly: " << form->isReadOnly() << std::endl;
+                std::cout << "\t\t\tVisible: " << form->isVisible() << std::endl;
+                switch (form->type()) {
+                    case Poppler::FormField::FormButton: {
+                        const Poppler::FormFieldButton *buttonForm = static_cast<const Poppler::FormFieldButton *>(form);
+                        std::cout << "\t\t\tButtonType: " << buttonForm->buttonType() << std::endl;
+                        std::cout << "\t\t\tCaption: " << buttonForm->caption() << std::endl;
+                        std::cout << "\t\t\tState: " << buttonForm->state() << std::endl;
+                        std::cout << "\t\t\tSiblings: " << buttonForm->siblings() << std::endl;
+                    }
+                    break;
+                    
+                    case Poppler::FormField::FormText: {
+                        const Poppler::FormFieldText *textForm = static_cast<const Poppler::FormFieldText *>(form);
+                        std::cout << "\t\t\tTextType: " << textForm->textType() << std::endl;
+                        std::cout << "\t\t\tText: " << textForm->text() << std::endl;
+                        std::cout << "\t\t\tIsPassword: " << textForm->isPassword() << std::endl;
+                        std::cout << "\t\t\tIsRichText: " << textForm->isRichText() << std::endl;
+                        std::cout << "\t\t\tMaximumLength: " << textForm->maximumLength() << std::endl;
+                        std::cout << "\t\t\tTextAlignment: " << textForm->textAlignment() << std::endl;
+                        std::cout << "\t\t\tCanBeSpellChecked: " << textForm->canBeSpellChecked() << std::endl;
+                    }
+                    break;
+
+                    case Poppler::FormField::FormChoice: {
+                        const Poppler::FormFieldChoice *choiceForm = static_cast<const Poppler::FormFieldChoice *>(form);
+                        std::cout << "\t\t\tChoiceType: " << choiceForm->choiceType() << std::endl;
+                        std::cout << "\t\t\tChoices: " << choiceForm->choices() << std::endl;
+                        std::cout << "\t\t\tIsEditable: " << choiceForm->isEditable() << std::endl;
+                        std::cout << "\t\t\tIsMultiSelect: " << choiceForm->multiSelect() << std::endl;
+                        std::cout << "\t\t\tCurrentChoices: " << choiceForm->currentChoices() << std::endl;
+                        std::cout << "\t\t\tEditChoice: " << choiceForm->editChoice() << std::endl;
+                        std::cout << "\t\t\tTextAlignment: " << choiceForm->textAlignment() << std::endl;
+                        std::cout << "\t\t\tCanBeSpellChecked: " << choiceForm->canBeSpellChecked() << std::endl;
+                    }
+                    break;
+
+                    case Poppler::FormField::FormSignature:
+                    break;
+                }
+            }
+            qDeleteAll(forms);
+        }
+    }
+    delete doc;
+}
diff --git a/qt5/tests/poppler-texts.cpp b/qt5/tests/poppler-texts.cpp
new file mode 100644
index 00000000..093ee45f
--- /dev/null
+++ b/qt5/tests/poppler-texts.cpp
@@ -0,0 +1,40 @@
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+
+#include <iostream>
+
+#include <poppler-qt5.h>
+
+int main( int argc, char **argv )
+{
+    QCoreApplication a( argc, argv );               // QApplication required!
+
+    if (!( argc == 2 ))
+    {
+	qWarning() << "usage: poppler-texts filename";
+	exit(1);
+    }
+  
+    Poppler::Document *doc = Poppler::Document::load(argv[1]);
+    if (!doc)
+    {
+	qWarning() << "doc not loaded";
+	exit(1);
+    }
+
+    for ( int i = 0; i < doc->numPages(); i++ )
+    {
+      int j = 0;
+      std::cout << "*** Page " << i << std::endl;
+      std::cout << std::flush;
+
+      Poppler::Page *page = doc->page(i);
+      const QByteArray utf8str = page->text( QRectF(), Poppler::Page::RawOrderLayout ).toUtf8();
+      std::cout << std::flush;
+      for ( j = 0; j < utf8str.size(); j++ )
+        std::cout << utf8str[j];
+      std::cout << std::endl;
+      delete page;
+    }
+    delete doc;
+}
diff --git a/qt5/tests/stress-poppler-dir.cpp b/qt5/tests/stress-poppler-dir.cpp
new file mode 100644
index 00000000..d76c8a66
--- /dev/null
+++ b/qt5/tests/stress-poppler-dir.cpp
@@ -0,0 +1,67 @@
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QTime>
+#include <QtWidgets/QApplication>
+#include <QtGui/QImage>
+
+#include <iostream>
+
+#include <poppler-qt5.h>
+
+int main( int argc, char **argv )
+{
+    QApplication a( argc, argv );               // QApplication required!
+
+    QTime t;
+    t.start();
+
+    QDir directory( argv[1] );
+    foreach ( const QString &fileName, directory.entryList() ) {
+        if (fileName.endsWith("pdf") ) {
+	    qDebug() << "Doing" << fileName.toLatin1().data() << ":";
+	    Poppler::Document *doc = Poppler::Document::load( directory.canonicalPath()+"/"+fileName );
+	    if (!doc) {
+		qWarning() << "doc not loaded";
+	    } else if ( doc->isLocked() ) {
+	        if (! doc->unlock( "", "password" ) ) {
+		    qWarning() << "couldn't unlock document";
+		    delete doc;
+		}
+	    } else {
+		int major = 0, minor = 0;
+		doc->getPdfVersion( &major, &minor );
+		doc->info("Title");
+		doc->info("Subject");
+		doc->info("Author");
+		doc->info("Keywords");
+		doc->info("Creator");
+		doc->info("Producer");
+		doc->date("CreationDate").toString();
+		doc->date("ModDate").toString();
+		doc->numPages();
+		doc->isLinearized();
+		doc->isEncrypted();
+		doc->okToPrint();
+		doc->okToCopy();
+		doc->okToChange();
+		doc->okToAddNotes();
+		doc->pageMode();
+
+		for( int index = 0; index < doc->numPages(); ++index ) {
+		    Poppler::Page *page = doc->page( index );
+		    QImage image = page->renderToImage();
+		    page->pageSize();
+		    page->orientation();
+		    delete page;
+		    std::cout << ".";
+		    std::cout.flush();
+		}
+		std::cout << std::endl;
+		delete doc;
+	    }
+	}
+    }
+
+    std::cout << "Elapsed time: " << (t.elapsed()/1000) << "seconds" << std::endl;
+
+}
diff --git a/qt5/tests/stress-poppler-qt5.cpp b/qt5/tests/stress-poppler-qt5.cpp
new file mode 100644
index 00000000..949e4ceb
--- /dev/null
+++ b/qt5/tests/stress-poppler-qt5.cpp
@@ -0,0 +1,74 @@
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QTime>
+#include <QtWidgets/QApplication>
+#include <QtGui/QImage>
+
+#include <iostream>
+
+#include <poppler-qt5.h>
+
+int main( int argc, char **argv )
+{
+    QApplication a( argc, argv );               // QApplication required!
+
+    Q_UNUSED( argc );
+    Q_UNUSED( argv );
+
+    QTime t;
+    t.start();
+    QDir dbDir( QString( "./pdfdb" ) );
+    if ( !dbDir.exists() ) {
+	qWarning() << "Database directory does not exist";
+    }
+
+    QStringList excludeSubDirs;
+    excludeSubDirs << "000048" << "000607";
+
+    foreach ( const QString &subdir, dbDir.entryList(QStringList() << "0000*", QDir::Dirs) ) {
+	if ( excludeSubDirs.contains(subdir) ) {
+	    // then skip it
+	} else {
+	    QString path = "./pdfdb/" + subdir + "/data.pdf";
+	    std::cout <<"Doing " << path.toLatin1().data() << " :";
+	    Poppler::Document *doc = Poppler::Document::load( path );
+	    if (!doc) {
+		qWarning() << "doc not loaded";
+	    } else {
+		int major = 0, minor = 0;
+		doc->getPdfVersion( &major, &minor );
+		doc->info("Title");
+		doc->info("Subject");
+		doc->info("Author");
+		doc->info("Keywords");
+		doc->info("Creator");
+		doc->info("Producer");
+		doc->date("CreationDate").toString();
+		doc->date("ModDate").toString();
+		doc->numPages();
+		doc->isLinearized();
+		doc->isEncrypted();
+		doc->okToPrint();
+		doc->okToCopy();
+		doc->okToChange();
+		doc->okToAddNotes();
+		doc->pageMode();
+
+		for( int index = 0; index < doc->numPages(); ++index ) {
+		    Poppler::Page *page = doc->page( index );
+		    QImage image = page->renderToImage();
+		    page->pageSize();
+		    page->orientation();
+		    delete page;
+		    std::cout << ".";
+		    std::cout.flush();
+		}
+		std::cout << std::endl;
+		delete doc;
+	    }
+	}
+    }
+
+    std::cout << "Elapsed time: " << (t.elapsed()/1000) << std::endl;
+
+}
diff --git a/qt5/tests/stress-threads-qt5.cpp b/qt5/tests/stress-threads-qt5.cpp
new file mode 100644
index 00000000..2a24a351
--- /dev/null
+++ b/qt5/tests/stress-threads-qt5.cpp
@@ -0,0 +1,304 @@
+
+#include <unistd.h>
+#include <time.h>
+
+#include <poppler-qt5.h>
+#include <poppler-form.h>
+
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+#include <QtGui/QImage>
+
+class SillyThread : public QThread
+{
+public:
+    SillyThread(Poppler::Document* document, QObject* parent = 0);
+
+    void run();
+
+private:
+    Poppler::Document* m_document;
+    QVector< Poppler::Page* > m_pages;
+
+};
+
+class CrazyThread : public QThread
+{
+public:
+    CrazyThread(uint seed, Poppler::Document* document, QMutex* annotationMutex, QObject* parent = 0);
+
+    void run();
+
+private:
+    uint m_seed;
+    Poppler::Document* m_document;
+    QMutex* m_annotationMutex;
+
+};
+
+static Poppler::Page* loadPage(Poppler::Document* document, int index)
+{
+    Poppler::Page* page = document->page(index);
+
+    if(page == 0)
+    {
+        qDebug() << "!Document::page";
+        
+        exit(EXIT_FAILURE);
+    }
+
+    return page;
+}
+
+static Poppler::Page* loadRandomPage(Poppler::Document* document)
+{
+    return loadPage(document, qrand() % document->numPages());
+}
+
+SillyThread::SillyThread(Poppler::Document* document, QObject* parent) : QThread(parent),
+    m_document(document),
+    m_pages()
+{
+    m_pages.reserve(m_document->numPages());
+
+    for(int index = 0; index < m_document->numPages(); ++index)
+    {
+        m_pages.append(loadPage(m_document, index));
+    }
+}
+
+
+void SillyThread::run()
+{
+    forever
+    {
+        foreach(Poppler::Page* page, m_pages)
+        {
+            QImage image = page->renderToImage();
+
+            if(image.isNull())
+            {
+                qDebug() << "!Page::renderToImage";
+                
+                ::exit(EXIT_FAILURE);
+            }
+        }
+    }
+}
+
+CrazyThread::CrazyThread(uint seed, Poppler::Document* document, QMutex* annotationMutex, QObject* parent) : QThread(parent),
+    m_seed(seed),
+    m_document(document),
+    m_annotationMutex(annotationMutex)
+{
+}
+
+void CrazyThread::run()
+{
+    typedef QScopedPointer< Poppler::Page > PagePointer;
+
+    qsrand(m_seed);
+
+    forever
+    {
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "search...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            page->search("c", Poppler::Page::CaseInsensitive);
+            page->search("r", Poppler::Page::CaseSensitive);
+            page->search("a", Poppler::Page::CaseInsensitive);
+            page->search("z", Poppler::Page::CaseSensitive);
+            page->search("y", Poppler::Page::CaseInsensitive);
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "links...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            QList< Poppler::Link* > links = page->links();
+
+            qDeleteAll(links);
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "form fields...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            QList< Poppler::FormField* > formFields = page->formFields();
+
+            qDeleteAll(formFields);
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "thumbnail...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            page->thumbnail();
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "text...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            page->text(QRectF(QPointF(), page->pageSizeF()));
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            QMutexLocker mutexLocker(m_annotationMutex);
+            
+            qDebug() << "add annotation...";
+
+            PagePointer page(loadRandomPage(m_document));
+
+            Poppler::Annotation* annotation = 0;
+
+            switch(qrand() % 3)
+            {
+            default:
+            case 0:
+                annotation = new Poppler::TextAnnotation(qrand() % 2 == 0 ? Poppler::TextAnnotation::Linked : Poppler::TextAnnotation::InPlace);
+                break;
+            case 1:
+                annotation = new Poppler::HighlightAnnotation();
+                break;
+            case 2:
+                annotation = new Poppler::InkAnnotation();
+                break;
+            }
+
+            annotation->setBoundary(QRectF(0.0, 0.0, 0.5, 0.5));
+            annotation->setContents("crazy");
+
+            page->addAnnotation(annotation);
+
+            delete annotation;
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            QMutexLocker mutexLocker(m_annotationMutex);
+            
+            for(int index = 0; index < m_document->numPages(); ++index)
+            {
+                PagePointer page(loadPage(m_document, index));
+
+                QList< Poppler::Annotation* > annotations = page->annotations();
+
+                if(!annotations.isEmpty())
+                {
+                    qDebug() << "modify annotation...";
+
+                    annotations.at(qrand() % annotations.size())->setBoundary(QRectF(0.5, 0.5, 0.25, 0.25));
+                    annotations.at(qrand() % annotations.size())->setAuthor("foo");
+                    annotations.at(qrand() % annotations.size())->setContents("bar");
+                    annotations.at(qrand() % annotations.size())->setCreationDate(QDateTime::currentDateTime());
+                    annotations.at(qrand() % annotations.size())->setModificationDate(QDateTime::currentDateTime());
+                }
+
+                qDeleteAll(annotations);
+
+                if(!annotations.isEmpty())
+                {
+                    break;
+                }
+            }
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            QMutexLocker mutexLocker(m_annotationMutex);
+            
+            for(int index = 0; index < m_document->numPages(); ++index)
+            {
+                PagePointer page(loadPage(m_document, index));
+
+                QList< Poppler::Annotation* > annotations = page->annotations();
+
+                if(!annotations.isEmpty())
+                {
+                    qDebug() << "remove annotation...";
+
+                    page->removeAnnotation(annotations.takeAt(qrand() % annotations.size()));
+                }
+
+                qDeleteAll(annotations);
+
+                if(!annotations.isEmpty())
+                {
+                    break;
+                }
+            }
+        }
+
+        if(qrand() % 2 == 0)
+        {
+            qDebug() << "fonts...";
+
+            m_document->fonts();
+        }
+    }
+}
+
+int main(int argc, char** argv)
+{
+    if(argc < 5)
+    {
+        qDebug() << "usage: stress-threads-qt duration sillyCount crazyCount file(s)";
+        
+        return EXIT_FAILURE;
+    }
+
+    const int duration = atoi(argv[1]);
+    const int sillyCount = atoi(argv[2]);
+    const int crazyCount = atoi(argv[3]);
+    
+    qsrand(time(0));
+
+    for(int argi = 4; argi < argc; ++argi)
+    {
+        const QString file = QFile::decodeName(argv[argi]);
+        Poppler::Document* document = Poppler::Document::load(file);
+
+        if(document == 0)
+        {
+            qDebug() << "Could not load" << file;            
+            continue;
+        }
+        
+        if(document->isLocked())
+        {
+            qDebug() << file << "is locked";
+            continue;
+        }
+        
+        for(int i = 0; i < sillyCount; ++i)
+        {
+            (new SillyThread(document))->start();
+        }
+        
+        QMutex* annotationMutex = new QMutex();
+
+        for(int i = 0; i < crazyCount; ++i)
+        {
+            (new CrazyThread(qrand(), document, annotationMutex))->start();
+        }
+    }
+
+    sleep(duration);
+
+    return EXIT_SUCCESS;
+}
diff --git a/qt5/tests/test-password-qt5.cpp b/qt5/tests/test-password-qt5.cpp
new file mode 100644
index 00000000..b8ad3fa6
--- /dev/null
+++ b/qt5/tests/test-password-qt5.cpp
@@ -0,0 +1,136 @@
+#include <QtCore/QDebug>
+#include <QtWidgets/QApplication>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtWidgets/QWidget>
+
+#include <poppler-qt5.h>
+
+class PDFDisplay : public QWidget           // picture display widget
+{
+public:
+    PDFDisplay( Poppler::Document *d );
+    ~PDFDisplay();
+protected:
+    void paintEvent( QPaintEvent * );
+    void keyPressEvent( QKeyEvent * );
+private:
+    void display();
+    int m_currentPage;
+    QImage image;
+    Poppler::Document *doc;
+};
+
+PDFDisplay::PDFDisplay( Poppler::Document *d )
+{
+    doc = d;
+    m_currentPage = 0;
+    display();
+}
+
+void PDFDisplay::display()
+{
+    if (doc) {
+	Poppler::Page *page = doc->page(m_currentPage);
+	if (page) {
+	    qDebug() << "Displaying page: " << m_currentPage;
+	    image = page->renderToImage();
+	    update();
+	    delete page;
+	}
+    } else {
+	qWarning() << "doc not loaded";
+    }
+}
+
+PDFDisplay::~PDFDisplay()
+{
+    delete doc;
+}
+
+void PDFDisplay::paintEvent( QPaintEvent *e )
+{
+    QPainter paint( this );                     // paint widget
+    if (!image.isNull()) {
+	paint.drawImage(0, 0, image);
+    } else {
+	qWarning() << "null image";
+    }
+}
+
+void PDFDisplay::keyPressEvent( QKeyEvent *e )
+{
+  if (e->key() == Qt::Key_Down)
+  {
+    if (m_currentPage + 1 < doc->numPages())
+    {
+      m_currentPage++;
+      display();
+    }
+  }
+  else if (e->key() == Qt::Key_Up)
+  {
+    if (m_currentPage > 0)
+    {
+      m_currentPage--;
+      display();
+    }
+  }
+  else if (e->key() == Qt::Key_Q)
+  {
+      exit(0);
+  }
+}
+
+int main( int argc, char **argv )
+{
+    QApplication a( argc, argv );               // QApplication required!
+
+    if ( argc != 3)
+    {
+	qWarning() << "usage: test-password-qt5 owner-password filename";
+	exit(1);
+    }
+  
+    Poppler::Document *doc = Poppler::Document::load(argv[2], argv[1]);
+    if (!doc)
+    {
+	qWarning() << "doc not loaded";
+	exit(1);
+    }
+  
+    // output some meta-data
+    int major = 0, minor = 0;
+    doc->getPdfVersion( &major, &minor );
+    qDebug() << "    PDF Version: " << qPrintable(QString::fromLatin1("%1.%2").arg(major).arg(minor));
+    qDebug() << "          Title: " << doc->info("Title");
+    qDebug() << "        Subject: " << doc->info("Subject");
+    qDebug() << "         Author: " << doc->info("Author");
+    qDebug() << "      Key words: " << doc->info("Keywords");
+    qDebug() << "        Creator: " << doc->info("Creator");
+    qDebug() << "       Producer: " << doc->info("Producer");
+    qDebug() << "   Date created: " << doc->date("CreationDate").toString();
+    qDebug() << "  Date modified: " << doc->date("ModDate").toString();
+    qDebug() << "Number of pages: " << doc->numPages();
+    qDebug() << "     Linearised: " << doc->isLinearized();
+    qDebug() << "      Encrypted: " << doc->isEncrypted();
+    qDebug() << "    OK to print: " << doc->okToPrint();
+    qDebug() << "     OK to copy: " << doc->okToCopy();
+    qDebug() << "   OK to change: " << doc->okToChange();
+    qDebug() << "OK to add notes: " << doc->okToAddNotes();
+    qDebug() << "      Page mode: " << doc->pageMode();
+    QStringList fontNameList;
+    foreach( const Poppler::FontInfo &font, doc->fonts() )
+	fontNameList += font.name();
+    qDebug() << "          Fonts: " << fontNameList.join( ", " );
+
+    Poppler::Page *page = doc->page(0);
+    qDebug() << "    Page 1 size: " << page->pageSize().width()/72 << "inches x " << page->pageSize().height()/72 << "inches";
+
+    PDFDisplay test( doc );        // create picture display
+    test.setWindowTitle("Poppler-Qt5 Test");
+    test.show();                            // show it
+
+    return a.exec();                        // start event loop
+}
diff --git a/qt5/tests/test-poppler-qt5.cpp b/qt5/tests/test-poppler-qt5.cpp
new file mode 100644
index 00000000..d16728bb
--- /dev/null
+++ b/qt5/tests/test-poppler-qt5.cpp
@@ -0,0 +1,235 @@
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtWidgets/QApplication>
+#include <QtGui/QImage>
+#include <QtWidgets/QLabel>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtWidgets/QToolTip>
+#include <QtWidgets/QWidget>
+
+#include <poppler-qt5.h>
+
+class PDFDisplay : public QWidget           // picture display widget
+{
+public:
+    PDFDisplay( Poppler::Document *d, bool arthur );
+    ~PDFDisplay();
+    void setShowTextRects(bool show);
+    void display();
+protected:
+    void paintEvent( QPaintEvent * );
+    void keyPressEvent( QKeyEvent * );
+    void mousePressEvent( QMouseEvent * );
+private:
+    int m_currentPage;
+    QImage image;
+    Poppler::Document *doc;
+    QString backendString;
+    bool showTextRects;
+    QList<Poppler::TextBox*> textRects;
+};
+
+PDFDisplay::PDFDisplay( Poppler::Document *d, bool arthur )
+{
+    showTextRects = false;
+    doc = d;
+    m_currentPage = 0;
+    if (arthur)
+    {
+        backendString = "Arthur";
+        doc->setRenderBackend(Poppler::Document::ArthurBackend);
+    }
+    else
+    {
+        backendString = "Splash";
+        doc->setRenderBackend(Poppler::Document::SplashBackend);
+    }
+    doc->setRenderHint(Poppler::Document::Antialiasing, true);
+    doc->setRenderHint(Poppler::Document::TextAntialiasing, true);
+}
+
+void PDFDisplay::setShowTextRects(bool show)
+{
+    showTextRects = show;
+}
+
+void PDFDisplay::display()
+{
+    if (doc) {
+        Poppler::Page *page = doc->page(m_currentPage);
+        if (page) {
+            qDebug() << "Displaying page using" << backendString << "backend: " << m_currentPage;
+            QTime t = QTime::currentTime();
+            image = page->renderToImage();
+            qDebug() << "Rendering took" << t.msecsTo(QTime::currentTime()) << "msecs";
+            qDeleteAll(textRects);
+            if (showTextRects)
+            {
+                QPainter painter(&image);
+                painter.setPen(Qt::red);
+                textRects = page->textList();
+                foreach(Poppler::TextBox *tb, textRects)
+                {
+                    painter.drawRect(tb->boundingBox());
+                }
+            }
+            else textRects.clear();
+            update();
+            delete page;
+        }
+    } else {
+        qWarning() << "doc not loaded";
+    }
+}
+
+PDFDisplay::~PDFDisplay()
+{
+    qDeleteAll(textRects);
+    delete doc;
+}
+
+void PDFDisplay::paintEvent( QPaintEvent *e )
+{
+    QPainter paint( this );                     // paint widget
+    if (!image.isNull()) {
+	paint.drawImage(0, 0, image);
+    } else {
+	qWarning() << "null image";
+    }
+}
+
+void PDFDisplay::keyPressEvent( QKeyEvent *e )
+{
+  if (e->key() == Qt::Key_Down)
+  {
+    if (m_currentPage + 1 < doc->numPages())
+    {
+      m_currentPage++;
+      display();
+    }
+  }
+  else if (e->key() == Qt::Key_Up)
+  {
+    if (m_currentPage > 0)
+    {
+      m_currentPage--;
+      display();
+    }
+  }
+  else if (e->key() == Qt::Key_Q)
+  {
+      exit(0);
+  }
+}
+
+void PDFDisplay::mousePressEvent( QMouseEvent *e )
+{
+  int i = 0;
+  foreach(Poppler::TextBox *tb, textRects)
+  {
+    if (tb->boundingBox().contains(e->pos()))
+    {
+      QString tt = QString("Text: \"%1\"\nIndex in text list: %2").arg(tb->text()).arg(i);
+      QToolTip::showText(e->globalPos(), tt, this);
+      break;
+    }
+    ++i;
+  }
+}
+
+int main( int argc, char **argv )
+{
+    QApplication a( argc, argv );               // QApplication required!
+
+    if ( argc < 2 ||
+        (argc == 3 && strcmp(argv[2], "-extract") != 0 && strcmp(argv[2], "-arthur") != 0 && strcmp(argv[2], "-textRects") != 0) ||
+        argc > 3)
+    {
+	// use argument as file name
+	qWarning() << "usage: test-poppler-qt5 filename [-extract|-arthur|-textRects]";
+	exit(1);
+    }
+  
+    Poppler::Document *doc = Poppler::Document::load(QFile::decodeName(argv[1]));
+    if (!doc)
+    {
+	qWarning() << "doc not loaded";
+	exit(1);
+    }
+
+    if (doc->isLocked())
+    {
+	qWarning() << "document locked (needs password)";
+	exit(0);
+    }
+  
+    // output some meta-data
+    int major = 0, minor = 0;
+    doc->getPdfVersion( &major, &minor );
+    qDebug() << "    PDF Version: " << qPrintable(QString::fromLatin1("%1.%2").arg(major).arg(minor));
+    qDebug() << "          Title: " << doc->info("Title");
+    qDebug() << "        Subject: " << doc->info("Subject");
+    qDebug() << "         Author: " << doc->info("Author");
+    qDebug() << "      Key words: " << doc->info("Keywords");
+    qDebug() << "        Creator: " << doc->info("Creator");
+    qDebug() << "       Producer: " << doc->info("Producer");
+    qDebug() << "   Date created: " << doc->date("CreationDate").toString();
+    qDebug() << "  Date modified: " << doc->date("ModDate").toString();
+    qDebug() << "Number of pages: " << doc->numPages();
+    qDebug() << "     Linearised: " << doc->isLinearized();
+    qDebug() << "      Encrypted: " << doc->isEncrypted();
+    qDebug() << "    OK to print: " << doc->okToPrint();
+    qDebug() << "     OK to copy: " << doc->okToCopy();
+    qDebug() << "   OK to change: " << doc->okToChange();
+    qDebug() << "OK to add notes: " << doc->okToAddNotes();
+    qDebug() << "      Page mode: " << doc->pageMode();
+    qDebug() << "       Metadata: " << doc->metadata();
+
+    if ( doc->hasEmbeddedFiles() ) {
+        qDebug() << "Embedded files:";
+        foreach( Poppler::EmbeddedFile *file, doc->embeddedFiles() ) {
+	    qDebug() << "   " << file->name();
+	}
+	qDebug();
+    } else {
+        qDebug() << "No embedded files";
+    }
+
+    if (doc->numPages() <= 0)
+    {
+        delete doc;
+        qDebug() << "Doc has no pages";
+        return 0;
+    }
+
+    Poppler::Page *page = doc->page(0);
+    if (page)
+    {
+        qDebug() << "Page 1 size: " << page->pageSize().width()/72 << "inches x " << page->pageSize().height()/72 << "inches";
+        delete page;
+    }
+
+    if (argc == 2 || (argc == 3 && strcmp(argv[2], "-arthur") == 0) || (argc == 3 && strcmp(argv[2], "-textRects") == 0))
+    {
+        bool useArthur = (argc == 3 && strcmp(argv[2], "-arthur") == 0);
+        PDFDisplay test( doc, useArthur );        // create picture display
+        test.setWindowTitle("Poppler-Qt5 Test");
+        test.setShowTextRects(argc == 3 && strcmp(argv[2], "-textRects") == 0);
+        test.display();
+        test.show();                            // show it
+
+        return a.exec();                        // start event loop
+    }
+    else
+    {
+	Poppler::Page *page = doc->page(0);
+
+	QLabel *l = new QLabel(page->text(QRectF()), 0);
+	l->show();
+	delete page;
+	delete doc;
+	return a.exec();
+    }
+}
diff --git a/splash/Makefile.in b/splash/Makefile.in
index 78d3746c..fd4c99c0 100644
--- a/splash/Makefile.in
+++ b/splash/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -53,10 +80,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = splash
-DIST_COMMON = $(am__poppler_splash_include_HEADERS_DIST) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp \
+	$(am__poppler_splash_include_HEADERS_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -83,6 +111,19 @@ libsplash_la_OBJECTS = $(am_libsplash_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -95,20 +136,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(libsplash_la_SOURCES)
 DIST_SOURCES = $(libsplash_la_SOURCES)
 am__can_run_installinfo = \
@@ -153,6 +190,23 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(poppler_splash_includedir)"
 HEADERS = $(poppler_splash_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -248,6 +302,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -282,10 +339,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -307,13 +370,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -454,12 +517,15 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libsplash.la: $(libsplash_la_OBJECTS) $(libsplash_la_DEPENDENCIES) $(EXTRA_libsplash_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(CXXLINK)  $(libsplash_la_OBJECTS) $(libsplash_la_LIBADD) $(LIBS)
 
@@ -537,26 +603,15 @@ uninstall-poppler_splash_includeHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(poppler_splash_includedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -568,15 +623,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -585,6 +636,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -729,19 +795,19 @@ uninstall-am: uninstall-poppler_splash_includeHEADERS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
 	install-poppler_splash_includeHEADERS install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-poppler_splash_includeHEADERS
 
 
diff --git a/splash/Splash.cc b/splash/Splash.cc
index d0d986ef..6bb0dfe5 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -13,9 +13,9 @@
 //
 // Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
-// Copyright (C) 2010-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
-// Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011-2013 William Bader <williambader@hotmail.com>
 // Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2012 Matthias Kramm <kramm@quiss.org>
@@ -182,7 +182,7 @@ SplashPipeResultColorCtrl Splash::pipeResultColorAlphaNoBlend[] = {
   splashPipeResultColorAlphaNoBlendMono,
   splashPipeResultColorAlphaNoBlendMono,
   splashPipeResultColorAlphaNoBlendRGB,
-  splashPipeResultColorNoAlphaBlendRGB,
+  splashPipeResultColorAlphaNoBlendRGB,
   splashPipeResultColorAlphaNoBlendRGB
 #if SPLASH_CMYK
   ,
@@ -195,7 +195,7 @@ SplashPipeResultColorCtrl Splash::pipeResultColorAlphaBlend[] = {
   splashPipeResultColorAlphaBlendMono,
   splashPipeResultColorAlphaBlendMono,
   splashPipeResultColorAlphaBlendRGB,
-  splashPipeResultColorNoAlphaBlendRGB,
+  splashPipeResultColorAlphaBlendRGB,
   splashPipeResultColorAlphaBlendRGB
 #if SPLASH_CMYK
   ,
@@ -518,15 +518,19 @@ void Splash::pipeRun(SplashPipe *pipe) {
 	switch (bitmap->mode) {
 #if SPLASH_CMYK
 	case splashModeDeviceN8:
-	  for (cp = 4; cp < SPOT_NCOMPS + 4; cp++)
+	  for (cp = 0; cp < SPOT_NCOMPS + 4; cp++)
 	    cSrcNonIso[cp] = clip255(pipe->cSrc[cp] +
 				  ((pipe->cSrc[cp] - cDest[cp]) * t) / 255);
+	  break;
 	case splashModeCMYK8:
-	  cSrcNonIso[3] = clip255(pipe->cSrc[3] +
-				  ((pipe->cSrc[3] - cDest[3]) * t) / 255);
+	  for (cp = 0; cp < 4; cp++)
+	    cSrcNonIso[cp] = clip255(pipe->cSrc[cp] +
+				  ((pipe->cSrc[cp] - cDest[cp]) * t) / 255);
+	  break;
 #endif
+	case splashModeXBGR8:
+	  cSrcNonIso[3] = 255;
 	case splashModeRGB8:
-  case splashModeXBGR8:
 	case splashModeBGR8:
 	  cSrcNonIso[2] = clip255(pipe->cSrc[2] +
 				  ((pipe->cSrc[2] - cDest[2]) * t) / 255);
@@ -1450,7 +1454,7 @@ inline void Splash::drawSpan(SplashPipe *pipe, int x0, int x1, int y,
   }
 }
 
-inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y) {
+inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y, GBool adjustLine, Guchar lineOpacity) {
 #if splashAASize == 4
   static int bitCount4[16] = { 0, 1, 1, 2, 1, 2, 2, 3,
 			       1, 2, 2, 3, 2, 3, 3, 4 };
@@ -1493,7 +1497,7 @@ inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y) {
 #endif
 
     if (t != 0) {
-      pipe->shape = aaGamma[t];
+      pipe->shape = (adjustLine) ? div255((int) lineOpacity * (double)aaGamma[t]) : (double)aaGamma[t];
       (this->*pipe->run)(pipe);
       updateModX(x);
       updateModY(y);
@@ -1542,6 +1546,7 @@ Splash::Splash(SplashBitmap *bitmapA, GBool vectorAntialiasA,
     aaBuf = NULL;
   }
   minLineWidth = 0;
+  thinLineMode = splashThinLineDefault;
   clearModRegion();
   debugMode = gFalse;
 }
@@ -1568,6 +1573,7 @@ Splash::Splash(SplashBitmap *bitmapA, GBool vectorAntialiasA,
     aaBuf = NULL;
   }
   minLineWidth = 0;
+  thinLineMode = splashThinLineDefault;
   clearModRegion();
   debugMode = gFalse;
 }
@@ -2357,6 +2363,31 @@ SplashError Splash::fill(SplashPath *path, GBool eo) {
   return fillWithPattern(path, eo, state->fillPattern, state->fillAlpha);
 }
 
+inline void Splash::getBBoxFP(SplashPath *path, SplashCoord *xMinA, SplashCoord *yMinA,
+				   SplashCoord *xMaxA, SplashCoord *yMaxA) {
+  SplashCoord xMinFP, yMinFP, xMaxFP, yMaxFP, tx, ty;
+
+  // make compiler happy:
+  xMinFP = xMaxFP = yMinFP = yMaxFP = 0;
+  for (int i = 0; i < path->length; ++i) {
+    transform(state->matrix, path->pts[i].x, path->pts[i].y, &tx, &ty);
+    if (i == 0) {
+      xMinFP = xMaxFP = tx;
+      yMinFP = yMaxFP = ty;
+    } else {
+      if (tx < xMinFP) xMinFP = tx;
+      if (tx > xMaxFP) xMaxFP = tx;
+      if (ty < yMinFP) yMinFP = ty;
+      if (ty > yMaxFP) yMaxFP = ty;
+    }
+  }
+
+  *xMinA = xMinFP;
+  *yMinA = yMinFP;
+  *xMaxA = xMaxFP;
+  *yMaxA = yMaxFP;
+}
+
 SplashError Splash::fillWithPattern(SplashPath *path, GBool eo,
 				    SplashPattern *pattern,
 				    SplashCoord alpha) {
@@ -2365,6 +2396,8 @@ SplashError Splash::fillWithPattern(SplashPath *path, GBool eo,
   SplashXPathScanner *scanner;
   int xMinI, yMinI, xMaxI, yMaxI, x0, x1, y;
   SplashClipResult clipRes, clipRes2;
+  GBool adjustLine = gFalse; 
+  int linePosI = 0;
 
   if (path->length == 0) {
     return splashErrEmptyPath;
@@ -2397,7 +2430,24 @@ SplashError Splash::fillWithPattern(SplashPath *path, GBool eo,
     }
   }
 
-  xPath = new SplashXPath(path, state->matrix, state->flatness, gTrue);
+  if (thinLineMode != splashThinLineDefault) {
+    if (state->clip->getXMinI() == state->clip->getXMaxI()) {
+      linePosI = state->clip->getXMinI();
+      adjustLine = gTrue;
+    } else if (state->clip->getXMinI() == state->clip->getXMaxI() - 1) {
+      adjustLine = gTrue;
+      linePosI = splashFloor(state->clip->getXMin() + state->lineWidth);
+    } else if (state->clip->getYMinI() == state->clip->getYMaxI()) {
+      linePosI = state->clip->getYMinI();
+      adjustLine = gTrue;
+    } else if (state->clip->getYMinI() == state->clip->getYMaxI() - 1) {
+      adjustLine = gTrue;
+      linePosI = splashFloor(state->clip->getYMin() + state->lineWidth);
+    }
+  }
+
+  xPath = new SplashXPath(path, state->matrix, state->flatness, gTrue, 
+    adjustLine, linePosI);
   if (vectorAntialias && !inShading) {
     xPath->aaScale();
   }
@@ -2417,6 +2467,16 @@ SplashError Splash::fillWithPattern(SplashPath *path, GBool eo,
     scanner->getBBox(&xMinI, &yMinI, &xMaxI, &yMaxI);
   }
 
+  if (eo && (yMinI == yMaxI || xMinI == xMaxI) && thinLineMode != splashThinLineDefault) {
+    SplashCoord delta, xMinFP, yMinFP, xMaxFP, yMaxFP;
+    getBBoxFP(path, &xMinFP, &yMinFP, &xMaxFP, &yMaxFP);
+    delta = (yMinI == yMaxI) ? yMaxFP - yMinFP : xMaxFP - xMinFP;
+    if (delta < 0.2) {
+      opClipRes = splashClipAllOutside;
+      return splashOk;
+    }
+  }
+
   // check clipping
   if ((clipRes = state->clip->testRect(xMinI, yMinI, xMaxI, yMaxI))
       != splashClipAllOutside) {
@@ -2430,11 +2490,21 @@ SplashError Splash::fillWithPattern(SplashPath *path, GBool eo,
     // draw the spans
     if (vectorAntialias && !inShading) {
       for (y = yMinI; y <= yMaxI; ++y) {
-	scanner->renderAALine(aaBuf, &x0, &x1, y);
+	scanner->renderAALine(aaBuf, &x0, &x1, y, thinLineMode != splashThinLineDefault && xMinI == xMaxI);
 	if (clipRes != splashClipAllInside) {
-	  state->clip->clipAALine(aaBuf, &x0, &x1, y);
+	  state->clip->clipAALine(aaBuf, &x0, &x1, y, thinLineMode != splashThinLineDefault && xMinI == xMaxI);
 	}
-	drawAALine(&pipe, x0, x1, y);
+	Guchar lineShape = 255;
+	GBool adjustLine = gFalse;
+	if (thinLineMode == splashThinLineShape && (xMinI == xMaxI || yMinI == yMaxI)) {
+	  // compute line shape for thin lines:
+	  SplashCoord mx, my, delta;
+	  transform(state->matrix, 0, 0, &mx, &my);
+	  transform(state->matrix, state->lineWidth, 0, &delta, &my);
+	  adjustLine = gTrue;
+	  lineShape = clip255((delta - mx) * 255);
+	}
+	drawAALine(&pipe, x0, x1, y, adjustLine, lineShape);
       }
     } else {
       for (y = yMinI; y <= yMaxI; ++y) {
@@ -3615,7 +3685,7 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
         return splashErrBadArg;
       }
       scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h,
-			     scaledWidth, scaledHeight, interpolate);
+			     scaledWidth, scaledHeight, interpolate, tilingPattern);
       if (scaledImg == NULL) {
         return splashErrBadArg;
       }
@@ -3653,7 +3723,7 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
         return splashErrBadArg;
       }
       scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h,
-			     scaledWidth, scaledHeight, interpolate);
+			     scaledWidth, scaledHeight, interpolate, tilingPattern);
       if (scaledImg == NULL) {
         return splashErrBadArg;
       }
@@ -3926,6 +3996,8 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData
       xa = imgCoordMungeLower(section[i].xa0 +
 			      ((SplashCoord)y + 0.5 - section[i].ya0) *
 			        section[i].dxdya);
+      if (unlikely(xa < 0))
+        xa = 0;
       xb = imgCoordMungeUpper(section[i].xb0 +
 			      ((SplashCoord)y + 0.5 - section[i].yb0) *
 			        section[i].dxdyb);
@@ -3994,7 +4066,7 @@ static GBool isImageInterpolationRequired(int srcWidth, int srcHeight,
 SplashBitmap *Splash::scaleImage(SplashImageSource src, void *srcData,
 				 SplashColorMode srcMode, int nComps,
 				 GBool srcAlpha, int srcWidth, int srcHeight,
-				 int scaledWidth, int scaledHeight, GBool interpolate) {
+				 int scaledWidth, int scaledHeight, GBool interpolate, GBool tilingPattern) {
   SplashBitmap *dest;
 
   dest = new SplashBitmap(scaledWidth, scaledHeight, 1, srcMode, srcAlpha, gTrue, bitmap->getSeparationList());
@@ -4012,7 +4084,7 @@ SplashBitmap *Splash::scaleImage(SplashImageSource src, void *srcData,
 	scaleImageYuXd(src, srcData, srcMode, nComps, srcAlpha,
 		      srcWidth, srcHeight, scaledWidth, scaledHeight, dest);
       } else {
-	if (isImageInterpolationRequired(srcWidth, srcHeight, scaledWidth, scaledHeight, interpolate)) {
+	if (!tilingPattern && isImageInterpolationRequired(srcWidth, srcHeight, scaledWidth, scaledHeight, interpolate)) {
 	  scaleImageYuXuBilinear(src, srcData, srcMode, nComps, srcAlpha,
 				srcWidth, srcHeight, scaledWidth, scaledHeight, dest);
 	} else {
@@ -4435,7 +4507,9 @@ void Splash::scaleImageYuXd(SplashImageSource src, void *srcData,
   xq = srcWidth % scaledWidth;
 
   // allocate buffers
-  lineBuf = (Guchar *)gmallocn(srcWidth, nComps);
+  lineBuf = (Guchar *)gmallocn_checkoverflow(srcWidth, nComps);
+  if (unlikely(!lineBuf))
+    return;
   if (srcAlpha) {
     alphaLineBuf = (Guchar *)gmalloc(srcWidth);
   } else {
@@ -4902,6 +4976,13 @@ void Splash::vertFlipImage(SplashBitmap *img, int width, int height,
   gfree(lineBuf);
 }
 
+void Splash::blitImage(SplashBitmap *src, GBool srcAlpha, int xDest, int yDest) {
+  SplashClipResult clipRes = state->clip->testRect(xDest, yDest, xDest + src->getWidth() - 1, yDest + src->getHeight() - 1);
+  if (clipRes != splashClipAllOutside) {
+    blitImage(src, srcAlpha, xDest, yDest, clipRes);
+  }
+}
+
 void Splash::blitImage(SplashBitmap *src, GBool srcAlpha, int xDest, int yDest,
 		       SplashClipResult clipRes) {
   SplashPipe pipe;
@@ -5087,7 +5168,7 @@ SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc,
 	  alpha = *ap++;
 	  // this uses shape instead of alpha, which isn't technically
 	  // correct, but works out the same
-    pipe.shape = alpha;
+	  pipe.shape = alpha;
 	  (this->*pipe.run)(&pipe);
 	}
       }
@@ -5105,7 +5186,7 @@ SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc,
 	  if (state->clip->test(xDest + x, yDest + y)) {
 	    // this uses shape instead of alpha, which isn't technically
 	    // correct, but works out the same
-      pipe.shape = alpha;
+	    pipe.shape = alpha;
 	    (this->*pipe.run)(&pipe);
 	    updateModX(xDest + x);
 	    updateModY(yDest + y);
@@ -5342,6 +5423,7 @@ GBool Splash::gouraudTriangleShadedFill(SplashGouraudColor *shading)
   SplashClip* clip = getClip();
   SplashBitmap *blitTarget = bitmap;
   SplashColorPtr bitmapData = bitmap->getDataPtr();
+  int bitmapOffLimit = bitmap->getHeight() * bitmap->getRowSize();
   SplashColorPtr bitmapAlpha = bitmap->getAlphaPtr();
   SplashColorPtr cur = NULL;
   SplashCoord* userToCanvasMatrix = getMatrix();
@@ -5574,7 +5656,7 @@ GBool Splash::gouraudTriangleShadedFill(SplashGouraudColor *shading)
         colorinterp = scanColorMap[0] * scanLimitL + scanColorMap[1];
 
         bitmapOff = scanLineOff + scanLimitL * colorComps;
-        for (int X = scanLimitL; X <= scanLimitR; ++X, colorinterp += scanColorMap[0], bitmapOff += colorComps) {
+        for (int X = scanLimitL; X <= scanLimitR && bitmapOff + colorComps <= bitmapOffLimit; ++X, colorinterp += scanColorMap[0], bitmapOff += colorComps) {
           // FIXME : standard rectangular clipping can be done for a
           // complete scanline which is faster
           // --> see SplashClip and its methods
diff --git a/splash/Splash.h b/splash/Splash.h
index c31dbc85..cf98e6c6 100644
--- a/splash/Splash.h
+++ b/splash/Splash.h
@@ -13,7 +13,7 @@
 //
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
 // Copyright (C) 2007, 2011 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2010-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 //
@@ -232,6 +232,7 @@ public:
   // zero.
   SplashError blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
 			      int xDest, int yDest, int w, int h);
+  void blitImage(SplashBitmap *src, GBool srcAlpha, int xDest, int yDest);
 
   //----- misc
 
@@ -248,6 +249,10 @@ public:
   // Set the minimum line width.
   void setMinLineWidth(SplashCoord w) { minLineWidth = w; }
 
+  // Setter/Getter for thin line mode
+  void setThinLineMode(SplashThinLineMode thinLineModeA) { thinLineMode = thinLineModeA; }
+  SplashThinLineMode getThinLineMode() { return thinLineMode; }
+
   // Get a bounding box which includes all modifications since the
   // last call to clearModRegion.
   void getModRegion(int *xMin, int *yMin, int *xMax, int *yMax)
@@ -307,7 +312,7 @@ private:
   void drawAAPixelInit();
   void drawAAPixel(SplashPipe *pipe, int x, int y);
   void drawSpan(SplashPipe *pipe, int x0, int x1, int y, GBool noClip);
-  void drawAALine(SplashPipe *pipe, int x0, int x1, int y);
+  void drawAALine(SplashPipe *pipe, int x0, int x1, int y, GBool adjustLine = gFalse, Guchar lineOpacity = 0);
   void transform(SplashCoord *matrix, SplashCoord xi, SplashCoord yi,
 		 SplashCoord *xo, SplashCoord *yo);
   void updateModX(int x);
@@ -323,6 +328,7 @@ private:
 		    SplashCoord *matrix, SplashCoord flatness2,
 		    SplashPath *fPath);
   SplashPath *makeDashedPath(SplashPath *xPath);
+  void getBBoxFP(SplashPath *path, SplashCoord *xMinA, SplashCoord *yMinA, SplashCoord *xMaxA, SplashCoord *yMaxA);
   SplashError fillWithPattern(SplashPath *path, GBool eo,
 			      SplashPattern *pattern, SplashCoord alpha);
   GBool pathAllOutside(SplashPath *path);
@@ -359,7 +365,7 @@ private:
   SplashBitmap *scaleImage(SplashImageSource src, void *srcData,
 			   SplashColorMode srcMode, int nComps,
 			   GBool srcAlpha, int srcWidth, int srcHeight,
-			   int scaledWidth, int scaledHeight, GBool interpolate);
+			   int scaledWidth, int scaledHeight, GBool interpolate, GBool tilingPattern = gFalse);
   void scaleImageYdXd(SplashImageSource src, void *srcData,
 		      SplashColorMode srcMode, int nComps,
 		      GBool srcAlpha, int srcWidth, int srcHeight,
@@ -409,6 +415,7 @@ private:
   int alpha0X, alpha0Y;		// offset within alpha0Bitmap
   SplashCoord aaGamma[splashAASize * splashAASize + 1];
   SplashCoord minLineWidth;
+  SplashThinLineMode thinLineMode;
   int modXMin, modYMin, modXMax, modYMax;
   SplashClipResult opClipRes;
   GBool vectorAntialias;
diff --git a/splash/SplashBitmap.cc b/splash/SplashBitmap.cc
index 93d2da8a..ac344f17 100644
--- a/splash/SplashBitmap.cc
+++ b/splash/SplashBitmap.cc
@@ -19,7 +19,7 @@
 // Copyright (C) 2010 Harry Roberts <harry.roberts@midnight-labs.org>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2010 William Bader <williambader@hotmail.com>
-// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Anthony Wesley <awesley@smartnetworks.com.au>
 //
 // To see a description of the changes please see the Changelog file that
@@ -573,7 +573,7 @@ void SplashBitmap::getCMYKLine(int yl, SplashColorPtr line) {
 #endif
 
 SplashError SplashBitmap::writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int vDPI) {
-  if (mode != splashModeRGB8 && mode != splashModeMono8 && mode != splashModeMono1 && mode != splashModeXBGR8
+  if (mode != splashModeRGB8 && mode != splashModeMono8 && mode != splashModeMono1 && mode != splashModeXBGR8 && mode != splashModeBGR8
 #if SPLASH_CMYK
       && mode != splashModeCMYK8 && mode != splashModeDeviceN8
 #endif
@@ -657,6 +657,26 @@ SplashError SplashBitmap::writeImgFile(ImgWriter *writer, FILE *f, int hDPI, int
     }
     break;
     
+    case splashModeBGR8:
+    {
+      unsigned char *row = new unsigned char[3 * width];
+      for (int y = 0; y < height; y++) {
+        // Convert into a PNG row
+        for (int x = 0; x < width; x++) {
+          row[3*x] = data[y * rowSize + x * 3 + 2];
+          row[3*x+1] = data[y * rowSize + x * 3 + 1];
+          row[3*x+2] = data[y * rowSize + x * 3];
+        }
+
+        if (!writer->writeRow(&row)) {
+          delete[] row;
+          return splashErrGeneric;
+        }
+      }
+      delete[] row;
+    }
+    break;
+    
     case splashModeXBGR8:
     {
       unsigned char *row = new unsigned char[3 * width];
diff --git a/splash/SplashClip.cc b/splash/SplashClip.cc
index fb188317..85c6b114 100644
--- a/splash/SplashClip.cc
+++ b/splash/SplashClip.cc
@@ -12,6 +12,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -334,7 +335,7 @@ SplashClipResult SplashClip::testSpan(int spanXMin, int spanXMax, int spanY) {
   return splashClipAllInside;
 }
 
-void SplashClip::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y) {
+void SplashClip::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y, GBool adjustVertLine) {
   int xx0, xx1, xx, yy, i;
   SplashColorPtr p;
 
@@ -351,7 +352,7 @@ void SplashClip::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y) {
       for (xx = xx0; xx + 7 < xx1; xx += 8) {
 	*p++ = 0;
       }
-      if (xx < xx1) {
+      if (xx < xx1 && !adjustVertLine) {
 	*p &= 0xff >> (xx1 & 7);
       }
     }
@@ -364,7 +365,7 @@ void SplashClip::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y) {
     xx0 = 0;
   }
   xx1 = (*x1 + 1) * splashAASize;
-  if (xx0 < xx1) {
+  if (xx0 < xx1 && !adjustVertLine) {
     for (yy = 0; yy < splashAASize; ++yy) {
       p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx0 >> 3);
       xx = xx0;
diff --git a/splash/SplashClip.h b/splash/SplashClip.h
index 3eb2d780..5c0fdba9 100644
--- a/splash/SplashClip.h
+++ b/splash/SplashClip.h
@@ -12,6 +12,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -116,7 +117,8 @@ public:
   // Clips an anti-aliased line by setting pixels to zero.  On entry,
   // all non-zero pixels are between <x0> and <x1>.  This function
   // will update <x0> and <x1>.
-  void clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y);
+  void clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y,
+    GBool adjustVertLine = gFalse);
 
   // Get the rectangle part of the clip region.
   SplashCoord getXMin() { return xMin; }
diff --git a/splash/SplashTypes.h b/splash/SplashTypes.h
index 531b945b..fa4a3796 100644
--- a/splash/SplashTypes.h
+++ b/splash/SplashTypes.h
@@ -13,7 +13,7 @@
 //
 // Copyright (C) 2006, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
-// Copyright (C) 2009, 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009, 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
 // Copyright (C) 2010 William Bader <williambader@hotmail.com>
 //
@@ -76,6 +76,12 @@ enum SplashColorMode {
 #endif
 };
 
+enum SplashThinLineMode {
+  splashThinLineDefault,  // if SA on: draw solid if requested line width, transformed into 
+                          // device space, is less than half a pixel and a shaped line else
+  splashThinLineSolid,     // draw line solid at least with 1 pixel 
+  splashThinLineShape     // draw line shaped at least with 1 pixel
+};
 // number of components in each color mode
 // (defined in SplashState.cc)
 extern int splashColorModeNComps[];
diff --git a/splash/SplashXPath.cc b/splash/SplashXPath.cc
index b82d3559..27106ee3 100644
--- a/splash/SplashXPath.cc
+++ b/splash/SplashXPath.cc
@@ -13,6 +13,7 @@
 //
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
 // Copyright (C) 2010, 2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -66,7 +67,8 @@ inline void SplashXPath::transform(SplashCoord *matrix,
 //------------------------------------------------------------------------
 
 SplashXPath::SplashXPath(SplashPath *path, SplashCoord *matrix,
-			 SplashCoord flatness, GBool closeSubpaths) {
+			 SplashCoord flatness, GBool closeSubpaths,
+			 GBool adjustLines, int linePosI) {
   SplashPathHint *hint;
   SplashXPathPoint *pts;
   SplashXPathAdjust *adjusts, *adjust;
@@ -127,7 +129,15 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord *matrix,
       x0 = splashRound(adj0);
       x1 = splashRound(adj1);
       if (x1 == x0) {
-	x1 = x1 + 1;
+        if (adjustLines) {
+          // the adjustment moves thin lines (clip rectangle with
+          // empty width or height) out of clip area, here we need
+          // a special adjustment:
+          x0 = linePosI;
+          x1 = x0 + 1;
+        } else {
+          x1 = x1 + 1;
+        }
       }
       adjusts[i].x0 = (SplashCoord)x0;
       adjusts[i].x1 = (SplashCoord)x1 - 0.01;
diff --git a/splash/SplashXPath.h b/splash/SplashXPath.h
index db06978a..1c7040da 100644
--- a/splash/SplashXPath.h
+++ b/splash/SplashXPath.h
@@ -4,6 +4,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+//
+// 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
+//
+//========================================================================
+
 #ifndef SPLASHXPATH_H
 #define SPLASHXPATH_H
 
@@ -50,7 +64,8 @@ public:
   // space, via <matrix>.  If <closeSubpaths> is true, closes all open
   // subpaths.
   SplashXPath(SplashPath *path, SplashCoord *matrix,
-	      SplashCoord flatness, GBool closeSubpaths);
+	      SplashCoord flatness, GBool closeSubpaths,
+	      GBool adjustLines = gFalse, int linePosI = 0);
 
   // Copy an expanded path.
   SplashXPath *copy() { return new SplashXPath(this); }
diff --git a/splash/SplashXPathScanner.cc b/splash/SplashXPathScanner.cc
index 738cef7b..0fd5ccdc 100644
--- a/splash/SplashXPathScanner.cc
+++ b/splash/SplashXPathScanner.cc
@@ -13,6 +13,7 @@
 //
 // Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -367,7 +368,7 @@ void SplashXPathScanner::addIntersection(double segYMin, double segYMax,
 }
 
 void SplashXPathScanner::renderAALine(SplashBitmap *aaBuf,
-				      int *x0, int *x1, int y) {
+				      int *x0, int *x1, int y, GBool adjustVertLine) {
   int xx0, xx1, xx, xxMin, xxMax, yy, interEnd;
   Guchar mask;
   SplashColorPtr p;
@@ -418,8 +419,8 @@ void SplashXPathScanner::renderAALine(SplashBitmap *aaBuf,
 	  xx = xx0;
 	  p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx >> 3);
 	  if (xx & 7) {
-	    mask = 0xff >> (xx & 7);
-	    if ((xx & ~7) == (xx1 & ~7)) {
+	    mask = adjustVertLine ? 0xff : 0xff >> (xx & 7);
+	    if (!adjustVertLine && (xx & ~7) == (xx1 & ~7)) {
 	      mask &= (Guchar)(0xff00 >> (xx1 & 7));
 	    }
 	    *p++ |= mask;
@@ -429,7 +430,7 @@ void SplashXPathScanner::renderAALine(SplashBitmap *aaBuf,
 	    *p++ |= 0xff;
 	  }
 	  if (xx < xx1) {
-	    *p |= (Guchar)(0xff00 >> (xx1 & 7));
+	    *p |= adjustVertLine ? 0xff : (Guchar)(0xff00 >> (xx1 & 7));
 	  }
 	}
 	if (xx0 < xxMin) {
diff --git a/splash/SplashXPathScanner.h b/splash/SplashXPathScanner.h
index 719fae48..b59e3068 100644
--- a/splash/SplashXPathScanner.h
+++ b/splash/SplashXPathScanner.h
@@ -4,6 +4,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+//
+// 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
+//
+//========================================================================
+
 #ifndef SPLASHXPATHSCANNER_H
 #define SPLASHXPATHSCANNER_H
 
@@ -60,7 +74,8 @@ public:
 
   // Renders one anti-aliased line into <aaBuf>.  Returns the min and
   // max x coordinates with non-zero pixels in <x0> and <x1>.
-  void renderAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y);
+  void renderAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y,
+    GBool adjustVertLine = gFalse);
 
   // Clips an anti-aliased line by setting pixels to zero.  On entry,
   // all non-zero pixels are between <x0> and <x1>.  This function
diff --git a/test-driver b/test-driver
new file mode 100755
index 00000000..32bf39e8
--- /dev/null
+++ b/test-driver
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/test/Makefile.am b/test/Makefile.am
index b3289c72..af5bcf22 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -52,7 +52,8 @@ gtk_test_LDADD =					\
 	$(top_builddir)/poppler/libpoppler.la           \
 	$(top_builddir)/glib/libpoppler-glib.la         \
 	$(CAIRO_LIBS)					\
-	$(GTK_TEST_LIBS)
+	$(GTK_TEST_LIBS)				\
+	$(PTHREAD_LIBS)
 
 
 pdf_inspector_SOURCES =			\
@@ -64,7 +65,8 @@ pdf_inspector_LDADD =					\
 	$(CAIRO_LIBS)					\
 	$(FREETYPE_LIBS)				\
 	$(GTK_TEST_LIBS)				\
-	$(X_EXTRA_LIBS)
+	$(X_EXTRA_LIBS)					\
+	$(PTHREAD_LIBS)
 
 perf_test_SOURCES =			\
        perf-test.cc                     \
diff --git a/test/Makefile.in b/test/Makefile.in
index eecc620a..92397b61 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,9 +81,10 @@ host_triplet = @host@
 noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
 	$(am__EXEEXT_4)
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -80,10 +108,11 @@ gtk_test_OBJECTS = $(am_gtk_test_OBJECTS)
 am__DEPENDENCIES_1 =
 gtk_test_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 	$(top_builddir)/glib/libpoppler-glib.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_pdf_fullrewrite_OBJECTS = pdf-fullrewrite.$(OBJEXT) \
 	parseargs.$(OBJEXT)
 pdf_fullrewrite_OBJECTS = $(am_pdf_fullrewrite_OBJECTS)
@@ -94,12 +123,24 @@ pdf_inspector_DEPENDENCIES =  \
 	$(top_builddir)/poppler/libpoppler-cairo.la \
 	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_perf_test_OBJECTS = perf-test.$(OBJEXT) \
 	perf-test-preview-dummy.$(OBJEXT)
 perf_test_OBJECTS = $(am_perf_test_OBJECTS)
 perf_test_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -112,20 +153,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(gtk_test_SOURCES) $(pdf_fullrewrite_SOURCES) \
 	$(pdf_inspector_SOURCES) $(perf_test_SOURCES)
 DIST_SOURCES = $(gtk_test_SOURCES) $(pdf_fullrewrite_SOURCES) \
@@ -135,6 +172,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -230,6 +284,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -264,10 +321,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -289,13 +352,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -373,7 +436,8 @@ gtk_test_LDADD = \
 	$(top_builddir)/poppler/libpoppler.la           \
 	$(top_builddir)/glib/libpoppler-glib.la         \
 	$(CAIRO_LIBS)					\
-	$(GTK_TEST_LIBS)
+	$(GTK_TEST_LIBS)				\
+	$(PTHREAD_LIBS)
 
 pdf_inspector_SOURCES = \
        pdf-inspector.cc
@@ -384,7 +448,8 @@ pdf_inspector_LDADD = \
 	$(CAIRO_LIBS)					\
 	$(FREETYPE_LIBS)				\
 	$(GTK_TEST_LIBS)				\
-	$(X_EXTRA_LIBS)
+	$(X_EXTRA_LIBS)					\
+	$(PTHREAD_LIBS)
 
 perf_test_SOURCES = \
        perf-test.cc                     \
@@ -449,15 +514,19 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 gtk-test$(EXEEXT): $(gtk_test_OBJECTS) $(gtk_test_DEPENDENCIES) $(EXTRA_gtk_test_DEPENDENCIES) 
 	@rm -f gtk-test$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(gtk_test_OBJECTS) $(gtk_test_LDADD) $(LIBS)
+
 pdf-fullrewrite$(EXEEXT): $(pdf_fullrewrite_OBJECTS) $(pdf_fullrewrite_DEPENDENCIES) $(EXTRA_pdf_fullrewrite_DEPENDENCIES) 
 	@rm -f pdf-fullrewrite$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdf_fullrewrite_OBJECTS) $(pdf_fullrewrite_LDADD) $(LIBS)
+
 pdf_inspector$(EXEEXT): $(pdf_inspector_OBJECTS) $(pdf_inspector_DEPENDENCIES) $(EXTRA_pdf_inspector_DEPENDENCIES) 
 	@rm -f pdf_inspector$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdf_inspector_OBJECTS) $(pdf_inspector_LDADD) $(LIBS)
+
 perf-test$(EXEEXT): $(perf_test_OBJECTS) $(perf_test_DEPENDENCIES) $(EXTRA_perf_test_DEPENDENCIES) 
 	@rm -f perf-test$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(perf_test_OBJECTS) $(perf_test_LDADD) $(LIBS)
@@ -516,26 +585,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -547,15 +605,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -564,6 +618,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -705,18 +774,19 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/test/gtk-test.cc b/test/gtk-test.cc
index a5759d7f..aab7951d 100644
--- a/test/gtk-test.cc
+++ b/test/gtk-test.cc
@@ -116,7 +116,7 @@ GDKSplashOutputDev::~GDKSplashOutputDev() {
 
 void GDKSplashOutputDev::clear() {
   startDoc(NULL);
-  startPage(0, NULL);
+  startPage(0, NULL, NULL);
 }
 
 void GDKSplashOutputDev::endPage() {
@@ -306,8 +306,12 @@ view_new (PopplerDocument *doc)
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(3, 7, 8)
+  gtk_container_add(GTK_CONTAINER(sw), view->drawing_area);
+#else
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw),
                                          view->drawing_area);
+#endif
   gtk_widget_show (view->drawing_area);
 
   gtk_box_pack_end (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
diff --git a/test/pdf-fullrewrite.cc b/test/pdf-fullrewrite.cc
index 2b912f7e..81083723 100644
--- a/test/pdf-fullrewrite.cc
+++ b/test/pdf-fullrewrite.cc
@@ -149,6 +149,7 @@ static GBool compareObjects(Object *objA, Object *objB)
       }
     }
     case objInt:
+    case objInt64:
     case objReal:
     {
       if (!objB->isNum()) {
@@ -159,14 +160,6 @@ static GBool compareObjects(Object *objA, Object *objB)
         return (-0.01 < diff) && (diff < 0.01);
       }
     }
-    case objUint:
-    {
-      if (objB->getType() != objUint) {
-        return gFalse;
-      } else {
-        return (objA->getUint() == objB->getUint());
-      }
-    }
     case objString:
     {
       if (objB->getType() != objString) {
diff --git a/test/perf-test.cc b/test/perf-test.cc
index 21fbdeed..da14a7c7 100644
--- a/test/perf-test.cc
+++ b/test/perf-test.cc
@@ -1,5 +1,5 @@
 /* Copyright Krzysztof Kowalczyk 2006-2007

-   Copyright Hib Eris <hib@hiberis.nl> 2008

+   Copyright Hib Eris <hib@hiberis.nl> 2008, 2013

    License: GPLv2 */

 /*

   A tool to stress-test poppler rendering and measure rendering times for

@@ -325,7 +325,7 @@ void sleep_milliseconds(int milliseconds)
 #endif

 }

 

-#ifndef _MSC_VER

+#ifndef HAVE_STRCPY_S

 void strcpy_s(char* dst, size_t dst_size, const char* src)

 {

     size_t src_size = strlen(src) + 1;

@@ -338,7 +338,9 @@ void strcpy_s(char* dst, size_t dst_size, const char* src)
         }

     }

 }

+#endif

 

+#ifndef HAVE_STRCAT_S

 void strcat_s(char *dst, size_t dst_size, const char* src)

 {

     size_t dst_len = strlen(dst);

@@ -742,7 +744,7 @@ void OutputDebugString(const char *txt)
 #define _vsnprintf vsnprintf

 #endif

 

-void my_error(void *, ErrorCategory, int pos, char *msg) {

+void my_error(void *, ErrorCategory, Goffset pos, char *msg) {

 #if 0

     char        buf[4096], *p = buf;

 

@@ -752,7 +754,7 @@ void my_error(void *, ErrorCategory, int pos, char *msg) {
     }

 

     if (pos >= 0) {

-        p += _snprintf(p, sizeof(buf)-1, "Error (%d): ", pos);

+      p += _snprintf(p, sizeof(buf)-1, "Error (%lld): ", (long long)pos);

         *p   = '\0';

         OutputDebugString(p);

     } else {

@@ -769,7 +771,7 @@ void my_error(void *, ErrorCategory, int pos, char *msg) {
     OutputDebugString(buf);

 

     if (pos >= 0) {

-        p += _snprintf(p, sizeof(buf)-1, "Error (%d): ", pos);

+        p += _snprintf(p, sizeof(buf)-1, "Error (%lld): ", (long long)pos);

         *p   = '\0';

         OutputDebugString(buf);

         if (gErrFile)

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 06378bd9..f82cfa4d 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -36,6 +36,9 @@ if (HAVE_CAIRO)
   if(LCMS_FOUND)
     target_link_libraries(pdftocairo ${LCMS_LIBRARIES})
   endif(LCMS_FOUND)
+  if(HAVE_PTHREAD)
+    target_link_libraries(pdftocairo ${CMAKE_THREAD_LIBS_INIT})
+  endif()
   if(LCMS2_FOUND)
     target_link_libraries(pdftocairo ${LCMS2_LIBRARIES})
   endif(LCMS2_FOUND)
diff --git a/utils/HtmlFonts.cc b/utils/HtmlFonts.cc
index d8334bce..a12992ec 100644
--- a/utils/HtmlFonts.cc
+++ b/utils/HtmlFonts.cc
@@ -25,6 +25,7 @@
 // Copyright (C) 2011 Stephen Reichling <sreichling@chegg.com>
 // Copyright (C) 2012 Igor Slepchin <igor.slepchin@gmail.com>
 // Copyright (C) 2012 Luis Parravicini <lparravi@gmail.com>
+// Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr>
 //
 // 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
@@ -297,7 +298,7 @@ HtmlFontAccu::~HtmlFontAccu(){
 
 int HtmlFontAccu::AddFont(const HtmlFont& font){
  std::vector<HtmlFont>::iterator i; 
- for (i=accu->begin();i!=accu->end();i++)
+ for (i=accu->begin();i!=accu->end();++i)
  {
 	if (font.isEqual(*i)) 
 	{
diff --git a/utils/HtmlLinks.cc b/utils/HtmlLinks.cc
index 1d609f67..34b246e0 100644
--- a/utils/HtmlLinks.cc
+++ b/utils/HtmlLinks.cc
@@ -19,6 +19,7 @@
 //
 // Copyright (C) 2008 Boris Toloknov <tlknv@yandex.ru>
 // Copyright (C) 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr>
 //
 // 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
@@ -128,7 +129,7 @@ HtmlLinks::~HtmlLinks(){
 
 GBool HtmlLinks::inLink(double xmin,double ymin,double xmax,double ymax,int& p)const {
   
-  for(std::vector<HtmlLink>::iterator i=accu->begin();i!=accu->end();i++){
+  for(std::vector<HtmlLink>::iterator i=accu->begin();i!=accu->end();++i){
     if (i->inLink(xmin,ymin,xmax,ymax)) {
         p=(i - accu->begin());
         return 1;
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index a718380f..7926674e 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -17,7 +17,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005-2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2008 Kjartan Maraas <kmaraas@gnome.org>
 // Copyright (C) 2008 Boris Toloknov <tlknv@yandex.ru>
 // Copyright (C) 2008 Haruyuki Kawabe <Haruyuki.Kawabe@unisys.co.jp>
@@ -34,6 +34,9 @@
 // Copyright (C) 2012 Ihar Filipau <thephilips@gmail.com>
 // Copyright (C) 2012 Gerald Schmidt <solahcin@gmail.com>
 // Copyright (C) 2012 Pino Toscano <pino@kde.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Julien Nabet <serval2412@yahoo.fr>
+// Copyright (C) 2013 Johannes Brandstätter <jbrandstaetter@gmail.com>
 //
 // 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
@@ -1229,7 +1232,7 @@ HtmlOutputDev::~HtmlOutputDev() {
       delete pages;
 }
 
-void HtmlOutputDev::startPage(int pageNum, GfxState *state) {
+void HtmlOutputDev::startPage(int pageNum, GfxState *state, XRef *xref) {
 #if 0
   if (mode&&!xml){
     if (write){
@@ -1500,7 +1503,8 @@ void HtmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   /*if( !globalParams->getErrQuiet() )
     printf("image stream of kind %d\n", str->getKind());*/
   // dump JPEG file
-  if (dumpJPEG && str->getKind() == strDCT) {
+  if (dumpJPEG && str->getKind() == strDCT && (colorMap->getNumPixelComps() == 1 ||
+	  colorMap->getNumPixelComps() == 3) && !inlineImg) {
     drawJpegImage(state, str);
   }
   else {
@@ -1699,9 +1703,9 @@ GBool HtmlOutputDev::dumpDocOutline(PDFDoc* doc)
 			GooString *str = Docname->copy();
 			str->append("-outline.html");
 			output = fopen(str->getCString(), "w");
+			delete str;
 			if (output == NULL)
 				return gFalse;
-			delete str;
 			bClose = gTrue;
 
 			GooString *htmlEncoding =
@@ -1795,7 +1799,7 @@ GBool HtmlOutputDev::newHtmlOutlineLevel(FILE *output, GooList *outlines, Catalo
 		atLeastOne = gTrue;
 
 		item->open();
-		if (item->hasKids())
+		if (item->hasKids() && item->getKids())
 		{
 			fputs("\n",output);
 			newHtmlOutlineLevel(output, item->getKids(), catalog, level+1);
@@ -1832,7 +1836,7 @@ void HtmlOutputDev::newXmlOutlineLevel(FILE *output, GooList *outlines, Catalog*
         delete titleStr;
 
         item->open();
-        if (item->hasKids())
+        if (item->hasKids() && item->getKids())
         {
             newXmlOutlineLevel(output, item->getKids(), catalog);
         }
diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h
index 12b16bff..c9fd28c1 100644
--- a/utils/HtmlOutputDev.h
+++ b/utils/HtmlOutputDev.h
@@ -23,6 +23,7 @@
 // Copyright (C) 2011 Stephen Reichling <sreichling@chegg.com>
 // Copyright (C) 2012 Igor Slepchin <igor.redhat@gmail.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -279,7 +280,7 @@ public:
 
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
 
   // End a page.
   virtual void endPage();
diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc
index 0c06513c..8b18d2b4 100644
--- a/utils/ImageOutputDev.cc
+++ b/utils/ImageOutputDev.cc
@@ -21,6 +21,7 @@
 // Copyright (C) 2009 William Bader <williambader@hotmail.com>
 // Copyright (C) 2010 Jakob Voss <jakob.voss@gbv.de>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Fischer <fischer@unix-ag.uni-kl.de>
 //
 // 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
@@ -416,7 +417,7 @@ void ImageOutputDev::drawSoftMaskedImage(
   GfxImageColorMap *maskColorMap, GBool maskInterpolate) {
   if (listImages) {
     listImage(state, ref, str, width, height, colorMap, interpolate, gFalse, imgImage);
-    listImage(state, ref, maskStr, maskWidth, height, maskColorMap, maskInterpolate, gFalse, imgSmask);
+    listImage(state, ref, maskStr, maskWidth, maskHeight, maskColorMap, maskInterpolate, gFalse, imgSmask);
   } else {
     drawImage(state, ref, str, width, height, colorMap, interpolate, NULL, gFalse);
     drawImage(state, ref, maskStr, maskWidth, maskHeight,
diff --git a/utils/ImageOutputDev.h b/utils/ImageOutputDev.h
index 6201a249..13911ed3 100644
--- a/utils/ImageOutputDev.h
+++ b/utils/ImageOutputDev.h
@@ -18,6 +18,7 @@
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2010 Jakob Voss <jakob.voss@gbv.de>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
 // 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
@@ -78,7 +79,7 @@ public:
   virtual GBool needNonText() { return gTrue; }
 
   // Start a page
-  virtual void startPage(int pageNumA, GfxState *state) 
+  virtual void startPage(int pageNumA, GfxState *state, XRef *xref) 
 			{ pageNum = pageNumA; }
  
   //---- get info about output device
diff --git a/utils/Makefile.am b/utils/Makefile.am
index d56cc9c6..0c954413 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -35,7 +35,9 @@ endif
 
 pdftocairo_LDADD =				\
 	$(top_builddir)/poppler/libpoppler-cairo.la \
-	$(LDADD) $(PDFTOCAIRO_LIBS)
+	$(LDADD)				\
+	$(PDFTOCAIRO_LIBS)			\
+	$(PTHREAD_LIBS)
 
 
 pdftocairo_binary = pdftocairo
diff --git a/utils/Makefile.in b/utils/Makefile.in
index aa531030..c23e158f 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -59,10 +86,10 @@ bin_PROGRAMS = pdfdetach$(EXEEXT) pdffonts$(EXEEXT) pdfimages$(EXEEXT) \
 	$(am__EXEEXT_1) $(am__EXEEXT_2)
 @BUILD_LIBPNG_TRUE@am__append_3 = $(LIBPNG_CFLAGS)
 subdir = utils
-DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(dist_man1_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/define-dir.m4 $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/introspection.m4 \
 	$(top_srcdir)/m4/libjpeg.m4 $(top_srcdir)/m4/libtool.m4 \
@@ -88,6 +115,7 @@ pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
 pdffonts_LDADD = $(LDADD)
@@ -117,7 +145,8 @@ am__DEPENDENCIES_2 =
 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
 @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
 @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4)
+@BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4) \
+@BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2)
 am__objects_2 = pdftohtml-parseargs.$(OBJEXT)
 am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
 	pdftohtml-HtmlFonts.$(OBJEXT) pdftohtml-HtmlLinks.$(OBJEXT) \
@@ -147,6 +176,18 @@ am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
 pdfunite_LDADD = $(LDADD)
 pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -159,17 +200,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -178,17 +218,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(pdfdetach_SOURCES) $(pdffonts_SOURCES) \
 	$(pdfimages_SOURCES) $(pdfinfo_SOURCES) $(pdfseparate_SOURCES) \
 	$(pdftocairo_SOURCES) $(pdftohtml_SOURCES) $(pdftoppm_SOURCES) \
@@ -233,6 +272,23 @@ am__uninstall_files_from_dir = { \
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man1_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -328,6 +384,9 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOCQT4 = @MOCQT4@
+MOCQT42 = @MOCQT42@
+MOCQT5 = @MOCQT5@
+MOCQT52 = @MOCQT52@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -362,10 +421,16 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
 POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
 POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
 POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+POPPLER_QT5_TEST_CFLAGS = @POPPLER_QT5_TEST_CFLAGS@
+POPPLER_QT5_TEST_LIBS = @POPPLER_QT5_TEST_LIBS@
 POPPLER_VERSION = @POPPLER_VERSION@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
+QTCHOOSER = @QTCHOOSER@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -387,13 +452,13 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 auto_import_flags = @auto_import_flags@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -460,7 +525,9 @@ LDADD = \
 
 @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \
 @BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la \
-@BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD) $(PDFTOCAIRO_LIBS)
+@BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD)				\
+@BUILD_CAIRO_OUTPUT_TRUE@	$(PDFTOCAIRO_LIBS)			\
+@BUILD_CAIRO_OUTPUT_TRUE@	$(PTHREAD_LIBS)
 
 @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_binary = pdftocairo
 @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_manpage = pdftocairo.1
@@ -578,10 +645,12 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -602,7 +671,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -615,36 +685,47 @@ clean-binPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 pdfdetach$(EXEEXT): $(pdfdetach_OBJECTS) $(pdfdetach_DEPENDENCIES) $(EXTRA_pdfdetach_DEPENDENCIES) 
 	@rm -f pdfdetach$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdfdetach_OBJECTS) $(pdfdetach_LDADD) $(LIBS)
+
 pdffonts$(EXEEXT): $(pdffonts_OBJECTS) $(pdffonts_DEPENDENCIES) $(EXTRA_pdffonts_DEPENDENCIES) 
 	@rm -f pdffonts$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdffonts_OBJECTS) $(pdffonts_LDADD) $(LIBS)
+
 pdfimages$(EXEEXT): $(pdfimages_OBJECTS) $(pdfimages_DEPENDENCIES) $(EXTRA_pdfimages_DEPENDENCIES) 
 	@rm -f pdfimages$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdfimages_OBJECTS) $(pdfimages_LDADD) $(LIBS)
+
 pdfinfo$(EXEEXT): $(pdfinfo_OBJECTS) $(pdfinfo_DEPENDENCIES) $(EXTRA_pdfinfo_DEPENDENCIES) 
 	@rm -f pdfinfo$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdfinfo_OBJECTS) $(pdfinfo_LDADD) $(LIBS)
+
 pdfseparate$(EXEEXT): $(pdfseparate_OBJECTS) $(pdfseparate_DEPENDENCIES) $(EXTRA_pdfseparate_DEPENDENCIES) 
 	@rm -f pdfseparate$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdfseparate_OBJECTS) $(pdfseparate_LDADD) $(LIBS)
+
 pdftocairo$(EXEEXT): $(pdftocairo_OBJECTS) $(pdftocairo_DEPENDENCIES) $(EXTRA_pdftocairo_DEPENDENCIES) 
 	@rm -f pdftocairo$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdftocairo_OBJECTS) $(pdftocairo_LDADD) $(LIBS)
+
 pdftohtml$(EXEEXT): $(pdftohtml_OBJECTS) $(pdftohtml_DEPENDENCIES) $(EXTRA_pdftohtml_DEPENDENCIES) 
 	@rm -f pdftohtml$(EXEEXT)
 	$(AM_V_CXXLD)$(pdftohtml_LINK) $(pdftohtml_OBJECTS) $(pdftohtml_LDADD) $(LIBS)
+
 pdftoppm$(EXEEXT): $(pdftoppm_OBJECTS) $(pdftoppm_DEPENDENCIES) $(EXTRA_pdftoppm_DEPENDENCIES) 
 	@rm -f pdftoppm$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdftoppm_OBJECTS) $(pdftoppm_LDADD) $(LIBS)
+
 pdftops$(EXEEXT): $(pdftops_OBJECTS) $(pdftops_DEPENDENCIES) $(EXTRA_pdftops_DEPENDENCIES) 
 	@rm -f pdftops$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdftops_OBJECTS) $(pdftops_LDADD) $(LIBS)
+
 pdftotext$(EXEEXT): $(pdftotext_OBJECTS) $(pdftotext_DEPENDENCIES) $(EXTRA_pdftotext_DEPENDENCIES) 
 	@rm -f pdftotext$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdftotext_OBJECTS) $(pdftotext_LDADD) $(LIBS)
+
 pdfunite$(EXEEXT): $(pdfunite_OBJECTS) $(pdfunite_DEPENDENCIES) $(EXTRA_pdfunite_DEPENDENCIES) 
 	@rm -f pdfunite$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(pdfunite_OBJECTS) $(pdfunite_LDADD) $(LIBS)
@@ -812,26 +893,15 @@ uninstall-man1:
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -843,15 +913,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -860,24 +926,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1018,20 +1086,20 @@ uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-man \
-	uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-man uninstall-man1
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/utils/pdfdetach.1 b/utils/pdfdetach.1
index c80dde72..2bba58b5 100644
--- a/utils/pdfdetach.1
+++ b/utils/pdfdetach.1
@@ -11,14 +11,6 @@ extractor (version 3.03)
 .B Pdfdetach
 lists or extracts embedded files (attachments) from a Portable
 Document Format (PDF) file.
-.SH CONFIGURATION FILE
-Pdfdetach reads a configuration file at startup.  It first tries to
-find the user's private config file, ~/.xpdfrc.  If that doesn't
-exist, it looks for a system-wide config file, typically
-/usr/local/etc/xpdfrc (but this location can be changed when pdfinfo
-is built).  See the
-.BR xpdfrc (5)
-man page for details.
 .SH OPTIONS
 Some of the following options can be set with configuration file
 commands.  These are listed in square brackets with the description of
@@ -44,12 +36,8 @@ Set the file name used when saving an embedded file with the "\-save"
 switch, or the directory used by "\-saveall".
 .TP
 .BI \-enc " encoding-name"
-Sets the encoding to use for text output (embedded file names).  The
-.I encoding\-name
-must be defined with the unicodeMap command (see
-.BR xpdfrc (5)).
-This defaults to "Latin1" (which is a built-in encoding).
-.RB "[config file: " textEncoding ]
+Sets the encoding to use for text output (embedded file names).
+This defaults to "UTF-8".
 .TP
 .BI \-opw " password"
 Specify the owner password for the PDF file.  Providing this will
@@ -58,11 +46,6 @@ bypass all security restrictions.
 .BI \-upw " password"
 Specify the user password for the PDF file.
 .TP
-.BI \-cfg " config-file"
-Read
-.I config-file
-in place of ~/.xpdfrc or the system-wide config file.
-.TP
 .B \-v
 Print copyright and version information.
 .TP
@@ -100,4 +83,4 @@ Cog, LLC.
 .BR pdftohtml (1),
 .BR pdftoppm (1),
 .BR pdftops (1),
-.BR pdftotext (1)
\ No newline at end of file
+.BR pdftotext (1)
diff --git a/utils/pdfdetach.cc b/utils/pdfdetach.cc
index 3fbdfb7e..4f67fd70 100644
--- a/utils/pdfdetach.cc
+++ b/utils/pdfdetach.cc
@@ -14,6 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2011 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2013 Yury G. Kudryashov <urkud.urkud@gmail.com>
 //
 // 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
@@ -46,7 +47,6 @@ static char savePath[1024] = "";
 static char textEncName[128] = "";
 static char ownerPassword[33] = "\001";
 static char userPassword[33] = "\001";
-static char cfgFileName[256] = "";
 static GBool printVersion = gFalse;
 static GBool printHelp = gFalse;
 
@@ -65,8 +65,6 @@ static ArgDesc argDesc[] = {
    "owner password (for encrypted files)"},
   {"-upw",    argString,   userPassword,   sizeof(userPassword),
    "user password (for encrypted files)"},
-  {"-cfg",        argString,      cfgFileName,    sizeof(cfgFileName),
-   "configuration file to use in place of .xpdfrc"},
   {"-v",      argFlag,     &printVersion,  0,
    "print copyright and version info"},
   {"-h",      argFlag,     &printHelp,     0,
@@ -121,7 +119,7 @@ int main(int argc, char *argv[]) {
   fileName = new GooString(argv[1]);
 
   // read config file
-  globalParams = new GlobalParams(cfgFileName);
+  globalParams = new GlobalParams();
   if (textEncName[0]) {
     globalParams->setTextEncoding(textEncName);
   }
diff --git a/utils/pdfimages.1 b/utils/pdfimages.1
index 955d8b3c..2929eca1 100644
--- a/utils/pdfimages.1
+++ b/utils/pdfimages.1
@@ -40,7 +40,7 @@ Instead of writing the images, list the images along with various information fo
 .IR image-root
 with this option.
 .IP
-The following information is listed for each font:
+The following information is listed for each image:
 .RS
 .TP
 .B page
@@ -133,7 +133,7 @@ ccitt - CCITT Group 3 or Group 4 Fax
 "yes" if the interpolation is to be performed when scaling up the image
 .TP
 .B object ID
-the font dictionary object ID (number and generation)
+the image dictionary object ID (number and generation)
 .RE
 .TP
 .BI \-opw " password"
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 10a6c31e..14e4f6c6 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -17,7 +17,7 @@
 // Copyright (C) 2007-2010, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2011 Vittal Aithal <vittal.aithal@cognidox.com>
-// Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2012, 2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 //
 // To see a description of the changes please see the Changelog file that
@@ -36,6 +36,7 @@
 #include "parseargs.h"
 #include "printencodings.h"
 #include "goo/GooString.h"
+#include "goo/gfile.h"
 #include "goo/gmem.h"
 #include "GlobalParams.h"
 #include "Object.h"
@@ -351,16 +352,8 @@ int main(int argc, char *argv[]) {
   f = fopen(fileName->getCString(), "rb");
 #endif
   if (f) {
-#if HAVE_FSEEKO
-    fseeko(f, 0, SEEK_END);
-    printf("File size:      %u bytes\n", (Guint)ftello(f));
-#elif HAVE_FSEEK64
-    fseek64(f, 0, SEEK_END);
-    printf("File size:      %u bytes\n", (Guint)ftell64(f));
-#else
-    fseek(f, 0, SEEK_END);
-    printf("File size:      %d bytes\n", (int)ftell(f));
-#endif
+    Gfseek(f, 0, SEEK_END);
+    printf("File size:      %lld bytes\n", (long long)Gftell(f));
     fclose(f);
   }
 
diff --git a/utils/pdfseparate.1 b/utils/pdfseparate.1
index 077faec8..07779a14 100644
--- a/utils/pdfseparate.1
+++ b/utils/pdfseparate.1
@@ -25,7 +25,7 @@ The PDF-file should not be encrypted.
 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.
+Specifies the last page to extract. If \-l is omitted, extraction ends with the last page.
 .TP
 .B \-v
 Print copyright and version information.
diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 97372be1..bcec8cb7 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -165,7 +165,6 @@ public:
       CharCode code, Unicode *u, int uLen) { return false; }
   void endType3Char(GfxState *state) { }
   void beginTextObject(GfxState *state) { }
-  GBool deviceHasTextClip(GfxState *state) { return false; }
   void endTextObject(GfxState *state) { }
   GBool interpretType3Chars() { return gFalse; }
 };
diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc
index cebb12a4..73f337c2 100644
--- a/utils/pdftoppm.cc
+++ b/utils/pdftoppm.cc
@@ -23,7 +23,8 @@
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2010 Jonathan Liu <net147@gmail.com>
 // Copyright (C) 2010 William Bader <williambader@hotmail.com>
-// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 //
 // 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
@@ -49,6 +50,18 @@
 #include "splash/Splash.h"
 #include "SplashOutputDev.h"
 
+// Uncomment to build pdftoppm with pthreads
+// You may also have to change the buildsystem to
+// link pdftoppm to pthread library
+// This is here for developer testing not user ready
+// #define UTILS_USE_PTHREADS 1
+
+#ifdef UTILS_USE_PTHREADS
+#include <errno.h>
+#include <pthread.h>
+#include <deque>
+#endif // UTILS_USE_PTHREADS
+
 static int firstPage = 1;
 static int lastPage = 0;
 static GBool printOnlyOdd = gFalse;
@@ -81,6 +94,9 @@ static char vectorAntialiasStr[16] = "";
 static char ownerPassword[33] = "";
 static char userPassword[33] = "";
 static char TiffCompressionStr[16] = "";
+#ifdef UTILS_USE_PTHREADS
+static int numberOfJobs = 1;
+#endif // UTILS_USE_PTHREADS
 static GBool quiet = gFalse;
 static GBool printVersion = gFalse;
 static GBool printHelp = gFalse;
@@ -164,6 +180,11 @@ static const ArgDesc argDesc[] = {
   {"-upw",    argString,   userPassword,   sizeof(userPassword),
    "user password (for encrypted files)"},
   
+#ifdef UTILS_USE_PTHREADS
+  {"-j",      argInt,      &numberOfJobs,  0,
+   "number of jobs to run concurrently"},
+#endif // UTILS_USE_PTHREADS
+
   {"-q",      argFlag,     &quiet,         0,
    "don't print any messages or errors"},
   {"-v",      argFlag,     &printVersion,  0,
@@ -226,6 +247,54 @@ static void savePageSlice(PDFDoc *doc,
   }
 }
 
+#ifdef UTILS_USE_PTHREADS
+
+struct PageJob {
+  PDFDoc *doc;
+  int pg;
+  
+  double pg_w, pg_h;
+  SplashColor* paperColor;
+  
+  char *ppmFile;
+};
+
+static std::deque<PageJob> pageJobQueue;
+static pthread_mutex_t pageJobMutex = PTHREAD_MUTEX_INITIALIZER;
+
+static void processPageJobs() {
+  while(true) {
+    // pop the next job or exit if queue is empty
+    pthread_mutex_lock(&pageJobMutex);
+    
+    if(pageJobQueue.empty()) {
+      pthread_mutex_unlock(&pageJobMutex);
+      return;
+    }
+    
+    PageJob pageJob = pageJobQueue.front();
+    pageJobQueue.pop_front();
+    
+    pthread_mutex_unlock(&pageJobMutex);
+    
+    // process the job    
+    SplashOutputDev *splashOut = new SplashOutputDev(mono ? splashModeMono1 :
+                  gray ? splashModeMono8 :
+#if SPLASH_CMYK
+        			    (jpegcmyk || overprint) ? splashModeDeviceN8 :
+#endif
+		              splashModeRGB8, 4, gFalse, *pageJob.paperColor);
+    splashOut->startDoc(pageJob.doc);
+    
+    savePageSlice(pageJob.doc, splashOut, pageJob.pg, x, y, w, h, pageJob.pg_w, pageJob.pg_h, pageJob.ppmFile);
+    
+    delete splashOut;
+    delete[] pageJob.ppmFile;
+  }
+}
+
+#endif // UTILS_USE_PTHREADS
+
 static int numberOfCharacters(unsigned int n)
 {
   int charNum = 0;
@@ -245,7 +314,11 @@ int main(int argc, char *argv[]) {
   char *ppmFile;
   GooString *ownerPW, *userPW;
   SplashColor paperColor;
+#ifndef UTILS_USE_PTHREADS
   SplashOutputDev *splashOut;
+#else
+  pthread_t* jobs;
+#endif // UTILS_USE_PTHREADS
   GBool ok;
   int exitCode;
   int pg, pg_num_len;
@@ -362,6 +435,9 @@ int main(int argc, char *argv[]) {
     paperColor[1] = 255;
     paperColor[2] = 255;
   }
+  
+#ifndef UTILS_USE_PTHREADS
+
   splashOut = new SplashOutputDev(mono ? splashModeMono1 :
 				    gray ? splashModeMono8 :
 #if SPLASH_CMYK
@@ -370,6 +446,9 @@ int main(int argc, char *argv[]) {
 				             splashModeRGB8, 4,
 				  gFalse, paperColor);
   splashOut->startDoc(doc);
+  
+#endif // UTILS_USE_PTHREADS
+  
   if (sz != 0) w = h = sz;
   pg_num_len = numberOfCharacters(doc->getNumPages());
   for (pg = firstPage; pg <= lastPage; ++pg) {
@@ -414,13 +493,56 @@ int main(int argc, char *argv[]) {
         ppmFile = new char[strlen(ppmRoot) + 1 + pg_num_len + 1 + strlen(ext) + 1];
         sprintf(ppmFile, "%s-%0*d.%s", ppmRoot, pg_num_len, pg, ext);
       }
-      savePageSlice(doc, splashOut, pg, x, y, w, h, pg_w, pg_h, ppmFile);
-      delete[] ppmFile;
     } else {
-      savePageSlice(doc, splashOut, pg, x, y, w, h, pg_w, pg_h, NULL);
+      ppmFile = NULL;
     }
+#ifndef UTILS_USE_PTHREADS
+    // process job in main thread
+    savePageSlice(doc, splashOut, pg, x, y, w, h, pg_w, pg_h, ppmFile);
+    
+    delete[] ppmFile;
+#else
+    
+    // queue job for worker threads
+    PageJob pageJob = {
+      .doc = doc,
+      .pg = pg,
+      
+      .pg_w = pg_w, .pg_h = pg_h,
+      
+      .paperColor = &paperColor,
+      
+      .ppmFile = ppmFile
+    };
+    
+    pageJobQueue.push_back(pageJob);
+    
+#endif // UTILS_USE_PTHREADS
   }
+#ifndef UTILS_USE_PTHREADS
   delete splashOut;
+#else
+  
+  // spawn worker threads and wait on them
+  jobs = (pthread_t*)malloc(numberOfJobs * sizeof(pthread_t));
+
+  for(int i=0; i < numberOfJobs; ++i) {
+    if(pthread_create(&jobs[i], NULL, (void* (*)(void*))processPageJobs, NULL) != 0) {
+	    fprintf(stderr, "pthread_create() failed with errno: %d\n", errno);
+	    exit(EXIT_FAILURE);
+    }
+  }
+  
+  for(int i=0; i < numberOfJobs; ++i) {
+    if(pthread_join(jobs[i], NULL) != 0) {
+      fprintf(stderr, "pthread_join() failed with errno: %d\n", errno);
+      exit(EXIT_FAILURE);
+    }
+  }
+
+  free(jobs);
+  
+#endif // UTILS_USE_PTHREADS
 
   exitCode = 0;
 
diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
index a170f1b7..3b8b69f2 100644
--- a/utils/pdftotext.cc
+++ b/utils/pdftotext.cc
@@ -22,6 +22,7 @@
 // Copyright (C) 2010 Kenneth Berland <ken@hero.com>
 // Copyright (C) 2011 Tom Gleason <tom@buildadam.com>
 // Copyright (C) 2011 Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk>
+// Copyright (C) 2013 Yury G. Kudryashov <urkud.urkud@gmail.com>
 //
 // 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
@@ -331,21 +332,17 @@ int main(int argc, char *argv[]) {
     info.free();
     fputs("</head>\n", f);
     fputs("<body>\n", f);
-    if (!bbox) fputs("<pre>\n", f);
-    if (f != stdout) {
-      fclose(f);
+    if (!bbox) {
+      fputs("<pre>\n", f);
+      if (f != stdout) {
+	fclose(f);
+      }
     }
   }
 
   // write text file
   if (bbox) {
     textOut = new TextOutputDev(NULL, physLayout, fixedPitch, rawOrder, htmlMeta);
-    if (!(f = fopen(textFileName->getCString(), "ab"))) {
-      error(errIO, -1, "Couldn't open text file '{0:t}' for append", textFileName);
-      exitCode = 2;
-      delete textOut;
-      goto err3;
-    }
 
     if (textOut->isOk()) {
       fprintf(f, "<doc>\n");
diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
index 79d05f04..59b6a8f1 100644
--- a/utils/pdfunite.cc
+++ b/utils/pdfunite.cc
@@ -8,6 +8,8 @@
 // Copyright (C) 2012 Arseny Solokha <asolokha@gmx.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2013 Hib Eris <hib@hiberis.nl>
 //
 //========================================================================
 #include <PDFDoc.h>
@@ -138,7 +140,7 @@ int main (int argc, char *argv[])
   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());
+  outStr->printf(" ] /Count %zd >>\nendobj\n", pages.size());
   objectsCount++;
 
   for (i = 0; i < (int) pages.size(); i++) {
@@ -163,7 +165,7 @@ int main (int argc, char *argv[])
     outStr->printf(" >>\nendobj\n");
     objectsCount++;
   }
-  Guint uxrefOffset = outStr->getPos();
+  Goffset uxrefOffset = outStr->getPos();
   Ref ref;
   ref.num = rootNum;
   ref.gen = 0;