poppler 0.29.0

git-svn-id: svn://tug.org/texlive/trunk@35749 c570f23f-e606-0410-a88d-b1316a301751
author: Peter Breitenlohner <peb@mppmu.mpg.de> 2014-12-05 09:04:57 +0000
committer: Peter Breitenlohner <peb@mppmu.mpg.de> 2014-12-05 09:04:57 +0000
commit: cf7e21cca95784d0744759e2a05f2700fe45778d (patch)
tree: 17ba2512f5bad060985a878aea765b3f464d62c1 /Build/source/libs
parent: cf4b7e8c43521a9301aaf1cd3f745eef8c0399d6 (diff)
297 files changed, 614 insertions, 257 deletions
diff --git a/Build/source/libs/README b/Build/source/libs/README
index be855cc2da7..c09492c8bb3 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.28.0 - checked 4nov14
+poppler 0.29.0 - checked 5dec14
   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 99aa4c4fc46..3db0f80f441 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.29.0.
+	* version.ac: Adjust.
+
 2014-12-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Added KPSE_COMPILER_VISIBILITY.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 381731d8e6d..9f37ff095c5 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -80,7 +80,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
 	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(srcdir)/config.h.in \
-	$(top_srcdir)/poppler-0.28.0/poppler/poppler-config.h.in \
+	$(top_srcdir)/poppler-0.29.0/poppler/poppler-config.h.in \
 	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
@@ -581,7 +581,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.28.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.29.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 7d17483ca11..7c323259a6b 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.28.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.29.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.28.0'
-PACKAGE_STRING='poppler (TeX Live) 0.28.0'
+PACKAGE_VERSION='0.29.0'
+PACKAGE_STRING='poppler (TeX Live) 0.29.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.28.0/poppler/Array.cc"
+ac_unique_file="poppler-0.29.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.28.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.29.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.28.0:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.29.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.28.0
+poppler (TeX Live) configure 0.29.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.28.0, which was
+It was created by poppler (TeX Live) $as_me 0.29.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.28.0'
+ VERSION='0.29.0'
 
 
 # Some tools Automake needs.
@@ -6572,12 +6572,12 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.28.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.29.0/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.28.0"
+#define POPPLER_VERSION "0.29.0"
 _ACEOF
 
 
@@ -6711,7 +6711,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.28.0
+POPPLER_TREE=poppler-0.29.0
 
 
 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7271,7 +7271,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.28.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.29.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7337,7 +7337,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.28.0
+poppler (TeX Live) config.status 0.29.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7468,7 +7468,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.28.0/poppler/poppler-config.h.in" ;;
+    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.29.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.28.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
index eb46aee57e9..16ffd02b874 100644
--- a/Build/source/libs/poppler/poppler-0.28.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.29.0 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-02-LLONG_MAX: Adapted.
+
 2014-11-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.28.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
index 61bbc4a65d2..92980bc4b1c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.28.0 tree as obtained from:
+Changes applied to the poppler-0.29.0 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
index 21569fa4439..57e7fe17d21 100644
--- a/Build/source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.28.0.orig/goo/GooString.h poppler-0.28.0/goo/GooString.h
---- poppler-0.28.0.orig/goo/GooString.h	2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.28.0/goo/GooString.h	2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.29.0.orig/goo/GooString.h poppler-0.29.0/goo/GooString.h
+--- poppler-0.29.0.orig/goo/GooString.h	2014-10-07 22:41:15.000000000 +0200
++++ poppler-0.29.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.28.0/AUTHORS b/Build/source/libs/poppler/poppler-0.29.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.29.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.28.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.29.0/CMakeLists.txt
index 7178d25a851..7fdb49a178d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.29.0/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckFileOffsetBits)
 CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "28")
+set(POPPLER_MINOR_VERSION "29")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -443,7 +443,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 47.0.0 SOVERSION 47)
+set_target_properties(poppler PROPERTIES VERSION 48.0.0 SOVERSION 48)
 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.28.0/COPYING b/Build/source/libs/poppler/poppler-0.29.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.29.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.28.0/ChangeLog b/Build/source/libs/poppler/poppler-0.29.0/ChangeLog
index e395b330610..01c35a00783 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.29.0/ChangeLog
@@ -1,3 +1,171 @@
+commit fee700cfecb9d7d5fa938704a5f457f15aaa4676
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Dec 1 20:52:42 2014 +0100
+
+    Run dos2unix as suggested by Volker Grabsch
+
+ splash/SplashState.h            | 278 ++++++++++----------
+ test/perf-test-preview-dummy.cc |  44 ++--
+ test/perf-test-preview-win.cc   | 544
+ ++++++++++++++++++++--------------------
+ 3 files changed, 433 insertions(+), 433 deletions(-)
+
+commit d3fe0661c6dc6050e14cd5cb4afa089b7d7d66b0
+Author: Richard PALO <richard@netbsd.org>
+Date:   Sun Nov 30 22:46:22 2014 +0100
+
+    warning: "_FILE_OFFSET_BITS" redefined
+
+    Bug #86870
+
+ test/perf-test.cc | 2559
+ +++++++++++++++++++++++++++--------------------------
+ 1 file changed, 1280 insertions(+), 1279 deletions(-)
+
+commit 18884065e11fee82506915095619107a43172ecb
+Author: Richard PALO <richard@netbsd.org>
+Date:   Sun Nov 30 22:36:29 2014 +0100
+
+    The isfinite macro is defined on SunOS under c99
+
+    Bug #86869
+
+ poppler/SplashOutputDev.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit bcb470064dd9f75ab0b0a0d9b7319fe8f1e558ae
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Tue Nov 25 05:53:38 2014 +1030
+
+    cofigure: print "no" instead of "auto" if lcms not found
+
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 832046c57ab2909d329340f1c941b29e8246ff73
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Fri Nov 28 11:08:34 2014 +0100
+
+    Use correct LAB byte array for lcms input
+
+    Bug #86388
+
+ poppler/GfxState.cc | 51
+ ++++++++++++++++++++++++++++++++++++++-------------
+ poppler/GfxState.h  |  4 +++-
+ 2 files changed, 41 insertions(+), 14 deletions(-)
+
+commit a604bc3a2ed9f9181aa3b12d795608fcf5e08220
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Fri Nov 14 11:56:50 2014 +0100
+
+    Solve blend mode problem in CYMK and DeviceN for separable blend modes
+
+    Fixes part of #68986
+
+ poppler/SplashOutputDev.cc | 277
+ +++++++++++++++++++++++++--------------------
+ 1 file changed, 155 insertions(+), 122 deletions(-)
+
+commit b7802ff39db270dda2aa20f005fb87c22ed34137
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Fri Nov 14 11:47:38 2014 +0100
+
+    Use Default colorspaces if present instead of Device colorspaces
+
+    Fixes part of #68986
+
+ poppler/CairoOutputDev.cc |   4 +-
+ poppler/Gfx.cc            |  40 +++++-----
+ poppler/GfxState.cc       | 197
+ ++++++++++++++++++++++++++++++++++------------
+ poppler/GfxState.h        |  31 ++++----
+ poppler/Page.cc           |   4 +-
+ 5 files changed, 188 insertions(+), 88 deletions(-)
+
+commit 07aa6f4030418883d8d45a8dfa3d80d2dadca4e7
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Thu Nov 13 12:26:25 2014 +0100
+
+    write correct size in trailer dict
+
+    Bug #86063
+
+ poppler/PDFDoc.cc | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+commit 51e7c29cabedc72e097023e6d8d6d68ed43fa20c
+Author: Carlos Garcia Campos <cgarcia@igalia.com>
+Date:   Fri Nov 7 18:30:36 2014 +0100
+
+    regtest: Update references also for tests that no longer crash
+
+    We are currently updating the refs only when we have checksums to
+    compare, but if a test used to crash there's no md5 file in refs.
+
+ regtest/TestRun.py           |  2 ++
+ regtest/backends/__init__.py | 24 ++++++++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+
+commit d205908930d5dc4ec3a1a1a2c2b93fbb92c2c867
+Author: William Bader <williambader@hotmail.com>
+Date:   Wed Nov 5 20:23:49 2014 +0100
+
+    Make it proper C
+
+ glib/demo/annots.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit fa1d636b00210b9c52787ab3c833fe9aa2e293fa
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Nov 4 20:00:08 2014 +0100
+
+    0.28.1
+
+ configure.ac     | 2 +-
+ cpp/Doxyfile     | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 7debbb05df18afc86df8a4fd37980728ec2e5788
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Nov 4 19:29:58 2014 +0100
+
+    Fix typo
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d5489ef37742227176e800390a990f2b882d9710
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Tue Nov 4 01:27:05 2014 +0100
+
+    0.28.0
+
+ CMakeLists.txt         |  6 +++---
+ NEWS                   | 43 +++++++++++++++++++++++++++++++++++++++++++
+ configure.ac           |  4 ++--
+ cpp/Doxyfile           |  2 +-
+ poppler/Makefile.am    |  2 +-
+ 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 +-
+ 11 files changed, 56 insertions(+), 13 deletions(-)
+
+commit f87115a1129e4e03802769181a3392c8dce3192a
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Tue Nov 4 01:25:18 2014 +0100
+
+    Don't ship the moc files
+
+ qt4/demos/Makefile.am | 1 -
+ qt5/demos/Makefile.am | 1 -
+ 2 files changed, 2 deletions(-)
+
 commit 0a9c38076f1555196029372b7e08714b43c7a58d
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Mon Nov 3 21:43:28 2014 +0100
diff --git a/Build/source/libs/poppler/poppler-0.28.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/INSTALL b/Build/source/libs/poppler/poppler-0.29.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.29.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.28.0/Makefile.am b/Build/source/libs/poppler/poppler-0.29.0/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.29.0/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.28.0/NEWS b/Build/source/libs/poppler/poppler-0.29.0/NEWS
index 97b94c8a8b8..4bfd589d6e3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.29.0/NEWS
@@ -1,3 +1,18 @@
+Release 0.29.0
+        core:
+         * Use correct LAB byte array for lcms input. Bug #86388
+         * Write correct size in trailer dict. Bug #86063
+         * Use Default colorspaces if present instead of Device colorspaces
+         * Solve blend mode problem in CYMK and DeviceN for separable blend modes
+         * Compilation/warning fixes on SunOS
+         * Regression test improvements
+
+        glib:
+         * demo: Compilation fixlets
+
+        build system:
+         * cofigure: print "no" instead of "auto" if lcms not found
+
 Release 0.28.0
         core:
          * Fix rendering of file with a wrong embedded font. Bug #84270
diff --git a/Build/source/libs/poppler/poppler-0.28.0/README b/Build/source/libs/poppler/poppler-0.29.0/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/README
+++ b/Build/source/libs/poppler/poppler-0.29.0/README
diff --git a/Build/source/libs/poppler/poppler-0.28.0/README-XPDF b/Build/source/libs/poppler/poppler-0.29.0/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.29.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.28.0/TODO b/Build/source/libs/poppler/poppler-0.29.0/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.29.0/TODO
diff --git a/Build/source/libs/poppler/poppler-0.28.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.29.0/config.h.cmake
index 8ed1c92248e..8ed1c92248e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/config.h.in b/Build/source/libs/poppler/poppler-0.29.0/config.h.in
index 12fb1a09ec6..12fb1a09ec6 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/configure.ac b/Build/source/libs/poppler/poppler-0.29.0/configure.ac
index df8b5d562f5..3bf36e0336b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.29.0/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[28])
+m4_define([poppler_version_minor],[29])
 m4_define([poppler_version_micro],[0])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
@@ -470,7 +470,7 @@ fi
 
 CAIRO_VERSION="1.10.0"
 AC_SUBST(CAIRO_VERSION)
-CAIRO_DEPS="cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION)"
+CAIRO_DEPS="cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION"
 AC_ARG_ENABLE(cairo-output,
               AC_HELP_STRING([--disable-cairo-output],
                              [Don't build the cairo graphics backend.]),
@@ -762,6 +762,8 @@ if test x$lcms1 = xyes || test x$lcms2 = xyes; then
     lcms1=yes;
     AC_DEFINE(USE_LCMS1, 1, [Defines if use lcms1])
   fi
+else
+  enable_cms=no
 fi
 
 AM_CONDITIONAL(USE_CMS, test x$enable_cms = xyes)
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc
index 4759186edfe..4759186edfe 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc
index 827ebc7d7c3..827ebc7d7c3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.29.0/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.29.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.29.0/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.29.0/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.cc
index 8591d95cd3e..8591d95cd3e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.h
index 0176d873646..0176d873646 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.29.0/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.29.0/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.29.0/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.cc
index d35cb9b2697..d35cb9b2697 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.h
index 8fde6a6736b..8fde6a6736b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc
index 4cf8d6b41af..4cf8d6b41af 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc
index e08fe5cdca8..4e8abcfd94d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc
@@ -25,7 +25,7 @@
 // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
 // Copyright (C) 2008, 2012 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
-// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Patrick Pfeifer <p2000@mailinator.com>
 // Copyright (C) 2012 Jason Crain <jason@aquaticape.us>
 //
@@ -2713,7 +2713,7 @@ void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
     return;
 
   str->getDict()->lookup("ColorSpace", &obj);
-  colorSpace = GfxColorSpace::parse(&obj, this, state);
+  colorSpace = GfxColorSpace::parse(NULL, &obj, this, state);
   obj.free();
 
   // colorspace in stream dict may be different from colorspace in jpx
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h
index 8de391ae72b..8de391ae72b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc
index 039f63e1895..039f63e1895 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc
index 59b7c93e66f..59b7c93e66f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
index 6bf7ec54421..64a9d7ba3b4 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
@@ -28,7 +28,7 @@
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2009 M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
-// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 William Bader <williambader@hotmail.com>
 // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2010 Nils Höglund <nils.hoglund@gmail.com>
@@ -468,7 +468,7 @@ GfxPattern *GfxResources::lookupPattern(char *name, OutputDev *out, GfxState *st
   for (resPtr = this; resPtr; resPtr = resPtr->next) {
     if (resPtr->patternDict.isDict()) {
       if (!resPtr->patternDict.dictLookup(name, &obj)->isNull()) {
-	pattern = GfxPattern::parse(&obj, out, state);
+	pattern = GfxPattern::parse(resPtr, &obj, out, state);
 	obj.free();
 	return pattern;
       }
@@ -487,7 +487,7 @@ GfxShading *GfxResources::lookupShading(char *name, OutputDev *out, GfxState *st
   for (resPtr = this; resPtr; resPtr = resPtr->next) {
     if (resPtr->shadingDict.isDict()) {
       if (!resPtr->shadingDict.dictLookup(name, &obj)->isNull()) {
-	shading = GfxShading::parse(&obj, out, state);
+	shading = GfxShading::parse(resPtr, &obj, out, state);
 	obj.free();
 	return shading;
       }
@@ -1236,7 +1236,7 @@ void Gfx::opSetExtGState(Object args[], int numArgs) {
 	  blendingColorSpace = NULL;
 	  isolated = knockout = gFalse;
 	  if (!obj4.dictLookup("CS", &obj5)->isNull()) {
-	    blendingColorSpace = GfxColorSpace::parse(&obj5, out, state);
+	    blendingColorSpace = GfxColorSpace::parse(res, &obj5, out, state);
 	  }
 	  obj5.free();
 	  if (obj4.dictLookup("I", &obj5)->isBool()) {
@@ -1439,7 +1439,7 @@ void Gfx::opSetFillGray(Object args[], int numArgs) {
   state->setFillPattern(NULL);
   res->lookupColorSpace("DefaultGray", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceGrayColorSpace();
@@ -1460,7 +1460,7 @@ void Gfx::opSetStrokeGray(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultGray", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceGrayColorSpace();
@@ -1481,7 +1481,7 @@ void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
 
   res->lookupColorSpace("DefaultCMYK", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceCMYKColorSpace();
@@ -1506,7 +1506,7 @@ void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultCMYK", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceCMYKColorSpace();
@@ -1530,7 +1530,7 @@ void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
   state->setFillPattern(NULL);
   res->lookupColorSpace("DefaultRGB", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceRGBColorSpace();
@@ -1554,7 +1554,7 @@ void Gfx::opSetStrokeRGBColor(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace("DefaultRGB", &obj);
   if (!obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   if (colorSpace == NULL) {
     colorSpace = new GfxDeviceRGBColorSpace();
@@ -1576,9 +1576,9 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
 
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0], out, state);
+    colorSpace = GfxColorSpace::parse(res, &args[0], out, state);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   obj.free();
   if (colorSpace) {
@@ -1601,9 +1601,9 @@ void Gfx::opSetStrokeColorSpace(Object args[], int numArgs) {
   state->setStrokePattern(NULL);
   res->lookupColorSpace(args[0].getName(), &obj);
   if (obj.isNull()) {
-    colorSpace = GfxColorSpace::parse(&args[0], out, state);
+    colorSpace = GfxColorSpace::parse(res, &args[0], out, state);
   } else {
-    colorSpace = GfxColorSpace::parse(&obj, out, state);
+    colorSpace = GfxColorSpace::parse(res, &obj, out, state);
   }
   obj.free();
   if (colorSpace) {
@@ -4403,7 +4403,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
         }
         state->setRenderingIntent(objIntent.getName());
       }
-      colorSpace = GfxColorSpace::parse(&obj1, out, state);
+      colorSpace = GfxColorSpace::parse(res, &obj1, out, state);
       if (objIntent.isName()) {
         state->setRenderingIntent(tempIntent);
         free(tempIntent);
@@ -4415,7 +4415,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       if (objCS.isNull()) {
         colorSpace = new GfxDeviceGrayColorSpace();
       } else {
-        colorSpace = GfxColorSpace::parse(&objCS, out, state);
+        colorSpace = GfxColorSpace::parse(res, &objCS, out, state);
       }
       objCS.free();
     } else if (csMode == streamCSDeviceRGB) {
@@ -4424,7 +4424,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       if (objCS.isNull()) {
         colorSpace = new GfxDeviceRGBColorSpace();
       } else {
-        colorSpace = GfxColorSpace::parse(&objCS, out, state);
+        colorSpace = GfxColorSpace::parse(res, &objCS, out, state);
       }
       objCS.free();
     } else if (csMode == streamCSDeviceCMYK) {
@@ -4433,7 +4433,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
       if (objCS.isNull()) {
         colorSpace = new GfxDeviceCMYKColorSpace();
       } else {
-        colorSpace = GfxColorSpace::parse(&objCS, out, state);
+        colorSpace = GfxColorSpace::parse(res, &objCS, out, state);
       }
       objCS.free();
     } else {
@@ -4528,7 +4528,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
 	  obj2.free();
 	}
       }
-      maskColorSpace = GfxColorSpace::parse(&obj1, out, state);
+      maskColorSpace = GfxColorSpace::parse(NULL, &obj1, out, state);
       obj1.free();
       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
 	goto err1;
@@ -4824,7 +4824,7 @@ void Gfx::doForm(Object *str) {
   if (dict->lookup("Group", &obj1)->isDict()) {
     if (obj1.dictLookup("S", &obj2)->isName("Transparency")) {
       if (!obj1.dictLookup("CS", &obj3)->isNull()) {
-	blendingColorSpace = GfxColorSpace::parse(&obj3, out, state);
+	blendingColorSpace = GfxColorSpace::parse(res, &obj3, out, state);
       }
       obj3.free();
       if (obj1.dictLookup("I", &obj3)->isBool()) {
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc
index 39f026ad6d4..39f026ad6d4 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h
index 1be89750349..1be89750349 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc
index eae85dc3856..359c0d693ae 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc
@@ -192,7 +192,7 @@ static const std::map<unsigned int, unsigned int>::size_type CMSCACHE_LIMIT = 20
 #define LCMS_FLAGS 0
 #else
 #include <lcms2.h>
-#define LCMS_FLAGS cmsFLAGS_NOOPTIMIZE
+#define LCMS_FLAGS cmsFLAGS_NOOPTIMIZE | cmsFLAGS_BLACKPOINTCOMPENSATION
 #endif
 
 #define COLOR_PROFILE_DIR "/ColorProfiles/"
@@ -203,10 +203,11 @@ void GfxColorTransform::doTransform(void *in, void *out, unsigned int size) {
 }
 
 // transformA should be a cmsHTRANSFORM
-GfxColorTransform::GfxColorTransform(void *transformA, int cmsIntentA, unsigned int transformPixelTypeA) {
+GfxColorTransform::GfxColorTransform(void *transformA, int cmsIntentA, unsigned int inputPixelTypeA, unsigned int transformPixelTypeA) {
   transform = transformA;
   refCount = 1;
   cmsIntent = cmsIntentA;
+  inputPixelType = inputPixelTypeA;
   transformPixelType = transformPixelTypeA;
 }
 
@@ -250,7 +251,7 @@ void GfxColorSpace::setDisplayProfile(void *displayProfileA) {
 	  INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
       error(errSyntaxWarning, -1, "Can't create Lab transform");
     } else {
-      XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
+      XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, PT_XYZ, displayPixelType);
     }
     cmsCloseProfile(XYZProfile);
   }
@@ -282,7 +283,7 @@ GfxColorSpace::GfxColorSpace() {
 GfxColorSpace::~GfxColorSpace() {
 }
 
-GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxColorSpace::parse(GfxResources *res, Object *csObj, OutputDev *out, GfxState *state, int recursion) {
   GfxColorSpace *cs;
   Object obj1;
 
@@ -294,11 +295,44 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
   cs = NULL;
   if (csObj->isName()) {
     if (csObj->isName("DeviceGray") || csObj->isName("G")) {
-      cs = new GfxDeviceGrayColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultGray", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceGrayColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceGrayColorSpace();
+      }
     } else if (csObj->isName("DeviceRGB") || csObj->isName("RGB")) {
-      cs = new GfxDeviceRGBColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultRGB", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceRGBColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceRGBColorSpace();
+      }
     } else if (csObj->isName("DeviceCMYK") || csObj->isName("CMYK")) {
-      cs = new GfxDeviceCMYKColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultCMYK", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceCMYKColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceCMYKColorSpace();
+      }
     } else if (csObj->isName("Pattern")) {
       cs = new GfxPatternColorSpace(NULL);
     } else {
@@ -307,11 +341,44 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
   } else if (csObj->isArray() && csObj->arrayGetLength() > 0) {
     csObj->arrayGet(0, &obj1);
     if (obj1.isName("DeviceGray") || obj1.isName("G")) {
-      cs = new GfxDeviceGrayColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultGray", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceGrayColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceGrayColorSpace();
+      }
     } else if (obj1.isName("DeviceRGB") || obj1.isName("RGB")) {
-      cs = new GfxDeviceRGBColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultRGB", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceRGBColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceRGBColorSpace();
+      }
     } else if (obj1.isName("DeviceCMYK") || obj1.isName("CMYK")) {
-      cs = new GfxDeviceCMYKColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultCMYK", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceCMYKColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceCMYKColorSpace();
+      }
     } else if (obj1.isName("CalGray")) {
       cs = GfxCalGrayColorSpace::parse(csObj->getArray(), state);
     } else if (obj1.isName("CalRGB")) {
@@ -321,13 +388,13 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
     } else if (obj1.isName("ICCBased")) {
       cs = GfxICCBasedColorSpace::parse(csObj->getArray(), out, state, recursion);
     } else if (obj1.isName("Indexed") || obj1.isName("I")) {
-      cs = GfxIndexedColorSpace::parse(csObj->getArray(), out, state, recursion);
+      cs = GfxIndexedColorSpace::parse(res, csObj->getArray(), out, state, recursion);
     } else if (obj1.isName("Separation")) {
-      cs = GfxSeparationColorSpace::parse(csObj->getArray(), out, state, recursion);
+      cs = GfxSeparationColorSpace::parse(res, csObj->getArray(), out, state, recursion);
     } else if (obj1.isName("DeviceN")) {
-      cs = GfxDeviceNColorSpace::parse(csObj->getArray(), out, state, recursion);
+      cs = GfxDeviceNColorSpace::parse(res, csObj->getArray(), out, state, recursion);
     } else if (obj1.isName("Pattern")) {
-      cs = GfxPatternColorSpace::parse(csObj->getArray(), out, state, recursion);
+      cs = GfxPatternColorSpace::parse(res, csObj->getArray(), out, state, recursion);
     } else {
       error(errSyntaxWarning, -1, "Bad color space");
     }
@@ -335,11 +402,44 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
   } else if (csObj->isDict()) {
     csObj->dictLookup("ColorSpace", &obj1);
     if (obj1.isName("DeviceGray")) {
-      cs = new GfxDeviceGrayColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultGray", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceGrayColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceGrayColorSpace();
+      }
     } else if (obj1.isName("DeviceRGB")) {
-      cs = new GfxDeviceRGBColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultRGB", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceRGBColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceRGBColorSpace();
+      }
     } else if (obj1.isName("DeviceCMYK")) {
-      cs = new GfxDeviceCMYKColorSpace();
+      if (res != NULL) {
+        Object objCS;
+        res->lookupColorSpace("DefaultCMYK", &objCS);
+        if (objCS.isNull()) {
+          cs = new GfxDeviceCMYKColorSpace();
+        } else {
+          cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+        }
+        objCS.free();
+      } else {
+        cs = new GfxDeviceCMYKColorSpace();
+      }
     } else {
       error(errSyntaxWarning, -1, "Bad color space dict'");
     }
@@ -452,7 +552,7 @@ int GfxColorSpace::setupColorProfiles()
 	  INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
       error(errSyntaxWarning, -1, "Can't create Lab transform");
     } else {
-      XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
+      XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, PT_XYZ, displayPixelType);
     }
     cmsCloseProfile(XYZProfile);
   }
@@ -1871,7 +1971,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
     nCompsA = 4;
   }
   if (dict->lookup("Alternate", &obj2)->isNull() ||
-      !(altA = GfxColorSpace::parse(&obj2, out, state, recursion + 1))) {
+      !(altA = GfxColorSpace::parse(NULL, &obj2, out, state, recursion + 1))) {
     switch (nCompsA) {
     case 1:
       altA = new GfxDeviceGrayColorSpace();
@@ -1950,7 +2050,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
       error(errSyntaxWarning, -1, "Can't create transform");
       cs->transform = NULL;
     } else {
-      cs->transform = new GfxColorTransform(transform, cmsIntent, dcst);
+      cs->transform = new GfxColorTransform(transform, cmsIntent, cst, dcst);
     }
     if (dcst == PT_RGB || dcst == PT_CMYK) {
        // create line transform only when the display is RGB type color space 
@@ -1960,7 +2060,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
 	error(errSyntaxWarning, -1, "Can't create transform");
 	cs->lineTransform = NULL;
       } else {
-	cs->lineTransform = new GfxColorTransform(transform, cmsIntent, dcst);
+	cs->lineTransform = new GfxColorTransform(transform, cmsIntent, cst, dcst);
       }
     }
     cmsCloseProfile(hp);
@@ -1982,8 +2082,14 @@ void GfxICCBasedColorSpace::getGray(GfxColor *color, GfxGray *gray) {
     Guchar in[gfxColorMaxComps];
     Guchar out[gfxColorMaxComps];
     
-    for (int i = 0;i < nComps;i++) {
+    if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+      in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+      in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+      in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+    } else {
+      for (int i = 0;i < nComps;i++) {
 	in[i] = colToByte(color->c[i]);
+      }
     }
     if (nComps <= 4) {
       unsigned int key = 0;
@@ -2025,8 +2131,14 @@ void GfxICCBasedColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
     Guchar in[gfxColorMaxComps];
     Guchar out[gfxColorMaxComps];
     
-    for (int i = 0;i < nComps;i++) {
+    if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+      in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+      in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+      in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+    } else {
+      for (int i = 0;i < nComps;i++) {
 	in[i] = colToByte(color->c[i]);
+      }
     }
     if (nComps <= 4) {
       unsigned int key = 0;
@@ -2059,8 +2171,14 @@ void GfxICCBasedColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
     Guchar out[gfxColorMaxComps];
     double c, m, y, k, c1, m1, y1, k1, r, g, b;
 
-    for (int i = 0;i < nComps;i++) {
+    if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+      in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+      in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+      in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+    } else {
+      for (int i = 0;i < nComps;i++) {
 	in[i] = colToByte(color->c[i]);
+      }
     }
     if (nComps <= 4) {
       unsigned int key = 0;
@@ -2271,8 +2389,14 @@ void GfxICCBasedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
     Guchar in[gfxColorMaxComps];
     Guchar out[gfxColorMaxComps];
     
-    for (int i = 0;i < nComps;i++) {
+    if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+      in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+      in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+      in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+    } else {
+      for (int i = 0;i < nComps;i++) {
 	in[i] = colToByte(color->c[i]);
+      }
     }
     if (nComps <= 4) {
       unsigned int key = 0;
@@ -2422,7 +2546,7 @@ GfxColorSpace *GfxIndexedColorSpace::copy() {
   return cs;
 }
 
-GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxIndexedColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
   GfxIndexedColorSpace *cs;
   GfxColorSpace *baseA;
   int indexHighA;
@@ -2435,7 +2559,7 @@ GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, OutputDev *out, GfxState
     goto err1;
   }
   arr->get(1, &obj1);
-  if (!(baseA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+  if (!(baseA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
     error(errSyntaxWarning, -1, "Bad Indexed color space (base color space)");
     goto err2;
   }
@@ -2687,7 +2811,7 @@ GfxColorSpace *GfxSeparationColorSpace::copy() {
 }
 
 //~ handle the 'All' and 'None' colorants
-GfxColorSpace *GfxSeparationColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxSeparationColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
   GfxSeparationColorSpace *cs;
   GooString *nameA;
   GfxColorSpace *altA;
@@ -2705,7 +2829,7 @@ GfxColorSpace *GfxSeparationColorSpace::parse(Array *arr, OutputDev *out, GfxSta
   nameA = new GooString(obj1.getName());
   obj1.free();
   arr->get(2, &obj1);
-  if (!(altA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+  if (!(altA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
     error(errSyntaxWarning, -1, "Bad Separation color space (alternate color space)");
     goto err3;
   }
@@ -2936,7 +3060,7 @@ GfxColorSpace *GfxDeviceNColorSpace::copy() {
 }
 
 //~ handle the 'None' colorant
-GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxDeviceNColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
   GfxDeviceNColorSpace *cs;
   int nCompsA;
   GooString *namesA[gfxColorMaxComps];
@@ -2971,7 +3095,7 @@ GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, GfxState
   }
   obj1.free();
   arr->get(2, &obj1);
-  if (!(altA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+  if (!(altA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
     error(errSyntaxWarning, -1, "Bad DeviceN color space (alternate color space)");
     goto err3;
   }
@@ -2994,7 +3118,7 @@ GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, GfxState
         Object obj3;
         colorants->getVal(i, &obj3);
         if (obj3.isArray()) {
-          separationList->append(GfxSeparationColorSpace::parse(obj3.getArray(), out, state, recursion));
+          separationList->append(GfxSeparationColorSpace::parse(res, obj3.getArray(), out, state, recursion));
         } else {
           obj3.free();
           obj2.free();
@@ -3202,7 +3326,7 @@ GfxColorSpace *GfxPatternColorSpace::copy() {
 				          (GfxColorSpace *)NULL);
 }
 
-GfxColorSpace *GfxPatternColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxPatternColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
   GfxPatternColorSpace *cs;
   GfxColorSpace *underA;
   Object obj1;
@@ -3214,7 +3338,7 @@ GfxColorSpace *GfxPatternColorSpace::parse(Array *arr, OutputDev *out, GfxState
   underA = NULL;
   if (arr->getLength() == 2) {
     arr->get(1, &obj1);
-    if (!(underA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+    if (!(underA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
       error(errSyntaxWarning, -1, "Bad Pattern color space (underlying color space)");
       obj1.free();
       return NULL;
@@ -3259,7 +3383,7 @@ GfxPattern::GfxPattern(int typeA) {
 GfxPattern::~GfxPattern() {
 }
 
-GfxPattern *GfxPattern::parse(Object *obj, OutputDev *out, GfxState *state) {
+GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state) {
   GfxPattern *pattern;
   Object obj1;
 
@@ -3274,7 +3398,7 @@ GfxPattern *GfxPattern::parse(Object *obj, OutputDev *out, GfxState *state) {
   if (obj1.isInt() && obj1.getInt() == 1) {
     pattern = GfxTilingPattern::parse(obj);
   } else if (obj1.isInt() && obj1.getInt() == 2) {
-    pattern = GfxShadingPattern::parse(obj, out, state);
+    pattern = GfxShadingPattern::parse(res, obj, out, state);
   }
   obj1.free();
   return pattern;
@@ -3402,7 +3526,7 @@ GfxPattern *GfxTilingPattern::copy() {
 // GfxShadingPattern
 //------------------------------------------------------------------------
 
-GfxShadingPattern *GfxShadingPattern::parse(Object *patObj, OutputDev *out, GfxState *state) {
+GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state) {
   Dict *dict;
   GfxShading *shadingA;
   double matrixA[6];
@@ -3415,7 +3539,7 @@ GfxShadingPattern *GfxShadingPattern::parse(Object *patObj, OutputDev *out, GfxS
   dict = patObj->getDict();
 
   dict->lookup("Shading", &obj1);
-  shadingA = GfxShading::parse(&obj1, out, state);
+  shadingA = GfxShading::parse(res, &obj1, out, state);
   obj1.free();
   if (!shadingA) {
     return NULL;
@@ -3488,7 +3612,7 @@ GfxShading::~GfxShading() {
   }
 }
 
-GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
+GfxShading *GfxShading::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state) {
   GfxShading *shading;
   Dict *dict;
   int typeA;
@@ -3512,17 +3636,17 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
 
   switch (typeA) {
   case 1:
-    shading = GfxFunctionShading::parse(dict, out, state);
+    shading = GfxFunctionShading::parse(res, dict, out, state);
     break;
   case 2:
-    shading = GfxAxialShading::parse(dict, out, state);
+    shading = GfxAxialShading::parse(res, dict, out, state);
     break;
   case 3:
-    shading = GfxRadialShading::parse(dict, out, state);
+    shading = GfxRadialShading::parse(res, dict, out, state);
     break;
   case 4:
     if (obj->isStream()) {
-      shading = GfxGouraudTriangleShading::parse(4, dict, obj->getStream(), out, state);
+      shading = GfxGouraudTriangleShading::parse(res, 4, dict, obj->getStream(), out, state);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 4 shading object");
       goto err1;
@@ -3530,7 +3654,7 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
     break;
   case 5:
     if (obj->isStream()) {
-      shading = GfxGouraudTriangleShading::parse(5, dict, obj->getStream(), out, state);
+      shading = GfxGouraudTriangleShading::parse(res, 5, dict, obj->getStream(), out, state);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 5 shading object");
       goto err1;
@@ -3538,7 +3662,7 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
     break;
   case 6:
     if (obj->isStream()) {
-      shading = GfxPatchMeshShading::parse(6, dict, obj->getStream(), out, state);
+      shading = GfxPatchMeshShading::parse(res, 6, dict, obj->getStream(), out, state);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 6 shading object");
       goto err1;
@@ -3546,7 +3670,7 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
     break;
   case 7:
     if (obj->isStream()) {
-      shading = GfxPatchMeshShading::parse(7, dict, obj->getStream(), out, state);
+      shading = GfxPatchMeshShading::parse(res, 7, dict, obj->getStream(), out, state);
     } else {
       error(errSyntaxWarning, -1, "Invalid Type 7 shading object");
       goto err1;
@@ -3563,12 +3687,12 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
   return NULL;
 }
 
-GBool GfxShading::init(Dict *dict, OutputDev *out, GfxState *state) {
+GBool GfxShading::init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
   Object obj1, obj2;
   int i;
 
   dict->lookup("ColorSpace", &obj1);
-  if (!(colorSpace = GfxColorSpace::parse(&obj1, out, state))) {
+  if (!(colorSpace = GfxColorSpace::parse(res, &obj1, out, state))) {
     error(errSyntaxWarning, -1, "Bad color space in shading dictionary");
     obj1.free();
     return gFalse;
@@ -3675,7 +3799,7 @@ GfxFunctionShading::~GfxFunctionShading() {
   }
 }
 
-GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, OutputDev *out, GfxState *state) {
+GfxFunctionShading *GfxFunctionShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
   GfxFunctionShading *shading;
   double x0A, y0A, x1A, y1A;
   double matrixA[6];
@@ -3743,7 +3867,7 @@ GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, OutputDev *out, GfxSta
 
   shading = new GfxFunctionShading(x0A, y0A, x1A, y1A, matrixA,
 				   funcsA, nFuncsA);
-  if (!shading->init(dict, out, state)) {
+  if (!shading->init(res, dict, out, state)) {
     delete shading;
     return NULL;
   }
@@ -3994,7 +4118,7 @@ GfxAxialShading::GfxAxialShading(GfxAxialShading *shading):
 GfxAxialShading::~GfxAxialShading() {
 }
 
-GfxAxialShading *GfxAxialShading::parse(Dict *dict, OutputDev *out, GfxState *state) {
+GfxAxialShading *GfxAxialShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
   GfxAxialShading *shading;
   double x0A, y0A, x1A, y1A;
   double t0A, t1A;
@@ -4091,7 +4215,7 @@ GfxAxialShading *GfxAxialShading::parse(Dict *dict, OutputDev *out, GfxState *st
 
   shading = new GfxAxialShading(x0A, y0A, x1A, y1A, t0A, t1A,
 				funcsA, nFuncsA, extend0A, extend1A);
-  if (!shading->init(dict, out, state)) {
+  if (!shading->init(res, dict, out, state)) {
     delete shading;
     return NULL;
   }
@@ -4202,7 +4326,7 @@ GfxRadialShading::GfxRadialShading(GfxRadialShading *shading):
 GfxRadialShading::~GfxRadialShading() {
 }
 
-GfxRadialShading *GfxRadialShading::parse(Dict *dict, OutputDev *out, GfxState *state) {
+GfxRadialShading *GfxRadialShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
   GfxRadialShading *shading;
   double x0A, y0A, r0A, x1A, y1A, r1A;
   double t0A, t1A;
@@ -4281,7 +4405,7 @@ GfxRadialShading *GfxRadialShading::parse(Dict *dict, OutputDev *out, GfxState *
 
   shading = new GfxRadialShading(x0A, y0A, r0A, x1A, y1A, r1A, t0A, t1A,
 				 funcsA, nFuncsA, extend0A, extend1A);
-  if (!shading->init(dict, out, state)) {
+  if (!shading->init(res, dict, out, state)) {
     delete shading;
     return NULL;
   }
@@ -4722,7 +4846,7 @@ GfxGouraudTriangleShading::~GfxGouraudTriangleShading() {
   }
 }
 
-GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(int typeA,
+GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(GfxResources *res, int typeA,
 							    Dict *dict,
 							    Stream *str,
 							    OutputDev *out, GfxState *gfxState) {
@@ -4921,7 +5045,7 @@ GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(int typeA,
   shading = new GfxGouraudTriangleShading(typeA, verticesA, nVerticesA,
 					  trianglesA, nTrianglesA,
 					  funcsA, nFuncsA);
-  if (!shading->init(dict, out, gfxState)) {
+  if (!shading->init(res, dict, out, gfxState)) {
     delete shading;
     return NULL;
   }
@@ -5067,7 +5191,7 @@ GfxPatchMeshShading::~GfxPatchMeshShading() {
   }
 }
 
-GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
+GfxPatchMeshShading *GfxPatchMeshShading::parse(GfxResources *res, int typeA, Dict *dict,
 						Stream *str, OutputDev *out, GfxState *state) {
   GfxPatchMeshShading *shading;
   Function *funcsA[gfxColorMaxComps];
@@ -5592,7 +5716,7 @@ GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
 
   shading = new GfxPatchMeshShading(typeA, patchesA, nPatchesA,
 				    funcsA, nFuncsA);
-  if (!shading->init(dict, out, state)) {
+  if (!shading->init(res, dict, out, state)) {
     delete shading;
     return NULL;
   }
@@ -6668,7 +6792,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
 	  INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
       error(errSyntaxWarning, -1, "Can't create Lab transform");
     } else {
-      XYZ2DisplayTransformRelCol = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, localDisplayPixelType);
+      XYZ2DisplayTransformRelCol = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, PT_XYZ, localDisplayPixelType);
     }
     if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
 	   localDisplayProfile,
@@ -6677,7 +6801,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
 	  INTENT_ABSOLUTE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
       error(errSyntaxWarning, -1, "Can't create Lab transform");
     } else {
-      XYZ2DisplayTransformAbsCol = new GfxColorTransform(transform, INTENT_ABSOLUTE_COLORIMETRIC, localDisplayPixelType);
+      XYZ2DisplayTransformAbsCol = new GfxColorTransform(transform, INTENT_ABSOLUTE_COLORIMETRIC, PT_XYZ, localDisplayPixelType);
     }
     if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
 	   localDisplayProfile,
@@ -6686,7 +6810,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
 	  INTENT_SATURATION,LCMS_FLAGS)) == 0) {
       error(errSyntaxWarning, -1, "Can't create Lab transform");
     } else {
-      XYZ2DisplayTransformSat = new GfxColorTransform(transform, INTENT_SATURATION, localDisplayPixelType);
+      XYZ2DisplayTransformSat = new GfxColorTransform(transform, INTENT_SATURATION, PT_XYZ, localDisplayPixelType);
     }
     if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
 	   localDisplayProfile,
@@ -6695,7 +6819,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
 	  INTENT_PERCEPTUAL,LCMS_FLAGS)) == 0) {
       error(errSyntaxWarning, -1, "Can't create Lab transform");
     } else {
-      XYZ2DisplayTransformPerc = new GfxColorTransform(transform, INTENT_PERCEPTUAL, localDisplayPixelType);
+      XYZ2DisplayTransformPerc = new GfxColorTransform(transform, INTENT_PERCEPTUAL, PT_XYZ, localDisplayPixelType);
     }
     cmsCloseProfile(XYZProfile);
   }
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h
index 106b2c0bf00..f018e93dd34 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h
@@ -20,7 +20,7 @@
 // Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
-// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
@@ -53,6 +53,7 @@ class PopplerCache;
 class GooList;
 class OutputDev;
 class GfxState;
+class GfxResources;
 
 class Matrix {
 public:
@@ -182,9 +183,10 @@ class GfxColorTransform {
 public:
   void doTransform(void *in, void *out, unsigned int size);
   // transformA should be a cmsHTRANSFORM
-  GfxColorTransform(void *transformA, int cmsIntent, unsigned int transformPixelType);
+  GfxColorTransform(void *transformA, int cmsIntent, unsigned int inputPixelType, unsigned int transformPixelType);
   ~GfxColorTransform();
   int getIntent() { return cmsIntent; }
+  int getInputPixelType() { return inputPixelType; }
   int getTransformPixelType() { return transformPixelType; }
   void ref();
   unsigned int unref();
@@ -193,6 +195,7 @@ private:
   void *transform;
   unsigned int refCount;
   int cmsIntent;
+  unsigned int inputPixelType;
   unsigned int transformPixelType;
 };
 
@@ -205,7 +208,7 @@ public:
   virtual GfxColorSpaceMode getMode() = 0;
 
   // Construct a color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Object *csObj, OutputDev *out, GfxState *state, int recursion = 0);
+  static GfxColorSpace *parse(GfxResources *res, Object *csObj, OutputDev *out, GfxState *state, int recursion = 0);
 
   // Convert to gray, RGB, or CMYK.
   virtual void getGray(GfxColor *color, GfxGray *gray) = 0;
@@ -578,7 +581,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csIndexed; }
 
   // Construct an Indexed color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+  static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -631,7 +634,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csSeparation; }
 
   // Construct a Separation color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+  static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -676,7 +679,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csDeviceN; }
 
   // Construct a DeviceN color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+  static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -723,7 +726,7 @@ public:
   virtual GfxColorSpaceMode getMode() { return csPattern; }
 
   // Construct a Pattern color space.  Returns NULL if unsuccessful.
-  static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+  static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
 
   virtual void getGray(GfxColor *color, GfxGray *gray);
   virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -752,7 +755,7 @@ public:
   GfxPattern(int typeA);
   virtual ~GfxPattern();
 
-  static GfxPattern *parse(Object *obj, OutputDev *out, GfxState *state);
+  static GfxPattern *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state);
 
   virtual GfxPattern *copy() = 0;
 
@@ -808,7 +811,7 @@ private:
 class GfxShadingPattern: public GfxPattern {
 public:
 
-  static GfxShadingPattern *parse(Object *patObj, OutputDev *out, GfxState *state);
+  static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state);
   virtual ~GfxShadingPattern();
 
   virtual GfxPattern *copy();
@@ -835,7 +838,7 @@ public:
   GfxShading(GfxShading *shading);
   virtual ~GfxShading();
 
-  static GfxShading *parse(Object *obj, OutputDev *out, GfxState *state);
+  static GfxShading *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state);
 
   virtual GfxShading *copy() = 0;
 
@@ -849,7 +852,7 @@ public:
 
 protected:
 
-  GBool init(Dict *dict, OutputDev *out, GfxState *state);
+  GBool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
 
   int type;
   GfxColorSpace *colorSpace;
@@ -918,7 +921,7 @@ public:
   GfxFunctionShading(GfxFunctionShading *shading);
   virtual ~GfxFunctionShading();
 
-  static GfxFunctionShading *parse(Dict *dict, OutputDev *out, GfxState *state);
+  static GfxFunctionShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
 
   virtual GfxShading *copy();
 
@@ -952,7 +955,7 @@ public:
   GfxAxialShading(GfxAxialShading *shading);
   virtual ~GfxAxialShading();
 
-  static GfxAxialShading *parse(Dict *dict, OutputDev *out, GfxState *state);
+  static GfxAxialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
 
   virtual GfxShading *copy();
 
@@ -985,7 +988,7 @@ public:
   GfxRadialShading(GfxRadialShading *shading);
   virtual ~GfxRadialShading();
 
-  static GfxRadialShading *parse(Dict *dict, OutputDev *out, GfxState *state);
+  static GfxRadialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
 
   virtual GfxShading *copy();
 
@@ -1023,7 +1026,7 @@ public:
   GfxGouraudTriangleShading(GfxGouraudTriangleShading *shading);
   virtual ~GfxGouraudTriangleShading();
 
-  static GfxGouraudTriangleShading *parse(int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
+  static GfxGouraudTriangleShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
 
   virtual GfxShading *copy();
 
@@ -1109,7 +1112,7 @@ public:
   GfxPatchMeshShading(GfxPatchMeshShading *shading);
   virtual ~GfxPatchMeshShading();
 
-  static GfxPatchMeshShading *parse(int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
+  static GfxPatchMeshShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
 
   virtual GfxShading *copy();
 
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc
index 3d88646f7b3..3d88646f7b3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h
index c33a8024c04..c33a8024c04 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc
index 0695dc5da0e..0695dc5da0e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h
index 0ee2518575c..0ee2518575c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
index 703d471c99a..703d471c99a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h
index 3feccbef06d..3feccbef06d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
index 54f2197d739..01fe01e585d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD =				\
 	$(win32_libs)
 
 libpoppler_la_LDFLAGS =				\
-	-version-info 47:0:0			\
+	-version-info 48:0:0			\
 	@create_shared_lib@			\
 	@auto_import_flags@
 
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
index 04237fc3d39..ec8d3df18d8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
@@ -707,7 +707,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
     annotsObj.free();
   }
   yRef->markUnencrypted();
-  Guint objectsCount = writePageObjects(outStr, yRef, 0);
+  writePageObjects(outStr, yRef, 0);
 
   yRef->add(rootNum,0,outStr->getPos(),gTrue);
   outStr->printf("%d 0 obj\n", rootNum);
@@ -728,7 +728,6 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
   catObj.free();
   pagesObj.free();
   outStr->printf(">>\nendobj\n");
-  objectsCount++;
 
   yRef->add(rootNum + 1,0,outStr->getPos(),gTrue);
   outStr->printf("%d 0 obj\n", rootNum + 1);
@@ -740,7 +739,6 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
   }
   outStr->printf(">>\n");
   outStr->printf("endobj\n");
-  objectsCount++;
 
   yRef->add(rootNum + 2,0,outStr->getPos(),gTrue);
   outStr->printf("%d 0 obj\n", rootNum + 2);
@@ -758,14 +756,13 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
     value.free();
   }
   outStr->printf(" >>\nendobj\n");
-  objectsCount++;
   page.free();
 
   Goffset uxrefOffset = outStr->getPos();
   Ref ref;
   ref.num = rootNum;
   ref.gen = 0;
-  Dict *trailerDict = createTrailerDict(objectsCount, gFalse, 0, &ref, getXRef(),
+  Dict *trailerDict = createTrailerDict(rootNum + 3, gFalse, 0, &ref, getXRef(),
                                         name->getCString(), uxrefOffset);
   writeXRefTableTrailer(trailerDict, yRef, gFalse /* do not write unnecessary entries */,
                         uxrefOffset, outStr, getXRef());
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc
index 149bb620df2..149bb620df2 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h
index f30204deeb5..f30204deeb5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.cc
index ecdff32f693..98c13c14ff8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.cc
@@ -25,7 +25,7 @@
 // Copyright (C) 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
-// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013, 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 //
@@ -672,7 +672,7 @@ GBool Page::loadThumb(unsigned char **data_out,
     obj1.free ();
     dict->lookup ("CS", &obj1);
   }
-  colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+  colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
   obj1.free();
   if (!colorSpace) {
     fprintf (stderr, "Error: Cannot parse color space\n");
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc
index d6f55995b1c..d6f55995b1c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc
index 0eaeb79f989..bfb07eb7315 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc
@@ -33,6 +33,7 @@
 // Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
 // Copyright (C) 2013 Li Junling <lijunling@sina.com>
 // Copyright (C) 2014 Ed Porras <ed@moto-research.com>
+// Copyright (C) 2014 Richard PALO <richard@netbsd.org>
 //
 // 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
@@ -85,8 +86,10 @@ extern "C" int unlink(char *filename);
 
 #ifdef __sun
 #include <ieeefp.h>
+#ifndef isfinite
 #define isfinite(x) finite(x)
 #endif
+#endif
 
 static inline void convertGfxColor(SplashColorPtr dest,
                                    SplashColorMode colorMode,
@@ -450,22 +453,26 @@ static void splashOutBlendMultiply(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = (rgbDest[i] * rgbSrc[i]) / 255;
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
       blend[i] = (dest[i] * src[i]) / 255;
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendScreen(SplashColorPtr src, SplashColorPtr dest,
@@ -474,22 +481,26 @@ static void splashOutBlendScreen(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = rgbDest[i] + rgbSrc[i] - (rgbDest[i] * rgbSrc[i]) / 255;
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
       blend[i] = dest[i] + src[i] - (dest[i] * src[i]) / 255;
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest,
@@ -498,18 +509,11 @@ static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = rgbDest[i] < 0x80
-                      ? (rgbSrc[i] * 2 * rgbDest[i]) / 255
-                      : 255 - 2 * ((255 - rgbSrc[i]) * (255 - rgbDest[i])) / 255;
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -518,6 +522,15 @@ static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest,
                    : 255 - 2 * ((255 - src[i]) * (255 - dest[i])) / 255;
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendDarken(SplashColorPtr src, SplashColorPtr dest,
@@ -526,22 +539,26 @@ static void splashOutBlendDarken(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = rgbDest[i] < rgbSrc[i] ? rgbDest[i] : rgbSrc[i];
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
       blend[i] = dest[i] < src[i] ? dest[i] : src[i];
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendLighten(SplashColorPtr src, SplashColorPtr dest,
@@ -550,22 +567,26 @@ static void splashOutBlendLighten(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = rgbDest[i] > rgbSrc[i] ? rgbDest[i] : rgbSrc[i];
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
       blend[i] = dest[i] > src[i] ? dest[i] : src[i];
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest,
@@ -575,21 +596,11 @@ static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      if (rgbSrc[i] == 255) {
-        rgbBlend[i] = 255;
-      } else {
-        x = (rgbDest[i] * 255) / (255 - rgbSrc[i]);
-        rgbBlend[i] = x <= 255 ? x : 255;
-      }
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -601,6 +612,15 @@ static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest,
       }
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest,
@@ -609,21 +629,11 @@ static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      if (rgbSrc[i] == 0) {
-        rgbBlend[i] = 0;
-      } else {
-        x = ((255 - rgbDest[i]) * 255) / rgbSrc[i];
-        rgbBlend[i] = x <= 255 ? 255 - x : 0;
-      }
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -635,6 +645,15 @@ static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest,
       }
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest,
@@ -643,18 +662,11 @@ static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = rgbSrc[i] < 0x80
-                      ? (rgbDest[i] * 2 * rgbSrc[i]) / 255
-                      : 255 - 2 * ((255 - rgbDest[i]) * (255 - rgbSrc[i])) / 255;
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -663,6 +675,15 @@ static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest,
                    : 255 - 2 * ((255 - dest[i]) * (255 - src[i])) / 255;
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest,
@@ -671,25 +692,11 @@ static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      if (rgbSrc[i] < 0x80) {
-        rgbBlend[i] = rgbDest[i] - (255 - 2 * rgbSrc[i]) * rgbDest[i] * (255 - rgbDest[i]) / (255 * 255);
-      } else {
-        if (rgbDest[i] < 0x40) {
-          x = (((((16 * rgbDest[i] - 12 * 255) * rgbDest[i]) / 255) + 4 * 255) * rgbDest[i]) / 255;
-        } else {
-          x = (int)sqrt(255.0 * rgbDest[i]);
-        }
-        rgbBlend[i] = rgbDest[i] + (2 * rgbSrc[i] - 255) * (x - rgbDest[i]) / 255;
-      }
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -705,6 +712,15 @@ static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest,
       }
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+#endif
 }
 
 static void splashOutBlendDifference(SplashColorPtr src, SplashColorPtr dest,
@@ -714,22 +730,32 @@ static void splashOutBlendDifference(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = rgbDest[i] < rgbSrc[i] ? rgbSrc[i] - rgbDest[i] : rgbDest[i] - rgbSrc[i];
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
       blend[i] = dest[i] < src[i] ? src[i] - dest[i] : dest[i] - src[i];
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+  if (cm == splashModeDeviceN8) {
+    for (i = 4; i < splashColorModeNComps[cm]; ++i) {
+      if (dest[i] == 0 && src[i] == 0)
+        blend[i] = 0;
+    }
+  }
+#endif
 }
 
 static void splashOutBlendExclusion(SplashColorPtr src, SplashColorPtr dest,
@@ -738,22 +764,32 @@ static void splashOutBlendExclusion(SplashColorPtr src, SplashColorPtr dest,
 
 #if SPLASH_CMYK
   if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
-    SplashColor rgbSrc;
-    SplashColor rgbDest;
-    SplashColor rgbBlend;
-    cmykToRGB(src, rgbSrc);
-    cmykToRGB(dest, rgbDest);
-    for (i = 0; i < 3; ++i) {
-      rgbBlend[i] = rgbDest[i] + rgbSrc[i] - (2 * rgbDest[i] * rgbSrc[i]) / 255;
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
     }
-    rgbToCMYK(rgbBlend, blend);
-  } else
+  }
 #endif
   {
     for (i = 0; i < splashColorModeNComps[cm]; ++i) {
       blend[i] = dest[i] + src[i] - (2 * dest[i] * src[i]) / 255;
     }
   }
+#if SPLASH_CMYK
+  if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+    for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+      dest[i] = 255 - dest[i];
+      src[i] = 255 - src[i];
+      blend[i] = 255 - blend[i];
+    }
+  }
+  if (cm == splashModeDeviceN8) {
+    for (i = 4; i < splashColorModeNComps[cm]; ++i) {
+      if (dest[i] == 0 && src[i] == 0)
+        blend[i] = 0;
+    }
+  }
+#endif
 }
 
 static int getLum(int r, int g, int b) {
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h
index efbb865c45b..efbb865c45b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.cc
index 4c00ddb0d5d..4c00ddb0d5d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc
index b1aaca8a58b..b1aaca8a58b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc
index 4b7ff406c3e..4b7ff406c3e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h
index 23fb3b726a9..23fb3b726a9 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake
index d7918bc4e5d..d7918bc4e5d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in
index a7d2efeb96d..a7d2efeb96d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.28.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.29.0/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.cc
index fde272acbab..fde272acbab 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc
index ac344f17c35..ac344f17c35 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 0cabf88176c..27dab4080f0 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.28.0])
+m4_define([poppler_version], [0.29.0])
author	Peter Breitenlohner <peb@mppmu.mpg.de>	2014-12-05 09:04:57 +0000
committer	Peter Breitenlohner <peb@mppmu.mpg.de>	2014-12-05 09:04:57 +0000
commit	cf7e21cca95784d0744759e2a05f2700fe45778d (patch)
tree	17ba2512f5bad060985a878aea765b3f464d62c1 /Build/source/libs
parent	cf4b7e8c43521a9301aaf1cd3f745eef8c0399d6 (diff)