poppler 0.34.0

git-svn-id: svn://tug.org/texlive/trunk@37817 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2015-07-09 06:38:52 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2015-07-09 06:38:52 +0000
commit: df15ab91475b7cbb2c100dd94e990e5e85fea546 (patch)
tree: ceb83a7c74bf084f52582c67c917c519579d6b9c /Build
parent: e4ea1f572ec7b682e09f07e45dba5627e91aa1bd (diff)
297 files changed, 424 insertions, 55 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index dd48d4440db..f821e5df1b8 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -49,7 +49,7 @@ mpfr 3.1.3 - checked 20jun15
 pixman 0.32.6 - checked 7jul14
   http://cairographics.org/releases/
 
-poppler 0.33.0 - checked 12jun15
+poppler 0.34.0 - checked 9jul15
   http://poppler.freedesktop.org/ - used by luatex and xetex
 
 potrace 1.12 - checked 27mar15
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index 13ddda1356d..5a4055ba783 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.34.0.
+	* version.ac: Adjust.
+
 2015-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import poppler-0.33.0.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index ebc4a6bdc64..30ed32ab1e7 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -276,7 +276,7 @@ am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing \
-	$(top_srcdir)/poppler-0.33.0/poppler/poppler-config.h.in \
+	$(top_srcdir)/poppler-0.34.0/poppler/poppler-config.h.in \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -597,7 +597,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.33.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.34.0/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 36291629017..822b0dd5980 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.33.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.34.0.
 #
 # 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.33.0'
-PACKAGE_STRING='poppler (TeX Live) 0.33.0'
+PACKAGE_VERSION='0.34.0'
+PACKAGE_STRING='poppler (TeX Live) 0.34.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.33.0/poppler/Array.cc"
+ac_unique_file="poppler-0.34.0/poppler/Array.cc"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1306,7 +1306,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.33.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.34.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1373,7 +1373,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler (TeX Live) 0.33.0:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.34.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1486,7 +1486,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler (TeX Live) configure 0.33.0
+poppler (TeX Live) configure 0.34.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,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.33.0, which was
+It was created by poppler (TeX Live) $as_me 0.34.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3999,7 +3999,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler--tex-live-'
- VERSION='0.33.0'
+ VERSION='0.34.0'
 
 
 # Some tools Automake needs.
@@ -6573,12 +6573,12 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.33.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.34.0/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.33.0"
+#define POPPLER_VERSION "0.34.0"
 _ACEOF
 
 
@@ -6712,7 +6712,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.33.0
+POPPLER_TREE=poppler-0.34.0
 
 
 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7272,7 +7272,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.33.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.34.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7338,7 +7338,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.33.0
+poppler (TeX Live) config.status 0.34.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7469,7 +7469,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.33.0/poppler/poppler-config.h.in" ;;
+    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.34.0/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.33.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.34.0-PATCHES/ChangeLog
index 6a2495cc233..08bfbba6bdf 100644
--- a/Build/source/libs/poppler/poppler-0.33.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.34.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.34.0 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-02-LLONG_MAX: Adapted.
+
 2015-06-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.33.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.33.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.34.0-PATCHES/TL-Changes
index 7c0f1e7457a..7905d9318fa 100644
--- a/Build/source/libs/poppler/poppler-0.33.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.34.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.33.0 tree as obtained from:
+Changes applied to the poppler-0.34.0 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.33.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.34.0-PATCHES/patch-02-LLONG_MAX
index aba3105f874..204eb69cd03 100644
--- a/Build/source/libs/poppler/poppler-0.33.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.34.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.33.0.orig/goo/GooString.h poppler-0.33.0/goo/GooString.h
---- poppler-0.33.0.orig/goo/GooString.h	2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.33.0/goo/GooString.h	2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.34.0.orig/goo/GooString.h poppler-0.34.0/goo/GooString.h
+--- poppler-0.34.0.orig/goo/GooString.h	2015-07-07 23:25:05.000000000 +0200
++++ poppler-0.34.0/goo/GooString.h	2015-07-09 08:28:26.000000000 +0200
 @@ -34,6 +34,21 @@
  #endif
  
diff --git a/Build/source/libs/poppler/poppler-0.33.0/AUTHORS b/Build/source/libs/poppler/poppler-0.34.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.34.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.33.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.34.0/CMakeLists.txt
index f77e366fb60..b1435055e49 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.34.0/CMakeLists.txt
@@ -22,7 +22,7 @@ if (ECM_FOUND)
 endif()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "33")
+set(POPPLER_MINOR_VERSION "34")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -158,6 +158,7 @@ if(ENABLE_ZLIB)
 endif(ENABLE_ZLIB)
 set(USE_OPENJPEG1 FALSE)
 set(USE_OPENJPEG2 FALSE)
+set(WITH_OPENJPEG FALSE)
 if(ENABLE_LIBOPENJPEG STREQUAL "auto")
   find_package(LIBOPENJPEG)
   set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
@@ -176,6 +177,7 @@ elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
   set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
 endif()
+set(ENABLE_LIBOPENJPEG "${WITH_OPENJPEG}")
 if(ENABLE_CMS STREQUAL "auto")
   find_package(LCMS2)
   set(USE_CMS ${LCMS2_FOUND})
@@ -474,7 +476,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 52.0.0 SOVERSION 52)
+set_target_properties(poppler PROPERTIES VERSION 53.0.0 SOVERSION 53)
 target_link_libraries(poppler ${poppler_LIBS})
 target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
 install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/Build/source/libs/poppler/poppler-0.33.0/COPYING b/Build/source/libs/poppler/poppler-0.34.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.34.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.33.0/ChangeLog b/Build/source/libs/poppler/poppler-0.34.0/ChangeLog
index 1d774030be9..60380914d82 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.34.0/ChangeLog
@@ -1,3 +1,128 @@
+commit 2fc1f540754391ffa87d7fe9f3438e134d821207
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Tue Jul 7 18:48:51 2015 +0200
+
+    [Splash] Fix crash in PDF with nested softmasks
+
+    Bug #91240
+
+ poppler/SplashOutputDev.cc | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+commit 0b8919f19dd501c9962bca05c9b0559464e923c3
+Author: Dmytro Morgun <lztoad@gmail.com>
+Date:   Mon Jul 6 00:28:27 2015 +0200
+
+    Fix pedantic memory leak
+
+ poppler/StructElement.cc | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+commit 2ef22af960d3d800087209fea047009a8419134c
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jul 5 16:03:57 2015 +0200
+
+    [cmake] Make sure ENABLE_LIBOPENJPEG is either 0 or 1
+
+    Otherwise if it was auto it gets translated to 1 for the cmakedefine
+    boolean
+    which is wrong when the auto ends up meaning "i din't find it"
+
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 50455bcf4f1644060b2187d4e60c3798793041cc
+Author: Tamas Szekeres <szekerest@gmail.com>
+Date:   Fri Jul 3 20:24:01 2015 +0200
+
+    std::max/min need <algorithm>
+
+    Bug #88511
+
+ cpp/poppler-font.cpp       | 3 +++
+ cpp/poppler-global.cpp     | 3 +++
+ poppler/Annot.cc           | 2 ++
+ poppler/SplashOutputDev.cc | 2 ++
+ 4 files changed, 10 insertions(+)
+
+commit 346fc70dbf2803e23e70b093401aa2cda216492b
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Jul 3 20:19:01 2015 +0200
+
+    Forgot the (C)
+
+ poppler/PSOutputDev.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit df09c1a84dfe80d2e6cfde3308c79da5b2ea7428
+Author: Marek Kasik <mkasik@redhat.com>
+Date:   Fri Jul 3 20:14:23 2015 +0200
+
+    Embed Type1 fonts to PostScript files correctly
+
+    Remove PFB headers from embedded Type1 fonts
+    before embedding them into a PostScript file.
+
+    Bug #19747
+
+ poppler/PSOutputDev.cc | 57
+ +++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 50 insertions(+), 7 deletions(-)
+
+commit 11f117cc71641b89783b207232171f850a2b64ff
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Thu Jun 4 10:51:36 2015 +0200
+
+    regtest: Disable pretty diffs for text files in HTML reports
+
+    difflib is entering in an infinite loop with some files, so disable it
+    for now. We need to either fix that somehow or find a different way to
+    generate pretty diffs of text files.
+
+ regtest/HTMLReport.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit 3db4cb6f07229e26405bfb512c626a272f6351f5
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Sun May 24 18:41:30 2015 +0200
+
+    Splash: Speed up of rendering icc based images
+
+    Bug #90171
+
+ poppler/SplashOutputDev.cc | 142
+ +++++++++++++++++++++++++++++++++++++++++++--
+ poppler/SplashOutputDev.h  |   8 ++-
+ splash/Splash.cc           |  17 ++++--
+ splash/Splash.h            |   9 ++-
+ 4 files changed, 163 insertions(+), 13 deletions(-)
+
+commit c50720dcc9e15516e0e19072c0df03fbdee63dec
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Fri May 22 21:44:55 2015 +0930
+
+    glib: update new symbols section
+
+ glib/reference/poppler-docs.sgml | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+commit b271a19ec30b20bc11f2240ae6b96672e3cafafb
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu May 14 21:56:47 2015 +0200
+
+    Poppler 0.33
+
+ CMakeLists.txt      |  4 ++--
+ NEWS                | 25 +++++++++++++++++++++++++
+ configure.ac        |  2 +-
+ cpp/Doxyfile        |  2 +-
+ glib/CMakeLists.txt |  2 +-
+ glib/Makefile.am    |  2 +-
+ poppler/Makefile.am |  2 +-
+ qt4/src/Doxyfile    |  2 +-
+ qt5/src/Doxyfile    |  2 +-
+ 9 files changed, 34 insertions(+), 9 deletions(-)
+
 commit 2b2fb719aa5ffe32fbc3fb500444b1643b1c6099
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Thu May 14 20:17:12 2015 +0200
diff --git a/Build/source/libs/poppler/poppler-0.33.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.34.0/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/INSTALL b/Build/source/libs/poppler/poppler-0.34.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.34.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.33.0/Makefile.am b/Build/source/libs/poppler/poppler-0.34.0/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.34.0/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.33.0/NEWS b/Build/source/libs/poppler/poppler-0.34.0/NEWS
index 48f97fd14fe..a0f979a3041 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.34.0/NEWS
@@ -1,3 +1,16 @@
+Release 0.34.0
+        core:
+         * Splash: Fix crash in PDF with nested softmasks. Bug #91240
+         * Splash: Speed up of rendering icc based images. Bug #90171
+         * PSOutputDev: Embed Type1 fonts to PostScript files correctly. Bug #19747
+         * Fix pedantic memory leak
+
+        glib:
+         * update new symbols section
+
+        build system:
+         * cmake: Make sure ENABLE_LIBOPENJPEG is either 0 or 1
+
 Release 0.33.0
         core:
          * Fix regression in pdftops parameter passing. Bug #89827
diff --git a/Build/source/libs/poppler/poppler-0.33.0/README b/Build/source/libs/poppler/poppler-0.34.0/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/README
+++ b/Build/source/libs/poppler/poppler-0.34.0/README
diff --git a/Build/source/libs/poppler/poppler-0.33.0/README-XPDF b/Build/source/libs/poppler/poppler-0.34.0/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.34.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.33.0/TODO b/Build/source/libs/poppler/poppler-0.34.0/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.34.0/TODO
diff --git a/Build/source/libs/poppler/poppler-0.33.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.34.0/config.h.cmake
index 8ed1c92248e..8ed1c92248e 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/config.h.in b/Build/source/libs/poppler/poppler-0.34.0/config.h.in
index c47d66d3e52..c47d66d3e52 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/configure.ac b/Build/source/libs/poppler/poppler-0.34.0/configure.ac
index 67599c0971f..5e7222a91d3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.34.0/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[33])
+m4_define([poppler_version_minor],[34])
 m4_define([poppler_version_micro],[0])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.cc
index 11699dd6119..11699dd6119 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.cc
index 827ebc7d7c3..827ebc7d7c3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.34.0/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.34.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.34.0/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.34.0/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.cc
index 3f22f368560..3f22f368560 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.h
index 0176d873646..0176d873646 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.34.0/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.34.0/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.34.0/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.cc
index dd99eee8aaa..18576c8d94f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.cc
@@ -34,6 +34,7 @@
 // Copyright (C) 2014 Anuj Khare <khareanuj18@gmail.com>
 // Copyright (C) 2015 Petr Gajdos <pgajdos@suse.cz>
 // Copyright (C) 2015 Philipp Reinkemeier <philipp.reinkemeier@offis.de>
+// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -73,6 +74,7 @@
 #include "DateInfo.h"
 #include "Link.h"
 #include <string.h>
+#include <algorithm>
 
 #if MULTITHREADED
 #  define annotLocker()   MutexLocker locker(&mutex)
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.h
index 1e64f59bc76..1e64f59bc76 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.cc
index 1d611b59d3c..1d611b59d3c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.cc
index a86ec120f20..a86ec120f20 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.h
index 33dde0c570a..33dde0c570a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.cc
index f75f4e106f3..f75f4e106f3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.cc
index 59b7c93e66f..59b7c93e66f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.cc
index 07d95b355a8..07d95b355a8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.cc
index 81f59037f7f..81f59037f7f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.h
index febb902922d..febb902922d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.cc
index 3e9cac41534..3e9cac41534 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.h
index f018e93dd34..f018e93dd34 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.cc
index 7e110d05b15..7e110d05b15 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.h
index 16d615ae6d9..16d615ae6d9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.cc
index 66c1d2505e8..66c1d2505e8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.h
index 1e14c5cf783..1e14c5cf783 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.cc
index 35e98b86ebc..35e98b86ebc 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.h
index 73b6bdd97b8..73b6bdd97b8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.34.0/poppler/Makefile.am
index fd75d1ada49..04429292b23 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD =				\
 	$(win32_libs)
 
 libpoppler_la_LDFLAGS =				\
-	-version-info 52:0:0			\
+	-version-info 53:0:0			\
 	@create_shared_lib@			\
 	@auto_import_flags@
 
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.cc
index 71a1efe269d..71a1efe269d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.cc
index 5dc89bea25e..7b93e3bf65a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.cc
@@ -29,6 +29,7 @@
 // Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
 // Copyright (C) 2014 Till Kamppeter <till.kamppeter@gmail.com>
+// Copyright (C) 2015 Marek Kasik <mkasik@redhat.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -2122,7 +2123,7 @@ void PSOutputDev::setupEmbeddedType1Font(Ref *id, GooString *psName) {
   static const char hexChar[17] = "0123456789abcdef";
   Object refObj, strObj, obj1, obj2, obj3;
   Dict *dict;
-  int length1, length2, length3;
+  long length1, length2, length3;
   int c;
   int start[4];
   GBool binMode;
@@ -2172,8 +2173,18 @@ void PSOutputDev::setupEmbeddedType1Font(Ref *id, GooString *psName) {
   embFontList->append(psName->getCString());
   embFontList->append("\n");
 
-  // copy ASCII portion of font
   strObj.streamReset();
+  if (strObj.streamGetChar() == 0x80 &&
+      strObj.streamGetChar() == 1) {
+    // PFB format
+    length1 = strObj.streamGetChar() |
+             (strObj.streamGetChar() << 8) |
+             (strObj.streamGetChar() << 16) |
+             (strObj.streamGetChar() << 24);
+  } else {
+    strObj.streamReset();
+  }
+  // copy ASCII portion of font
   for (i = 0; i < length1 && (c = strObj.streamGetChar()) != EOF; ++i) {
     writePSChar(c);
   }
@@ -2206,9 +2217,18 @@ void PSOutputDev::setupEmbeddedType1Font(Ref *id, GooString *psName) {
 
   // convert binary data to ASCII
   if (binMode) {
-    for (i = 0; i < 4; ++i) {
-      writePSChar(hexChar[(start[i] >> 4) & 0x0f]);
-      writePSChar(hexChar[start[i] & 0x0f]);
+    if (start[0] == 0x80 &&
+        start[1] == 2) {
+      length2 = start[2] |
+               (start[3] << 8) |
+               (strObj.streamGetChar() << 16) |
+               (strObj.streamGetChar() << 24);
+      i = 0;
+    } else {
+      for (i = 0; i < 4; ++i) {
+        writePSChar(hexChar[(start[i] >> 4) & 0x0f]);
+        writePSChar(hexChar[start[i] & 0x0f]);
+      }
     }
 #if 0 // this causes trouble for various PostScript printers
     // if Length2 is incorrect (too small), font data gets chopped, so
@@ -2246,8 +2266,32 @@ void PSOutputDev::setupEmbeddedType1Font(Ref *id, GooString *psName) {
   {
     if (length3 > 0) {
       // write fixed-content portion
-      while ((c = strObj.streamGetChar()) != EOF) {
-	writePSChar(c);
+      c = strObj.streamGetChar();
+      if (c == 0x80) {
+        c = strObj.streamGetChar();
+        if (c == 1) {
+          length3 = strObj.streamGetChar() |
+                   (strObj.streamGetChar() << 8) |
+                   (strObj.streamGetChar() << 16) |
+                   (strObj.streamGetChar() << 24);
+
+          i = 0;
+          while (i < length3) {
+            if ((c = strObj.streamGetChar()) == EOF) {
+              break;
+            }
+            writePSChar(c);
+            ++i;
+          }
+        }
+      } else {
+        if (c != EOF) {
+          writePSChar(c);
+
+          while ((c = strObj.streamGetChar()) != EOF) {
+	    writePSChar(c);
+	  }
+        }
       }
     } else {
       // write padding and "cleartomark"
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.h
index 7318cafdf2a..7318cafdf2a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.cc
index a4af3405b92..a4af3405b92 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.cc
index 63d8b4e1287..63d8b4e1287 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.cc
index a7cc6bc1bcd..97ed1c14053 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.cc
@@ -34,6 +34,7 @@
 // Copyright (C) 2013 Li Junling <lijunling@sina.com>
 // Copyright (C) 2014 Ed Porras <ed@moto-research.com>
 // Copyright (C) 2014 Richard PALO <richard@netbsd.org>
+// Copyright (C) 2015 Tamas Szekeres <szekerest@gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -72,6 +73,7 @@
 #include "splash/SplashFontFileID.h"
 #include "splash/Splash.h"
 #include "SplashOutputDev.h"
+#include <algorithm>
 
 #ifdef VMS
 #if (__VMS_VER < 70000000)
@@ -1227,6 +1229,7 @@ struct T3GlyphStack {
 struct SplashTransparencyGroup {
   int tx, ty;			// translation coordinates
   SplashBitmap *tBitmap;	// bitmap for transparency group
+  SplashBitmap *softmask;	// bitmap for softmasks
   GfxColorSpace *blendingColorSpace;
   GBool isolated;
 
@@ -2778,8 +2781,8 @@ void SplashOutputDev::setSoftMaskFromImageMask(GfxState *state,
   imgMaskData.height = height;
   imgMaskData.y = 0;
 
-  maskBitmap = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), 1, splashModeMono8, gFalse);
-  maskSplash = new Splash(maskBitmap, vectorAntialias);
+  transpGroupStack->softmask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), 1, splashModeMono8, gFalse);
+  maskSplash = new Splash(transpGroupStack->softmask, vectorAntialias);
   maskColor[0] = 0;
   maskSplash->clear(maskColor);
   maskColor[0] = 0xff;
@@ -2796,13 +2799,15 @@ void SplashOutputDev::unsetSoftMaskFromImageMask(GfxState *state, double *baseMa
   /* transfer mask to alpha channel! */
   // memcpy(maskBitmap->getAlphaPtr(), maskBitmap->getDataPtr(), bitmap->getRowSize() * bitmap->getHeight());
   // memset(maskBitmap->getDataPtr(), 0, bitmap->getRowSize() * bitmap->getHeight());
-  Guchar *dest = bitmap->getAlphaPtr();
-  Guchar *src = maskBitmap->getDataPtr();
-  for (int c= 0; c < maskBitmap->getRowSize() * maskBitmap->getHeight(); c++) {
-    dest[c] = src[c];
+  if (transpGroupStack->softmask != NULL) {
+    Guchar *dest = bitmap->getAlphaPtr();
+    Guchar *src = transpGroupStack->softmask->getDataPtr();
+    for (int c= 0; c < transpGroupStack->softmask->getRowSize() * transpGroupStack->softmask->getHeight(); c++) {
+      dest[c] = src[c];
+    }
+    delete transpGroupStack->softmask;
+    transpGroupStack->softmask = NULL;
   }
-  delete maskBitmap;
-  maskBitmap = NULL;
   endTransparencyGroup(state);
   baseMatrix[4] += transpGroupStack->tx;
   baseMatrix[5] += transpGroupStack->ty;
@@ -2818,6 +2823,37 @@ struct SplashOutImageData {
   int width, height, y;
 };
 
+#ifdef USE_CMS
+GBool SplashOutputDev::useIccImageSrc(void *data) {
+  SplashOutImageData *imgData = (SplashOutImageData *)data;
+
+  if (!imgData->lookup && imgData->colorMap->getColorSpace()->getMode() == csICCBased) {
+    GfxICCBasedColorSpace *colorSpace = (GfxICCBasedColorSpace *) imgData->colorMap->getColorSpace();
+    switch (imgData->colorMode) {
+    case splashModeMono1:
+    case splashModeMono8:
+      if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceGray)
+        return gTrue;
+      break;
+    case splashModeXBGR8:
+    case splashModeRGB8:
+    case splashModeBGR8:
+      if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceRGB)
+        return gTrue;
+      break;
+#if SPLASH_CMYK
+    case splashModeCMYK8:
+      if (colorSpace->getAlt() != NULL && colorSpace->getAlt()->getMode() == csDeviceCMYK)
+        return gTrue;
+      break;
+#endif
+    }
+  }
+
+  return gFalse;
+}
+#endif
+
 GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine,
 				Guchar * /*alphaLine*/) {
   SplashOutImageData *imgData = (SplashOutImageData *)data;
@@ -2965,6 +3001,100 @@ GBool SplashOutputDev::imageSrc(void *data, SplashColorPtr colorLine,
   return gTrue;
 }
 
+#ifdef USE_CMS
+GBool SplashOutputDev::iccImageSrc(void *data, SplashColorPtr colorLine,
+				Guchar * /*alphaLine*/) {
+  SplashOutImageData *imgData = (SplashOutImageData *)data;
+  Guchar *p;
+  int nComps;
+
+  if (imgData->y == imgData->height) {
+    return gFalse;
+  }
+  if (!(p = imgData->imgStr->getLine())) {
+    int destComps = 1;
+    if (imgData->colorMode == splashModeRGB8 || imgData->colorMode == splashModeBGR8)
+        destComps = 3;
+    else if (imgData->colorMode == splashModeXBGR8)
+        destComps = 4;
+#if SPLASH_CMYK
+    else if (imgData->colorMode == splashModeCMYK8)
+        destComps = 4;
+    else if (imgData->colorMode == splashModeDeviceN8)
+        destComps = SPOT_NCOMPS + 4;
+#endif
+    memset(colorLine, 0, imgData->width * destComps);
+    return gFalse;
+  }
+
+  if (imgData->colorMode == splashModeXBGR8) {
+    SplashColorPtr q;
+    int x;
+    for (x = 0, q = colorLine; x < imgData->width; ++x) {
+      *q++ = *p++;
+      *q++ = *p++;
+      *q++ = *p++;
+      *q++ = 255;
+    }
+  } else {
+    nComps = imgData->colorMap->getNumPixelComps();
+    memcpy(colorLine, p, imgData->width * nComps);
+  }
+
+  ++imgData->y;
+  return gTrue;
+}
+
+void SplashOutputDev::iccTransform(void *data, SplashBitmap *bitmap) {
+  SplashOutImageData *imgData = (SplashOutImageData *)data;
+  int nComps = imgData->colorMap->getNumPixelComps();
+
+  Guchar *colorLine = (Guchar *) gmalloc(nComps * bitmap->getWidth());
+  Guchar *rgbxLine = (imgData->colorMode == splashModeXBGR8) ? (Guchar *) gmalloc(3 * bitmap->getWidth()) : NULL;
+  for (int i = 0; i < bitmap->getHeight(); i++) {
+    Guchar *p = bitmap->getDataPtr() + i * bitmap->getRowSize();
+    switch (imgData->colorMode) {
+    case splashModeMono1:
+    case splashModeMono8:
+      imgData->colorMap->getGrayLine(p, colorLine, bitmap->getWidth());
+      memcpy(p, colorLine, nComps * bitmap->getWidth());
+      break;
+    case splashModeRGB8:
+    case splashModeBGR8:
+      imgData->colorMap->getRGBLine(p, colorLine, bitmap->getWidth());
+      memcpy(p, colorLine, nComps * bitmap->getWidth());
+      break;
+#if SPLASH_CMYK
+    case splashModeCMYK8:
+      imgData->colorMap->getCMYKLine(p, colorLine, bitmap->getWidth());
+      memcpy(p, colorLine, nComps * bitmap->getWidth());
+      break;
+#endif
+    case splashModeXBGR8:
+      Guchar *q;
+      Guchar *b = p;
+      int x;
+      for (x = 0, q = rgbxLine; x < bitmap->getWidth(); ++x, ++b) {
+        *q++ = *b++;
+        *q++ = *b++;
+        *q++ = *b++;
+      }
+      imgData->colorMap->getRGBLine(rgbxLine, colorLine, bitmap->getWidth());
+      b = p;
+      for (x = 0, q = colorLine; x < bitmap->getWidth(); ++x, ++b) {
+        *b++ = *q++;
+        *b++ = *q++;
+        *b++ = *q++;
+      }
+      break;
+    }
+  }
+  gfree(colorLine);
+  if (rgbxLine != NULL) 
+    gfree(rgbxLine);
+}
+#endif
+
 GBool SplashOutputDev::alphaImageSrc(void *data, SplashColorPtr colorLine,
 				     Guchar *alphaLine) {
   SplashOutImageData *imgData = (SplashOutImageData *)data;
@@ -3176,6 +3306,7 @@ void SplashOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   SplashOutImageData imgData;
   SplashColorMode srcMode;
   SplashImageSource src;
+  SplashICCTransform tf;
   GfxGray gray;
   GfxRGB rgb;
 #if SPLASH_CMYK
@@ -3293,8 +3424,14 @@ void SplashOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   } else {
     srcMode = colorMode;
   }
+#ifdef USE_CMS
+  src = maskColors ? &alphaImageSrc : useIccImageSrc(&imgData) ? &iccImageSrc : &imageSrc;
+  tf = maskColors == NULL && useIccImageSrc(&imgData) ? &iccTransform : NULL;
+#else
   src = maskColors ? &alphaImageSrc : &imageSrc;
-  splash->drawImage(src, &imgData, srcMode, maskColors ? gTrue : gFalse,
+  tf = NULL;
+#endif
+  splash->drawImage(src, tf, &imgData, srcMode, maskColors ? gTrue : gFalse,
 		    width, height, mat, interpolate);
   if (inlineImg) {
     while (imgData.y < height) {
@@ -3596,7 +3733,7 @@ void SplashOutputDev::drawMaskedImage(GfxState *state, Object *ref,
     } else {
       srcMode = colorMode;
     }
-    splash->drawImage(&maskedImageSrc, &imgData, srcMode, gTrue,
+    splash->drawImage(&maskedImageSrc, NULL, &imgData, srcMode, gTrue,
 		      width, height, mat, interpolate);
     delete maskBitmap;
     gfree(imgData.lookup);
@@ -3671,7 +3808,7 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
   maskSplash = new Splash(maskBitmap, vectorAntialias);
   maskColor[0] = 0;
   maskSplash->clear(maskColor);
-  maskSplash->drawImage(&imageSrc, &imgMaskData, splashModeMono8, gFalse,
+  maskSplash->drawImage(&imageSrc, NULL, &imgMaskData, splashModeMono8, gFalse,
 			maskWidth, maskHeight, mat, maskInterpolate);
   delete imgMaskData.imgStr;
   maskStr->close();
@@ -3759,7 +3896,7 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
   } else {
     srcMode = colorMode;
   }
-  splash->drawImage(&imageSrc, &imgData, srcMode, gFalse, width, height, mat, interpolate);
+  splash->drawImage(&imageSrc, NULL, &imgData, srcMode, gFalse, width, height, mat, interpolate);
   splash->setSoftMask(NULL);
   gfree(imgData.lookup);
   delete imgData.imgStr;
@@ -3852,6 +3989,7 @@ void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
 
   // push a new stack entry
   transpGroup = new SplashTransparencyGroup();
+  transpGroup->softmask = NULL;
   transpGroup->tx = tx;
   transpGroup->ty = ty;
   transpGroup->blendingColorSpace = blendingColorSpace;
@@ -4358,7 +4496,7 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *ca
     }
     retValue = gTrue;
   } else {
-    retValue = splash->drawImage(&tilingBitmapSrc, &imgData, colorMode, gTrue, result_width, result_height, matc, gFalse, gTrue) == splashOk;
+    retValue = splash->drawImage(&tilingBitmapSrc, NULL, &imgData, colorMode, gTrue, result_width, result_height, matc, gFalse, gTrue) == splashOk;
   }
   delete tBitmap;
   delete gfx;
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.h
index ae20faccb51..d34426c0f3c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/SplashOutputDev.h
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
-// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2015 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2010 Christian Feuers�nger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
@@ -383,6 +383,12 @@ private:
 			  GBool dropEmptySubpaths);
   void drawType3Glyph(GfxState *state, T3FontCache *t3Font,
 		      T3FontCacheTag *tag, Guchar *data);
+#ifdef USE_CMS
+  GBool useIccImageSrc(void *data);
+  static void iccTransform(void *data, SplashBitmap *bitmap);
+  static GBool iccImageSrc(void *data, SplashColorPtr colorLine,
+			Guchar *alphaLine);
+#endif
   static GBool imageMaskSrc(void *data, SplashColorPtr line);
   static GBool imageSrc(void *data, SplashColorPtr colorLine,
 			Guchar *alphaLine);
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.cc
index d2dd761c729..d2dd761c729 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.cc
index b1aaca8a58b..c6688208fee 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.cc
@@ -7,6 +7,7 @@
 // Copyright 2013, 2014 Igalia S.L.
 // Copyright 2014 Luigi Scarso <luigi.scarso@gmail.com>
 // Copyright 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright 2015 Dmytro Morgun <lztoad@gmail.com>
 //
 //========================================================================
 
@@ -279,6 +280,20 @@ struct AttributeDefaults {
     Before.initName("Before");
     Nat1.initInt(1);
   }
+
+  ~AttributeDefaults() {
+    Inline.free();
+    LrTb.free();
+    Normal.free();
+    Distribute.free();
+    off.free();
+    Zero.free();
+    Auto.free();
+    Start.free();
+    None.free();
+    Before.free();
+    Nat1.free();
+  }
 };
 
 static const AttributeDefaults attributeDefaults;
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.cc
index 16f099f291a..16f099f291a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.h
index a0aa6f8a991..a0aa6f8a991 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.34.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.cmake
index b087a693f92..b087a693f92 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.in
index f73d0f66ee9..f73d0f66ee9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.33.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.34.0/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.34.0/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.34.0/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.cc
index d8ee6409605..276cc8f0390 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.cc
@@ -13,7 +13,7 @@
 //
 // Copyright (C) 2005-2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
-// Copyright (C) 2010-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010-2015 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011-2013, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de>
@@ -3659,7 +3659,7 @@ void Splash::blitMask(SplashBitmap *src, int xDest, int yDest,
   }
 }
 
-SplashError Splash::drawImage(SplashImageSource src, void *srcData,
+SplashError Splash::drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
 			      SplashColorMode srcMode, GBool srcAlpha,
 			      int w, int h, SplashCoord *mat, GBool interpolate,
 			      GBool tilingPattern) {
@@ -3750,6 +3750,9 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
       if (scaledImg == NULL) {
         return splashErrBadArg;
       }
+      if  (tf != NULL) {
+	(*tf)(srcData, scaledImg);
+      }
       blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
       delete scaledImg;
     }
@@ -3788,6 +3791,9 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
       if (scaledImg == NULL) {
         return splashErrBadArg;
       }
+      if  (tf != NULL) {
+	(*tf)(srcData, scaledImg);
+      }
       vertFlipImage(scaledImg, scaledWidth, scaledHeight, nComps);
       blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
       delete scaledImg;
@@ -3795,14 +3801,14 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
 
   // all other cases
   } else {
-    return arbitraryTransformImage(src, srcData, srcMode, nComps, srcAlpha,
+    return arbitraryTransformImage(src, tf, srcData, srcMode, nComps, srcAlpha,
 			    w, h, mat, interpolate, tilingPattern);
   }
 
   return splashOk;
 }
 
-SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData,
+SplashError Splash::arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
 				     SplashColorMode srcMode, int nComps,
 				     GBool srcAlpha,
 				     int srcWidth, int srcHeight,
@@ -3937,6 +3943,9 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData
     return splashErrBadArg;
   }
 
+  if  (tf != NULL) {
+    (*tf)(srcData, scaledImg);
+  }
   // construct the three sections
   i = 0;
   if (vy[1] < vy[i]) {
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.h
index cf98e6c6824..75764544fed 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/Splash.h
@@ -13,7 +13,7 @@
 //
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
 // Copyright (C) 2007, 2011 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2010-2013, 2015 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2010 Christian Feuers�nger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 //
@@ -56,6 +56,9 @@ typedef GBool (*SplashImageMaskSource)(void *data, SplashColorPtr pixel);
 typedef GBool (*SplashImageSource)(void *data, SplashColorPtr colorLine,
 				   Guchar *alphaLine);
 
+// Use ICCColorSpace to transform a bitmap
+typedef void (*SplashICCTransform)(void *data, SplashBitmap *bitmap);
+
 //------------------------------------------------------------------------
 
 enum SplashPipeResultColorCtrl {
@@ -211,7 +214,7 @@ public:
   //    BGR8         BGR8
   //    CMYK8        CMYK8
   // The matrix behaves as for fillImageMask.
-  SplashError drawImage(SplashImageSource src, void *srcData,
+  SplashError drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
 			SplashColorMode srcMode, GBool srcAlpha,
 			int w, int h, SplashCoord *mat, GBool interpolate,
 			GBool tilingPattern = gFalse);
@@ -357,7 +360,7 @@ private:
 		     SplashBitmap *dest);
   void blitMask(SplashBitmap *src, int xDest, int yDest,
 		SplashClipResult clipRes);
-  SplashError arbitraryTransformImage(SplashImageSource src, void *srcData,
+  SplashError arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData,
 			       SplashColorMode srcMode, int nComps,
 			       GBool srcAlpha,
 			       int srcWidth, int srcHeight,
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.cc
index e886683fd41..e886683fd41 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.33.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.34.0/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 2be18a5ae09..d15bba3d99b 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.33.0])
+m4_define([poppler_version], [0.34.0])
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2015-07-09 06:38:52 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2015-07-09 06:38:52 +0000
commit	df15ab91475b7cbb2c100dd94e990e5e85fea546 (patch)
tree	ceb83a7c74bf084f52582c67c917c519579d6b9c /Build
parent	e4ea1f572ec7b682e09f07e45dba5627e91aa1bd (diff)