246 files changed, 277 insertions, 149 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 961eabea484..b9af2df80c2 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -39,7 +39,7 @@ lua 5.2.2 - checked 28mar13
 pixman 0.30.0 - checked 30may13
   http://cairographics.org/releases/
 
-poppler 0.23.3 - checked 2jul13
+poppler 0.23.4 - checked 19jul13
   http://poppler.freedesktop.org/ - used by luatex and xetex
 
 potrace 1.11 - checked 12apr13
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 5d46485a227..b54a59c7f44 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.23.4.
+	* version.ac: Adjust.
+
 2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use ../../am/reconfig.am and ../../am/rebuild.am.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index dc8f5c390d9..8a59e0e5fad 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -80,7 +80,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
 	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(srcdir)/config.h.in \
-	$(top_srcdir)/poppler-0.23.3/poppler/poppler-config.h.in \
+	$(top_srcdir)/poppler-0.23.4/poppler/poppler-config.h.in \
 	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
@@ -573,7 +573,7 @@ poppler-config.h: stamp-h2
 	@test -f $@ || rm -f stamp-h2
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
 
-stamp-h2: $(top_srcdir)/poppler-0.23.3/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.23.4/poppler/poppler-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
 
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 21f8a574e31..f678ef5e07c 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.23.3.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.23.4.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler (TeX Live)'
 PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.23.3'
-PACKAGE_STRING='poppler (TeX Live) 0.23.3'
+PACKAGE_VERSION='0.23.4'
+PACKAGE_STRING='poppler (TeX Live) 0.23.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.23.3/poppler/Array.cc"
+ac_unique_file="poppler-0.23.4/poppler/Array.cc"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1304,7 +1304,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 (TeX Live) 0.23.3 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.23.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1371,7 +1371,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler (TeX Live) 0.23.3:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.23.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1484,7 +1484,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler (TeX Live) configure 0.23.3
+poppler (TeX Live) configure 0.23.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,7 +2074,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 (TeX Live) $as_me 0.23.3, which was
+It was created by poppler (TeX Live) $as_me 0.23.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3997,7 +3997,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler--tex-live-'
- VERSION='0.23.3'
+ VERSION='0.23.4'
 
 
 # Some tools Automake needs.
@@ -6473,12 +6473,12 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.23.3/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.23.4/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.23.3"
+#define POPPLER_VERSION "0.23.4"
 _ACEOF
 
 
@@ -6571,7 +6571,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.23.3
+POPPLER_TREE=poppler-0.23.4
 
 
 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7131,7 +7131,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 (TeX Live) $as_me 0.23.3, which was
+This file was extended by poppler (TeX Live) $as_me 0.23.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7197,7 +7197,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 (TeX Live) config.status 0.23.3
+poppler (TeX Live) config.status 0.23.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7328,7 +7328,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.23.3/poppler/poppler-config.h.in" ;;
+    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.23.4/poppler/poppler-config.h.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/poppler-0.23.3-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.23.4-PATCHES/ChangeLog
index 1fcb9e5dc7a..d8ca5191fe4 100644
--- a/Build/source/libs/poppler/poppler-0.23.3-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.23.4-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.23.4 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-02-LLONG_MAX: Adapted.
+
 2013-07-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.23.3 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.23.3-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.23.4-PATCHES/TL-Changes
index 86851f14c88..5ce9c096f39 100644
--- a/Build/source/libs/poppler/poppler-0.23.3-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.23.4-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.23.3 tree as obtained from:
+Changes applied to the poppler-0.23.4 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.23.3-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.23.4-PATCHES/patch-02-LLONG_MAX
index 79dcc2a463c..21d6afd313b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.23.4-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.23.3.orig/goo/GooString.h poppler-0.23.3/goo/GooString.h
---- poppler-0.23.3.orig/goo/GooString.h	2013-04-16 23:29:11.000000000 +0200
-+++ poppler-0.23.3/goo/GooString.h	2013-06-18 18:28:08.000000000 +0200
+diff -ur poppler-0.23.4.orig/goo/GooString.h poppler-0.23.4/goo/GooString.h
+--- poppler-0.23.4.orig/goo/GooString.h	2013-04-16 23:29:11.000000000 +0200
++++ poppler-0.23.4/goo/GooString.h	2013-06-18 18:28:08.000000000 +0200
 @@ -33,6 +33,21 @@
  #endif
  
diff --git a/Build/source/libs/poppler/poppler-0.23.3/AUTHORS b/Build/source/libs/poppler/poppler-0.23.4/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.23.4/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.23.3/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.23.4/CMakeLists.txt
index 1d6cff50a32..5ad3fd2429b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.23.4/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "23")
-set(POPPLER_MICRO_VERSION "3")
+set(POPPLER_MICRO_VERSION "4")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
@@ -412,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)
@@ -420,11 +423,8 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 41.0.0 SOVERSION 41)
+set_target_properties(poppler PROPERTIES VERSION 42.0.0 SOVERSION 42)
 target_link_libraries(poppler ${poppler_LIBS})
-if(HAVE_PTHREAD)
-  target_link_libraries(poppler -lpthread)
-endif()
 target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
 install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
 
diff --git a/Build/source/libs/poppler/poppler-0.23.3/COPYING b/Build/source/libs/poppler/poppler-0.23.4/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/COPYING
+++ b/Build/source/libs/poppler/poppler-0.23.4/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.23.3/ChangeLog b/Build/source/libs/poppler/poppler-0.23.4/ChangeLog
index 19aba39cfd7..ae7e558e0e0 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.23.4/ChangeLog
@@ -1,3 +1,97 @@
+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
diff --git a/Build/source/libs/poppler/poppler-0.23.3/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.23.4/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/INSTALL b/Build/source/libs/poppler/poppler-0.23.4/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.23.4/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.23.3/Makefile.am b/Build/source/libs/poppler/poppler-0.23.4/Makefile.am
index e7e5bace9d4..e7e5bace9d4 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.4/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.23.3/NEWS b/Build/source/libs/poppler/poppler-0.23.4/NEWS
index c7fb7ac32e3..a454dbd2eda 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/NEWS
+++ b/Build/source/libs/poppler/poppler-0.23.4/NEWS
@@ -1,3 +1,29 @@
+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
diff --git a/Build/source/libs/poppler/poppler-0.23.3/README b/Build/source/libs/poppler/poppler-0.23.4/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/README
+++ b/Build/source/libs/poppler/poppler-0.23.4/README
diff --git a/Build/source/libs/poppler/poppler-0.23.3/README-XPDF b/Build/source/libs/poppler/poppler-0.23.4/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.23.4/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.23.3/TODO b/Build/source/libs/poppler/poppler-0.23.4/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/TODO
+++ b/Build/source/libs/poppler/poppler-0.23.4/TODO
diff --git a/Build/source/libs/poppler/poppler-0.23.3/config.h.cmake b/Build/source/libs/poppler/poppler-0.23.4/config.h.cmake
index b707ba72249..b707ba72249 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/config.h.in b/Build/source/libs/poppler/poppler-0.23.4/config.h.in
index 79028560a02..12fb1a09ec6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/config.h.in
@@ -97,6 +97,9 @@
 /* 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
 
diff --git a/Build/source/libs/poppler/poppler-0.23.3/configure.ac b/Build/source/libs/poppler/poppler-0.23.4/configure.ac
index 1a7ca8ca7f8..85a68fc18d6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.23.4/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[23])
-m4_define([poppler_version_micro],[3])
+m4_define([poppler_version_micro],[4])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
 AC_PREREQ(2.59)
@@ -76,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,
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiTrueType.cc
index cd11d6ff2c6..cd11d6ff2c6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1.cc
index 8fa10a016b6..8fa10a016b6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.23.4/fofi/Makefile.am
index c4654dd28b9..c4654dd28b9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.4/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.23.4/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.23.4/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.23.4/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.h b/Build/source/libs/poppler/poppler-0.23.4/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.23.4/goo/GooMutex.h
index e9d5a543ff7..e9d5a543ff7 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/GooString.cc
index d35161d87ad..d35161d87ad 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.h b/Build/source/libs/poppler/poppler-0.23.4/goo/GooString.h
index b811c5ce5d8..b811c5ce5d8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.23.4/goo/GooTimer.h
index d77373e90c1..d77373e90c1 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.23.4/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.23.4/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.23.4/goo/Makefile.am
index 0764e79ca18..0764e79ca18 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/PNGWriter.cc
index b775600c0a3..b775600c0a3 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.23.4/goo/PNGWriter.h
index c73c96426b8..c73c96426b8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/TiffWriter.cc
index d372a5bdfce..d372a5bdfce 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.23.4/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/gfile.cc
index c590a1937e8..c590a1937e8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.h b/Build/source/libs/poppler/poppler-0.23.4/goo/gfile.h
index 5f546f11156..5f546f11156 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.h b/Build/source/libs/poppler/poppler-0.23.4/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.h b/Build/source/libs/poppler/poppler-0.23.4/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.23.4/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.23.4/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.23.4/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.23.4/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/gtk-doc.make b/Build/source/libs/poppler/poppler-0.23.4/gtk-doc.make
index 9841de47922..104c3993f3e 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.23.4/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/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.in b/Build/source/libs/poppler/poppler-0.23.4/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Annot.cc
index f0cce6d035a..f0cce6d035a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Annot.h
index 2865d23f7af..2865d23f7af 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CMap.cc
index 13f293a4aea..13f293a4aea 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoFontEngine.cc
index 1546594f9ea..1546594f9ea 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoOutputDev.cc
index a50e1895d9f..26760c8633d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoOutputDev.cc
@@ -1736,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));
@@ -1767,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) {
@@ -1795,8 +1794,10 @@ CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
   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)
@@ -2890,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;
@@ -2993,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,
@@ -3002,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);
@@ -3045,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);
@@ -3091,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);
@@ -3139,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);
@@ -3187,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/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoOutputDev.h
index bbad744fe40..c9ae33d4c65 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoOutputDev.h
@@ -17,7 +17,7 @@
 // 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) 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-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
@@ -266,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);
@@ -493,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/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Catalog.cc
index 6bd511a11aa..6bd511a11aa 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Catalog.h
index 24a3dcfba62..24a3dcfba62 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CharCodeToUnicode.cc
index 16ba6d48649..16ba6d48649 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Dict.cc
index 3f3c022be17..3f3c022be17 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Error.h
index 88fc3ea4353..88fc3ea4353 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Form.cc
index 78c25e3aa93..78c25e3aa93 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Form.h
index ef67748aa69..ef67748aa69 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Function.cc
index 2f94a54a307..2f94a54a307 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Gfx.cc
index f2971d666c9..f2971d666c9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Gfx.h
index aba3b7e5bfe..aba3b7e5bfe 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxFont.cc
index ea22af8272c..ea22af8272c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxFont.h
index f9806681102..f9806681102 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxState.cc
index 0bafb6d3f72..0bafb6d3f72 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxState.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxState.h
index 2f3efcfb2ef..2f3efcfb2ef 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/GlobalParams.cc
index 6efdd0c0b9c..6efdd0c0b9c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/GlobalParams.h
index bc11684f268..bc11684f268 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Hints.cc
index 49e201daa93..49e201daa93 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Hints.h
index f5225f9fa9b..f5225f9fa9b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/JBIG2Stream.cc
index 12de50e18c5..12de50e18c5 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/JBIG2Stream.h
index be1b3bd7897..be1b3bd7897 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPEG2000Stream.cc
index 703d471c99a..703d471c99a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPEG2000Stream.h
index 3feccbef06d..3feccbef06d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Lexer.cc
index bd7546f889c..bd7546f889c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Lexer.h
index d9c23dc8eb9..d9c23dc8eb9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Link.cc
index 20184d1376c..20184d1376c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.23.4/poppler/Makefile.am
index c061e718aaf..b2217f415c6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Makefile.am
@@ -157,7 +157,7 @@ libpoppler_la_LIBADD =				\
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 41:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 42:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/NameToUnicodeTable.h
index 74645ab2878..74645ab2878 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Object.h
index 1b123549a72..1b123549a72 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/OptionalContent.h
index 02c9a471e33..02c9a471e33 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDoc.cc
index c78d5ca5323..c78d5ca5323 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDoc.h
index da9bf5b3c8a..da9bf5b3c8a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSOutputDev.cc
index 41c763d5cc4..41c763d5cc4 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSOutputDev.h
index f9dc63c2235..f9dc63c2235 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Page.cc
index e0a3b298afc..e0a3b298afc 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Page.h
index 1c9d0a9cbc7..1c9d0a9cbc7 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageLabelInfo_p.h
index d3cd89f9bcd..d3cd89f9bcd 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Parser.cc
index 03705640b7c..03705640b7c 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Parser.h
index 9702716448e..9702716448e 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/PreScanOutputDev.cc
index 6a011266013..6a011266013 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/PreScanOutputDev.h
index 0fc9d3e3446..0fc9d3e3446 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/SecurityHandler.cc
index 8b85e60db0a..8b85e60db0a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/SplashOutputDev.cc
index b11b695b6c8..b11b695b6c8 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/SplashOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/SplashOutputDev.h
index ce1d50d0fdd..ce1d50d0fdd 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/Stream.cc
index 41cb8c1d016..41cb8c1d016 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/Stream.h
index 9b40fd1623a..9b40fd1623a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/TextOutputDev.cc
index 5efb5c3fa17..75327b59290 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/TextOutputDev.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2005-2007 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 // Copyright (C) 2006-2008, 2011-2013 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2006, 2007 Ed Catmur <ed@catmur.co.uk>
+// 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>
@@ -4364,6 +4364,10 @@ void TextSelectionPainter::visitWord (TextWord *word, int begin, int end,
 void TextSelectionPainter::endPage()
 {
   out->fill(state);
+
+  out->saveState(state);
+  out->clip(state);
+
   state->clearPath();
 
   state->setFillColor(glyph_color);
@@ -4405,6 +4409,7 @@ void TextSelectionPainter::endPage()
     }
   }
 
+  out->restoreState(state);
   out->endPage ();
 }
 
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/TextOutputDev.h
index 56736b3f7ce..56736b3f7ce 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/XRef.cc
index 5495b62f7ba..5495b62f7ba 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.23.4/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.23.4/poppler/XpdfPluginAPI.h
index b0165c0a72a..b0165c0a72a 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.23.4/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.23.4/poppler/poppler-config.h.cmake
index 71a3278ff44..71a3278ff44 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.23.4/poppler/poppler-config.h.in
index c5e181c4337..c5e181c4337 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.23.3/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.23.4/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.23.3/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.23.4/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 203fe23a7c8..25c8bbecef8 100644
--- a/Build/source/libs/poppler/version.ac
+++ b/Build/source/libs/poppler/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.23.3])
+m4_define([poppler_version], [0.23.4])