poppler 0.32.0

git-svn-id: svn://tug.org/texlive/trunk@36458 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2015-03-08 10:37:01 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2015-03-08 10:37:01 +0000
commit: bb5c8957bd708c29d5c9d2e356326f19a4faf78f (patch)
tree: 46e216a4befb58eb1905220a4c78f2f97951374f
parent: 01d6e342250679c8c09bbd2a6f32db6036480fa4 (diff)
297 files changed, 389 insertions, 63 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index 364f72fc504..4775f7eef89 100644
--- a/Build/source/libs/README
+++ b/Build/source/libs/README
@@ -49,7 +49,7 @@ mpfr 3.1.2 - checked 13mar13
 pixman 0.32.6 - checked 7jul14
   http://cairographics.org/releases/
 
-poppler 0.31.0 - checked 6feb15
+poppler 0.32.0 - checked 8mar15
   http://poppler.freedesktop.org/ - used by luatex and xetex
 
 potrace 1.11 - checked 12apr13
diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index f895799bfb8..87452a23298 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.32.0.
+	* version.ac: Adjust.
+
 2015-02-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am: Use the fragment ../../am/dist_hook.am.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index b9f5254e561..167d0fad5b9 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.31.0/poppler/poppler-config.h.in \
+	$(top_srcdir)/poppler-0.32.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.31.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.32.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 ef7af89c8ac..c9ec0cfea47 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.31.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.32.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.31.0'
-PACKAGE_STRING='poppler (TeX Live) 0.31.0'
+PACKAGE_VERSION='0.32.0'
+PACKAGE_STRING='poppler (TeX Live) 0.32.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.31.0/poppler/Array.cc"
+ac_unique_file="poppler-0.32.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.31.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.32.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.31.0:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.32.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.31.0
+poppler (TeX Live) configure 0.32.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.31.0, which was
+It was created by poppler (TeX Live) $as_me 0.32.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.31.0'
+ VERSION='0.32.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.31.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.32.0/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.31.0"
+#define POPPLER_VERSION "0.32.0"
 _ACEOF
 
 
@@ -6712,7 +6712,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.31.0
+POPPLER_TREE=poppler-0.32.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.31.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.32.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.31.0
+poppler (TeX Live) config.status 0.32.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.31.0/poppler/poppler-config.h.in" ;;
+    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.32.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.31.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.32.0-PATCHES/ChangeLog
index be5c2293384..3c45002c302 100644
--- a/Build/source/libs/poppler/poppler-0.31.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.32.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.32.0 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-02-LLONG_MAX: Adapted.
+
 2015-02-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.31.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.31.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes
index f217d26c65c..d1de678e427 100644
--- a/Build/source/libs/poppler/poppler-0.31.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.32.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.31.0 tree as obtained from:
+Changes applied to the poppler-0.32.0 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.31.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX
index 875b60c9c6e..8885d67111a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.32.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.31.0.orig/goo/GooString.h poppler-0.31.0/goo/GooString.h
---- poppler-0.31.0.orig/goo/GooString.h	2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.31.0/goo/GooString.h	2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.32.0.orig/goo/GooString.h poppler-0.32.0/goo/GooString.h
+--- poppler-0.32.0.orig/goo/GooString.h	2014-10-07 22:41:15.000000000 +0200
++++ poppler-0.32.0/goo/GooString.h	2014-11-04 10:20:40.567904859 +0100
 @@ -34,6 +34,21 @@
  #endif
  
diff --git a/Build/source/libs/poppler/poppler-0.31.0/AUTHORS b/Build/source/libs/poppler/poppler-0.32.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.32.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.31.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.32.0/CMakeLists.txt
index 7d34c695314..301760cfd36 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.32.0/CMakeLists.txt
@@ -16,8 +16,13 @@ test_big_endian(WORDS_BIGENDIAN)
 include(CheckFileOffsetBits)
 CHECK_FILE_OFFSET_BITS()
 
+find_package (ECM 1.6.0 QUIET NO_MODULE)
+if (ECM_FOUND)
+    include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
+endif()
+
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "31")
+set(POPPLER_MINOR_VERSION "32")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -469,7 +474,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 50.0.0 SOVERSION 50)
+set_target_properties(poppler PROPERTIES VERSION 51.0.0 SOVERSION 51)
 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.31.0/COPYING b/Build/source/libs/poppler/poppler-0.32.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.32.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.31.0/ChangeLog b/Build/source/libs/poppler/poppler-0.32.0/ChangeLog
index 6a35bf978c0..1aa10948972 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.32.0/ChangeLog
@@ -1,3 +1,235 @@
+commit d7cc90a8b60d7e353db6e0acdd0b789485e32972
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Mar 7 15:04:52 2015 +0100
+
+    0.32.0
+
+ CMakeLists.txt      |  4 ++--
+ NEWS                | 16 ++++++++++++++++
+ configure.ac        |  2 +-
+ cpp/Doxyfile        |  2 +-
+ poppler/Makefile.am |  2 +-
+ qt4/src/Doxyfile    |  2 +-
+ qt5/src/Doxyfile    |  2 +-
+ 7 files changed, 23 insertions(+), 7 deletions(-)
+
+commit c13297d154ded11721fe7d3abdba459ca628cef8
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Mar 7 14:58:10 2015 +0100
+
+    Update (C)
+
+ poppler/SecurityHandler.cc | 2 +-
+ poppler/SplashOutputDev.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit c909964bff671d5ff0d8eee5f613ded4562f8afd
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Mar 7 14:54:43 2015 +0100
+
+    Do not assert on broken document
+
+    Bug #89422
+
+ poppler/SecurityHandler.cc | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+commit 3705fcee0309c50b5fecd563e8e466cbe2c5972b
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Fri Mar 6 15:19:58 2015 +0100
+
+    Fix  Wrong colour shown when GouraudTriangleShFill uses a DeviceN
+    colorspace
+
+    Bug #89182
+
+ poppler/SplashOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b7fde1ec83a5fff9bec73becc22e581583a30d43
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed Feb 25 21:51:34 2015 +0100
+
+    Fix last commit regression
+
+    It seems it actually needs to be pipe->shape and not pipe->usesShape
+    (i.e. it seems at some point we use pipe->shape with useShape
+    being false)
+    Otherwise we had a regression on
+    eci_altona-test-suite-v2_technical2_x4.pdf
+
+ splash/Splash.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 7980fe868a8ef2ee3315f0bcb606c448d6604039
+Author: William Bader <williambader@hotmail.com>
+Date:   Wed Feb 25 15:00:33 2015 +0100
+
+    Fix uninitialized variable in Splash::pipeRun
+
+    Use useShape is actually the guard for shape, so use it in the if
+
+ splash/Splash.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 57b6b78a0831fb31c06fd1bc6e9803de524f9d2d
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Tue Feb 24 23:34:57 2015 +0100
+
+    pdfseparate: use always an unique instance for PDFDoc for savePageAs
+
+ utils/pdfseparate.cc | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+commit 8a30d219df71ead323649ff0dfd4a724b5e7bd18
+Author: William Bader <williambader@hotmail.com>
+Date:   Sat Feb 21 23:55:10 2015 +0100
+
+    Fix memcpy introduced in ec956ab8552dbe10fac4e649951042bddc424b7d
+
+ goo/GooString.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ec956ab8552dbe10fac4e649951042bddc424b7d
+Author: William Bader <williambader@hotmail.com>
+Date:   Tue Feb 17 22:55:14 2015 +0100
+
+    Reduce use of gmalloc() in GooString::appendfv()
+
+    Bug #89096
+
+ goo/GooString.cc | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+commit 132ef18324f62c1f2a08dcd794b379fadaa4daf5
+Author: Petr Gajdos <pgajdos@suse.cz>
+Date:   Wed Feb 11 19:37:21 2015 +0100
+
+    Annot BG/BC: Empty Array means no color
+
+ poppler/Annot.cc | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+commit bf4aae25a244b1033a2479b9a8f633224f7d5de5
+Author: William Bader <williambader@hotmail.com>
+Date:   Wed Feb 11 17:35:40 2015 +0100
+
+    Off by one fix to the previous crash fix
+
+ fofi/FoFiTrueType.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+commit 97dd46bae5424818ca808c20506d7d96f7b85fb5
+Author: William Bader <williambader@hotmail.com>
+Date:   Mon Feb 9 22:30:51 2015 +0100
+
+    pdftops: Add aaRaster and overprint to man file
+
+ utils/pdftops.1 | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit c114a90063d755639d2b0dbf816690a66b54bee0
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Feb 8 00:24:11 2015 +0100
+
+    Fix crash in fuzzed file from Bug #84988
+
+ poppler/TextOutputDev.cc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 22895623e6cd2a5923f552421d44cc80cab77dd8
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Feb 7 22:28:21 2015 +0100
+
+    Fix malformed file crash from bug #86854
+
+ poppler/PSOutputDev.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cdb7ad95f7c8fbf63ade040d8a07ec96467042fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Feb 7 22:21:16 2015 +0100
+
+    Fix malformed file crash in bug #85243
+
+ fofi/FoFiTrueType.cc | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+commit 6641b935e1fc0c4151a723b6b476d987b8324ed2
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Feb 7 21:58:23 2015 +0100
+
+    If ECM is around include the sanitizers module
+
+    This way you can run
+      cmake -DECM_ENABLE_SANITIZERS='address'
+    and get an ASAN built poppler
+
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 92e41685dcef538a7fc669ca357ce9f448a8078e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sat Feb 7 21:54:39 2015 +0100
+
+    Fix crash in malformed file from bug #85275
+
+ poppler/SplashOutputDev.cc |  4 ++--
+ splash/Splash.cc           | 10 +++++++++-
+ splash/SplashBitmap.cc     |  4 ++--
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+commit 9842b3b00492eda21297d5d65f769f77a565f6ac
+Author: Aleksei Volkov <Aleksei Volkov>
+Date:   Sat Feb 7 20:46:26 2015 +0100
+
+    No need to check for hmtx, freetype does for us
+
+    Bug #88939
+
+ fofi/FoFiTrueType.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 4849eb43892640062c485e48ba7a29b5a0cc9587
+Author: William Bader <williambader@hotmail.com>
+Date:   Sat Feb 7 16:41:53 2015 +0100
+
+    Make the colorpsace optimization and option and not the default
+
+    Bug #88971
+
+ poppler/PSOutputDev.cc | 25 ++++++++++++++++---------
+ poppler/PSOutputDev.h  |  4 ++++
+ utils/pdftops.1        | 10 +++++++++-
+ utils/pdftops.cc       |  4 ++++
+ 4 files changed, 33 insertions(+), 10 deletions(-)
+
+commit 8e16e423a718b92514885e771e31048f1ae2a766
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Feb 5 20:18:13 2015 +0100
+
+    0.31.0
+
+    And copyright updating
+
+ CMakeLists.txt            |  4 ++--
+ NEWS                      | 17 +++++++++++++++++
+ configure.ac              |  2 +-
+ cpp/Doxyfile              |  2 +-
+ poppler/CairoOutputDev.cc |  1 +
+ poppler/CairoOutputDev.h  |  1 +
+ poppler/JBIG2Stream.cc    |  1 +
+ poppler/JBIG2Stream.h     |  1 +
+ poppler/Makefile.am       |  2 +-
+ poppler/Stream.cc         |  1 +
+ qt4/src/CMakeLists.txt    |  2 +-
+ qt4/src/Doxyfile          |  2 +-
+ qt4/src/Makefile.am       |  2 +-
+ qt5/src/CMakeLists.txt    |  2 +-
+ qt5/src/Doxyfile          |  2 +-
+ qt5/src/Makefile.am       |  2 +-
+ 16 files changed, 33 insertions(+), 11 deletions(-)
+
 commit f932315e559a7857d9c5642eb04efc0d2b717789
 Author: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 Date:   Tue Jan 20 22:05:29 2015 +1030
diff --git a/Build/source/libs/poppler/poppler-0.31.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.32.0/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/INSTALL b/Build/source/libs/poppler/poppler-0.32.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.32.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.31.0/Makefile.am b/Build/source/libs/poppler/poppler-0.32.0/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.32.0/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.31.0/NEWS b/Build/source/libs/poppler/poppler-0.32.0/NEWS
index 00dbc2539a4..e83112497f0 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.32.0/NEWS
@@ -1,3 +1,19 @@
+Release 0.32.0
+        core:
+         * Annotations: Fix rendering of empty BG/BC arrays
+         * Splash: Fix wrong colour shown when GouraudTriangleShFill uses a DeviceN colorspace. Bug #89182
+         * Splash: Fix use of uninitialized variable in Splash::pipeRun
+         * Remove unnecesary check for font validity. Bug #88939
+         * Small optimization in GooString::appendfv(). Bug #89096
+         * Fix crashes in malformed files
+
+        utils:
+         * pdftops: Make colorpsace optimization an option instead of default
+         * pdfseparate: use always an unique instance for PDFDoc for savePageAs
+
+        build system:
+         * cmake: If extra-cmake-modules is around include the Sanitizers module
+
 Release 0.31.0
         core:
          * CairoOutputDev: support embedding JBIG2 image data
@@ -5,10 +21,10 @@ Release 0.31.0
          * Fix crash on broken documents
          * JPEG2000Stream: Inline doGetChar and doLookChar
          * GlobalParams cleaning
-        
+
         utils:
          * pdftops: Add rasterization option. Bug #85934
-        
+
         qt4:
          * Expose whole-words search option
 
diff --git a/Build/source/libs/poppler/poppler-0.31.0/README b/Build/source/libs/poppler/poppler-0.32.0/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/README
+++ b/Build/source/libs/poppler/poppler-0.32.0/README
diff --git a/Build/source/libs/poppler/poppler-0.31.0/README-XPDF b/Build/source/libs/poppler/poppler-0.32.0/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.32.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.31.0/TODO b/Build/source/libs/poppler/poppler-0.32.0/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.32.0/TODO
diff --git a/Build/source/libs/poppler/poppler-0.31.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.32.0/config.h.cmake
index 8ed1c92248e..8ed1c92248e 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/config.h.in b/Build/source/libs/poppler/poppler-0.32.0/config.h.in
index c47d66d3e52..c47d66d3e52 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/configure.ac b/Build/source/libs/poppler/poppler-0.32.0/configure.ac
index 3f43c0eb705..56a972e456b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.32.0/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[31])
+m4_define([poppler_version_minor],[32])
 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.31.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc
index 4759186edfe..11699dd6119 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.cc
@@ -16,11 +16,13 @@
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2012, 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2009, 2012, 2014, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
 // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Aleksei Volkov <Aleksei Volkov>
+// Copyright (C) 2015 William Bader <williambader@hotmail.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
@@ -38,6 +40,7 @@
 #include <algorithm>
 #include "goo/gtypes.h"
 #include "goo/gmem.h"
+#include "goo/GooLikely.h"
 #include "goo/GooString.h"
 #include "goo/GooHash.h"
 #include "FoFiType1C.h"
@@ -936,7 +939,7 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
   GBool ok;
   Guint checksum;
   int nNewTables;
-  int glyfTableLen, length, pos, glyfPos, i, j, k;
+  int glyfTableLen, length, pos, glyfPos, i, j, k, vmtxTabLength;
   Guchar vheaTab[36] = {
     0, 1, 0, 0,			// table version number
     0, 0,			// ascent
@@ -1047,6 +1050,7 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
     }
   }
   vmtxTab = NULL; // make gcc happy
+  vmtxTabLength = 0;
   advance = 0; // make gcc happy
   if (needVerticalMetrics) {
     needVhea = seekTable("vhea") < 0;
@@ -1104,6 +1108,7 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
 	checksum = computeTableChecksum(vheaTab, length);
       } else if (needVerticalMetrics && i == t42VmtxTable) {
 	length = 4 + (nGlyphs - 1) * 2;
+	vmtxTabLength = length;
 	vmtxTab = (Guchar *)gmalloc(length);
 	vmtxTab[0] = advance / 256;
 	vmtxTab[1] = advance % 256;
@@ -1218,8 +1223,16 @@ void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc,
 	  dumpString(file + tables[j].offset, tables[j].len,
 		     outputFunc, outputStream);
 	} else if (needVerticalMetrics && i == t42VheaTable) {
+	  if (unlikely(length > (int)sizeof(vheaTab))) {
+	    error(errSyntaxWarning, -1, "length bigger than vheaTab size");
+	    length = sizeof(vheaTab);
+	  }
 	  dumpString(vheaTab, length, outputFunc, outputStream);
 	} else if (needVerticalMetrics && i == t42VmtxTable) {
+	  if (unlikely(length > vmtxTabLength)) {
+	    error(errSyntaxWarning, -1, "length bigger than vmtxTab size");
+	    length = vmtxTabLength;
+	  }
 	  dumpString(vmtxTab, length, outputFunc, outputStream);
 	}
       }
@@ -1366,7 +1379,6 @@ void FoFiTrueType::parse() {
   if (seekTable("head") < 0 ||
       seekTable("hhea") < 0 ||
       seekTable("maxp") < 0 ||
-      seekTable("hmtx") < 0 ||
       (!openTypeCFF && seekTable("loca") < 0) ||
       (!openTypeCFF && seekTable("glyf") < 0) ||
       (openTypeCFF && seekTable("CFF ") < 0)) {
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.cc
index 827ebc7d7c3..827ebc7d7c3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.32.0/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.32.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.32.0/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.32.0/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.cc
index 8591d95cd3e..3f22f368560 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.cc
@@ -24,6 +24,7 @@
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2012 Pino Toscano <pino@kde.org>
 // Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2015 William Bader <williambader@hotmail.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
@@ -320,10 +321,11 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) {
   int len, i;
   const char *p0, *p1;
   char *str;
+  GooStringFormatArg argsBuf[ 8 ];
 
   argsLen = 0;
-  argsSize = 8;
-  args = (GooStringFormatArg *)gmallocn(argsSize, sizeof(GooStringFormatArg));
+  argsSize = sizeof(argsBuf) / sizeof(argsBuf[0]);
+  args = argsBuf;
 
   p0 = fmt;
   while (*p0) {
@@ -392,8 +394,13 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) {
 	if (idx == argsLen) {
 	  if (argsLen == argsSize) {
 	    argsSize *= 2;
-	    args = (GooStringFormatArg *)greallocn(args, argsSize,
+	    if (args == argsBuf) {
+	      args = (GooStringFormatArg *)gmallocn(argsSize, sizeof(GooStringFormatArg));
+	      memcpy(args, argsBuf, argsLen * sizeof(GooStringFormatArg));
+	    } else {
+	      args = (GooStringFormatArg *)greallocn(args, argsSize,
 						 sizeof(GooStringFormatArg));
+	    }
 	  }
 	  switch (ft) {
 	  case fmtIntDecimal:
@@ -632,7 +639,10 @@ GooString *GooString::appendfv(const char *fmt, va_list argList) {
     }
   }
 
-  gfree(args);
+  if (args != argsBuf) {
+    gfree(args);
+  }
+
   return this;
 }
 
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.h
index 0176d873646..0176d873646 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.32.0/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.32.0/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.32.0/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.cc
index d35cb9b2697..d7769a0f627 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.cc
@@ -32,6 +32,7 @@
 // Copyright (C) 2014 Marek Kasik <mkasik@redhat.com>
 // Copyright (C) 2014 Jiri Slaby <jirislaby@gmail.com>
 // Copyright (C) 2014 Anuj Khare <khareanuj18@gmail.com>
+// Copyright (C) 2015 Petr Gajdos <pgajdos@suse.cz>
 //
 // 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
@@ -1045,14 +1046,24 @@ AnnotAppearanceCharacs::AnnotAppearanceCharacs(Dict *dict) {
   obj1.free();
 
   if (dict->lookup("BC", &obj1)->isArray()) {
-    borderColor = new AnnotColor(obj1.getArray());
+    Array *colorComponents = obj1.getArray();
+    if (colorComponents->getLength() > 0) {
+      borderColor = new AnnotColor(colorComponents);
+    } else {
+      borderColor = NULL;
+    }
   } else {
     borderColor = NULL;
   }
   obj1.free();
 
   if (dict->lookup("BG", &obj1)->isArray()) {
-    backColor = new AnnotColor(obj1.getArray());
+    Array *colorComponents = obj1.getArray();
+    if (colorComponents->getLength() > 0) {
+      backColor = new AnnotColor(colorComponents);
+    } else {
+      backColor = NULL;
+    }
   } else {
     backColor = NULL;
   }
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.h
index 8fde6a6736b..8fde6a6736b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc
index a5a3023208a..a5a3023208a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc
index a86ec120f20..a86ec120f20 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h
index 33dde0c570a..33dde0c570a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc
index f75f4e106f3..f75f4e106f3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.cc
index 59b7c93e66f..59b7c93e66f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc
index 07d95b355a8..07d95b355a8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc
index 3e9b7db4248..3e9b7db4248 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h
index 1f01cc7571c..1f01cc7571c 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc
index 3e9cac41534..3e9cac41534 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.h
index f018e93dd34..f018e93dd34 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc
index 7e110d05b15..7e110d05b15 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h
index 16d615ae6d9..16d615ae6d9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc
index 66c1d2505e8..66c1d2505e8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h
index 1e14c5cf783..1e14c5cf783 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc
index 35e98b86ebc..35e98b86ebc 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h
index 73b6bdd97b8..73b6bdd97b8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.32.0/poppler/Makefile.am
index 9a623af29bb..43faa7e39b3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD =				\
 	$(win32_libs)
 
 libpoppler_la_LDFLAGS =				\
-	-version-info 50:0:0			\
+	-version-info 51:0:0			\
 	@create_shared_lib@			\
 	@auto_import_flags@
 
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.cc
index 71a1efe269d..71a1efe269d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc
index f69eb860800..2502f5fc286 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.cc
@@ -1235,6 +1235,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
   embedCIDPostScript = gTrue;
   embedCIDTrueType = gTrue;
   fontPassthrough = gFalse;
+  optimizeColorSpace = gFalse;
   preloadImagesForms = gFalse;
   generateOPI = gFalse;
   useASCIIHex = gFalse;
@@ -1899,7 +1900,7 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
 	switch (fontLoc->fontType) {
 	case fontType1:
 	  // this assumes that the PS font name matches the PDF font name
-	  psName = font->getEmbeddedFontName()->copy();
+	  psName = font->getEmbeddedFontName() ? font->getEmbeddedFontName()->copy() : new GooString();
 	  setupEmbeddedType1Font(&fontLoc->embFontID, psName);
 	  break;
 	case fontType1C:
@@ -3312,16 +3313,20 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
     case psLevel1Sep:
       p = bitmap->getDataPtr();
       // Check for an all gray image
-      isGray = gTrue;
-      for (y = 0; y < h; ++y) {
-	for (x = 0; x < w; ++x) {
-	  if (p[4*x] != p[4*x + 1] || p[4*x] != p[4*x + 2]) {
-	    isGray = gFalse;
-	    y = h;
-	    break;
+      if (getOptimizeColorSpace()) {
+        isGray = gTrue;
+        for (y = 0; y < h; ++y) {
+	  for (x = 0; x < w; ++x) {
+	    if (p[4*x] != p[4*x + 1] || p[4*x] != p[4*x + 2]) {
+	      isGray = gFalse;
+	      y = h;
+	      break;
+	    }
 	  }
+	  p += bitmap->getRowSize();
 	}
-	p += bitmap->getRowSize();
+      } else {
+	isGray = gFalse;
       }
       writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}{6:s}\n",
 		 w, h, w, -h, h,
@@ -3468,7 +3473,9 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
       p = bitmap->getDataPtr() + (h - 1) * bitmap->getRowSize();
       str0 = new MemStream((char *)p, 0, w * h * numComps, &obj);
       // Check for a color image that uses only gray
-      if (numComps == 4) {
+      if (!getOptimizeColorSpace()) {
+	isGray = gFalse;
+      } else if (numComps == 4) {
         int compCyan;
         isGray = gTrue;
         while ((compCyan = str0->getChar()) != EOF) {
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h
index 128ff7c7572..6c14cef7bb6 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSOutputDev.h
@@ -319,11 +319,13 @@ public:
   GBool getEmbedCIDPostScript() const { return embedCIDPostScript; }
   GBool getEmbedCIDTrueType() const { return embedCIDTrueType; }
   GBool getFontPassthrough() const { return fontPassthrough; }
+  GBool getOptimizeColorSpace() const { return optimizeColorSpace; }
   void setEmbedType1(GBool b) { embedType1 = b; }
   void setEmbedTrueType(GBool b) { embedTrueType = b; }
   void setEmbedCIDPostScript(GBool b) { embedCIDPostScript = b; }
   void setEmbedCIDTrueType(GBool b) { embedCIDTrueType = b; }
   void setFontPassthrough(GBool b) { fontPassthrough = b; }
+  void setOptimizeColorSpace(GBool b) { optimizeColorSpace = b; }
   void setPreloadImagesForms(GBool b) { preloadImagesForms = b; }
   void setGenerateOPI(GBool b) { generateOPI = b; }
   void setUseASCIIHex(GBool b) { useASCIIHex = b; }
@@ -518,6 +520,8 @@ private:
   GBool embedCIDPostScript;	// embed CID PostScript fonts?
   GBool embedCIDTrueType;	// embed CID TrueType fonts?
   GBool fontPassthrough;	// pass all fonts through as-is?
+  GBool optimizeColorSpace;	// false to keep gray RGB images in their original color space
+				// true to optimize gray images to DeviceGray color space
   GBool preloadImagesForms;	// preload PostScript images and forms into
 				//   memory
   GBool generateOPI;		// generate PostScript OPI comments?
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.cc
index 98c13c14ff8..98c13c14ff8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc
index d6f55995b1c..63d8b4e1287 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.cc
@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2014 Fabio D'Urso <fabiodurso@hotmail.it>
 //
@@ -288,12 +288,16 @@ StandardSecurityHandler::StandardSecurityHandler(PDFDoc *docA,
 	ok = gTrue;
       } else if (encVersion == 5 && encRevision == 5) {
 	fileID = new GooString(); // unused for V=R=5
-	ownerEnc = ownerEncObj.getString()->copy();
-	userEnc = userEncObj.getString()->copy();
-	if (fileKeyLength > 32 || fileKeyLength < 0) {
-	  fileKeyLength = 32;
+	if (ownerEncObj.isString() && userEncObj.isString()) {
+	  ownerEnc = ownerEncObj.getString()->copy();
+	  userEnc = userEncObj.getString()->copy();
+	  if (fileKeyLength > 32 || fileKeyLength < 0) {
+	    fileKeyLength = 32;
+	  }
+	  ok = gTrue;
+	} else {
+	  error(errSyntaxError, -1, "Weird encryption owner/user info");
 	}
-	ok = gTrue;
       } else if (!(encVersion == -1 && encRevision == -1)) {
 	error(errUnimplemented, -1,
 	      "Unsupported version/revision ({0:d}/{1:d}) of Standard security handler",
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc
index 97af5c4b8a1..455c2be62cd 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.cc
@@ -20,7 +20,7 @@
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009-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) 2009, 2014, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
@@ -4048,8 +4048,8 @@ void SplashOutputDev::setSoftMask(GfxState *state, double *bbox,
   p = softMask->getDataPtr() + ty * softMask->getRowSize() + tx;
   int xMax = tBitmap->getWidth();
   int yMax = tBitmap->getHeight();
-  if (xMax + tx > bitmap->getWidth()) xMax = bitmap->getWidth() - tx;
-  if (yMax + ty > bitmap->getHeight()) yMax = bitmap->getHeight() - ty;
+  if (xMax > bitmap->getWidth() - tx) xMax = bitmap->getWidth() - tx;
+  if (yMax > bitmap->getHeight() - ty) yMax = bitmap->getHeight() - ty;
   for (y = 0; y < yMax; ++y) {
     for (x = 0; x < xMax; ++x) {
       if (alpha) {
@@ -4364,7 +4364,7 @@ GBool SplashOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTria
 #if SPLASH_CMYK
     case splashModeCMYK8:
     case splashModeDeviceN8:
-      bDirectColorTranslation = (shadingMode == csDeviceCMYK || shadingMode == csDeviceN);
+      bDirectColorTranslation = (shadingMode == csDeviceCMYK);
     break;
 #endif
     default:
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h
index ae20faccb51..ae20faccb51 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.cc
index d2dd761c729..d2dd761c729 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.cc
index b1aaca8a58b..b1aaca8a58b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc
index c9db1e7d19f..150d4449603 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.cc
@@ -20,7 +20,7 @@
 // Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2007, 2008, 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2008, 2010-2012, 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010-2012, 2014, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2008, 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2009 Ross Moore <ross@maths.mq.edu.au>
@@ -622,6 +622,10 @@ void TextPool::addWord(TextWord *word) {
   TextWord *w0, *w1;
 
   // expand the array if needed
+  if (unlikely((word->base / textPoolStep) > INT_MAX)) {
+      error(errSyntaxWarning, -1, "word->base / textPoolStep > INT_MAX");
+      return;
+  }
   wordBaseIdx = (int)(word->base / textPoolStep);
   if (minBaseIdx > maxBaseIdx) {
     minBaseIdx = wordBaseIdx - 128;
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.h
index 23fb3b726a9..23fb3b726a9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.32.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.cmake
index b087a693f92..b087a693f92 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.in
index f73d0f66ee9..f73d0f66ee9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.31.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.32.0/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.32.0/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.32.0/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.cc
index fde272acbab..d8ee6409605 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.cc
@@ -11,11 +11,11 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005-2014 Albert Astals Cid <aacid@kde.org>
+// 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 Christian Feuersänger <cfeuersaenger@googlemail.com>
-// Copyright (C) 2011-2013 William Bader <williambader@hotmail.com>
+// Copyright (C) 2011-2013, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2012 Markus Trippelsdorf <markus@trippelsdorf.de>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2012 Matthias Kramm <kramm@quiss.org>
@@ -271,6 +271,7 @@ inline void Splash::pipeInit(SplashPipe *pipe, int x, int y,
   // source alpha
   pipe->aInput = aInput;
   pipe->usesShape = usesShape;
+  pipe->shape = 0;
 
   // knockout
   pipe->knockout = knockout;
@@ -5214,6 +5215,10 @@ SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc,
     return splashErrModeMismatch;
   }
 
+  if (unlikely(!bitmap->data)) {
+    return splashErrZeroImage;
+  }
+
   if(src->getSeparationList()->getLength() > bitmap->getSeparationList()->getLength()) {
     for (x = bitmap->getSeparationList()->getLength(); x < src->getSeparationList()->getLength(); x++)
       bitmap->getSeparationList()->append(((GfxSeparationColorSpace *)src->getSeparationList()->get(x))->copy());
@@ -5783,6 +5788,10 @@ SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc,
     return splashErrModeMismatch;
   }
 
+  if (unlikely(!bitmap->data)) {
+    return splashErrZeroImage;
+  }
+
   switch (bitmap->mode) {
   case splashModeMono1:
     for (y = 0; y < h; ++y) {
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc
index ac344f17c35..e886683fd41 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.cc
@@ -11,7 +11,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2006, 2009, 2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2009, 2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007 Ilmari Heikkinen <ilmari.heikkinen@gmail.com>
 // Copyright (C) 2009 Shen Liang <shenzhuxi@gmail.com>
 // Copyright (C) 2009 Stefan Thomas <thomas@eload24.com>
@@ -275,7 +275,7 @@ SplashError SplashBitmap::writeAlphaPGMFile(char *fileName) {
 void SplashBitmap::getPixel(int x, int y, SplashColorPtr pixel) {
   SplashColorPtr p;
 
-  if (y < 0 || y >= height || x < 0 || x >= width) {
+  if (y < 0 || y >= height || x < 0 || x >= width || !data) {
     return;
   }
   switch (mode) {
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.32.0/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index e53643a1637..20359d39c41 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.31.0])
+m4_define([poppler_version], [0.32.0])
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2015-03-08 10:37:01 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2015-03-08 10:37:01 +0000
commit	bb5c8957bd708c29d5c9d2e356326f19a4faf78f (patch)
tree	46e216a4befb58eb1905220a4c78f2f97951374f
parent	01d6e342250679c8c09bbd2a6f32db6036480fa4 (diff)