297 files changed, 632 insertions, 514 deletions

diff --git a/Build/source/libs/README b/Build/source/libs/README
index 10e6094eeb8..c7693f1cae1 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.30.0 - checked 7jan15
+poppler 0.31.0 - checked 6feb15
   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 cc2a804da49..03b510eea0d 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.31.0.
+	* version.ac: Adjust.
+
 2015-01-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import poppler-0.30.0.
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 059a93b93bc..8b90b0d22e1 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -275,7 +275,7 @@ am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing \
-	$(top_srcdir)/poppler-0.30.0/poppler/poppler-config.h.in \
+	$(top_srcdir)/poppler-0.31.0/poppler/poppler-config.h.in \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
 	../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -590,7 +590,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.30.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.31.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 12f413b1e73..ef7af89c8ac 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.30.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.31.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.30.0'
-PACKAGE_STRING='poppler (TeX Live) 0.30.0'
+PACKAGE_VERSION='0.31.0'
+PACKAGE_STRING='poppler (TeX Live) 0.31.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.30.0/poppler/Array.cc"
+ac_unique_file="poppler-0.31.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.30.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.31.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.30.0:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.31.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.30.0
+poppler (TeX Live) configure 0.31.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.30.0, which was
+It was created by poppler (TeX Live) $as_me 0.31.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.30.0'
+ VERSION='0.31.0'
 
 
 # Some tools Automake needs.
@@ -6573,12 +6573,12 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.30.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.31.0/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.30.0"
+#define POPPLER_VERSION "0.31.0"
 _ACEOF
 
 
@@ -6712,7 +6712,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.30.0
+POPPLER_TREE=poppler-0.31.0
 
 
 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7272,7 +7272,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.30.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.31.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7338,7 +7338,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-poppler (TeX Live) config.status 0.30.0
+poppler (TeX Live) config.status 0.31.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7469,7 +7469,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.30.0/poppler/poppler-config.h.in" ;;
+    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.31.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.30.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.31.0-PATCHES/ChangeLog
index 9e1c0a10620..be5c2293384 100644
--- a/Build/source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.31.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.31.0 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-02-LLONG_MAX: Adapted.
+
 2015-01-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.30.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.31.0-PATCHES/TL-Changes
index bf53ad987ab..f217d26c65c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.31.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.30.0 tree as obtained from:
+Changes applied to the poppler-0.31.0 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.31.0-PATCHES/patch-02-LLONG_MAX
index 89a45ee3774..875b60c9c6e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.31.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.30.0.orig/goo/GooString.h poppler-0.30.0/goo/GooString.h
---- poppler-0.30.0.orig/goo/GooString.h	2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.30.0/goo/GooString.h	2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.31.0.orig/goo/GooString.h poppler-0.31.0/goo/GooString.h
+--- poppler-0.31.0.orig/goo/GooString.h	2014-10-07 22:41:15.000000000 +0200
++++ poppler-0.31.0/goo/GooString.h	2014-11-04 10:20:40.567904859 +0100
 @@ -34,6 +34,21 @@
  #endif
  
diff --git a/Build/source/libs/poppler/poppler-0.30.0/AUTHORS b/Build/source/libs/poppler/poppler-0.31.0/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.31.0/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.30.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.31.0/CMakeLists.txt
index 5ed0b4490db..7d34c695314 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.31.0/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckFileOffsetBits)
 CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "30")
+set(POPPLER_MINOR_VERSION "31")
 set(POPPLER_MICRO_VERSION "0")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
@@ -469,7 +469,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 49.0.0 SOVERSION 49)
+set_target_properties(poppler PROPERTIES VERSION 50.0.0 SOVERSION 50)
 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.30.0/COPYING b/Build/source/libs/poppler/poppler-0.31.0/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.31.0/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.30.0/ChangeLog b/Build/source/libs/poppler/poppler-0.31.0/ChangeLog
index cccf0001f42..6a35bf978c0 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.31.0/ChangeLog
@@ -1,3 +1,215 @@
+commit f932315e559a7857d9c5642eb04efc0d2b717789
+Author: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+Date:   Tue Jan 20 22:05:29 2015 +1030
+
+    cairo: support embedding JBIG2 image data
+
+    http://lists.freedesktop.org/archives/poppler/2014-December/011183.html
+
+ poppler/CairoOutputDev.cc | 117
+ ++++++++++++++++++++++++++++++++++++++--------
+ poppler/CairoOutputDev.h  |   3 ++
+ poppler/JBIG2Stream.cc    |   9 +++-
+ poppler/JBIG2Stream.h     |   4 +-
+ poppler/Stream.cc         |  13 +++++-
+ 5 files changed, 121 insertions(+), 25 deletions(-)
+
+commit 78abf540057181b708c546aee421f81a1dd58331
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:   Wed Jan 21 22:30:45 2015 +0100
+
+    Worlds -> Words
+
+ qt4/src/poppler-page.cc    | 4 ++--
+ qt4/src/poppler-qt4.h      | 2 +-
+ qt4/tests/check_search.cpp | 4 ++--
+ qt5/src/poppler-page.cc    | 4 ++--
+ qt5/src/poppler-qt5.h      | 2 +-
+ qt5/tests/check_search.cpp | 4 ++--
+ 6 files changed, 10 insertions(+), 10 deletions(-)
+
+commit 027eac4e565576ca2e7042e21426e28abd775d98
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:   Tue Jan 20 00:09:09 2015 +0100
+
+    Expose whole-words search option in Qt frontends
+
+ qt4/src/poppler-page-private.h |   5 +-
+ qt4/src/poppler-page.cc        | 114
+ +++++++++++++++++++++++++------------
+ qt4/src/poppler-qt4.h          |  44 +++++++++++++-
+ qt4/tests/check_search.cpp     | 112 +++++++++++++++++++++++++++++++-----
+ qt5/src/poppler-page-private.h |   5 +-
+ qt5/src/poppler-page.cc        | 116
+ +++++++++++++++++++++++++------------
+ qt5/src/poppler-qt5.h          |  46 +++++++++++++--
+ qt5/tests/check_search.cpp     | 126
+ +++++++++++++++++++++++++++++++++--------
+ 8 files changed, 447 insertions(+), 121 deletions(-)
+
+commit 30a0baa353c374165e5f411efc4203746f14a74d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jan 18 15:39:53 2015 +0100
+
+    Move more variables from GlobalParams to PSOutputDev
+
+ poppler/CairoFontEngine.cc |   4 +-
+ poppler/GfxFont.cc         |  15 ++---
+ poppler/GfxFont.h          |   7 ++-
+ poppler/GlobalParams.cc    | 144
+ ---------------------------------------------
+ poppler/GlobalParams.h     |  28 ---------
+ poppler/PSOutputDev.cc     | 121 +++++++++++++++++++------------------
+ poppler/PSOutputDev.h      |  30 +++++++++-
+ poppler/SplashOutputDev.cc |   2 +-
+ qt4/src/ArthurOutputDev.cc |   4 +-
+ qt5/src/ArthurOutputDev.cc |   4 +-
+ utils/pdftops.cc           |  36 ++++--------
+ 11 files changed, 116 insertions(+), 279 deletions(-)
+
+commit 8fed995c3457d64669ae12901450b7c811599dba
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jan 18 14:52:53 2015 +0100
+
+    Forgot to delete this in the previous commit
+
+ poppler/GlobalParams.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 4992ff7fa062462507733494827fdad7eaaa95b3
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jan 18 13:57:36 2015 +0100
+
+    Move raster mono and resolution from GlobalParams to PSOutputDev
+
+ poppler/GlobalParams.cc | 32 --------------------------------
+ poppler/GlobalParams.h  |  7 -------
+ poppler/PSOutputDev.cc  | 18 +++++++-----------
+ poppler/PSOutputDev.h   |  6 ++++++
+ utils/pdftops.cc        |  7 ++++---
+ 5 files changed, 17 insertions(+), 53 deletions(-)
+
+commit 54908f675eda96c363528198e8c530921df2f45a
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jan 18 13:34:45 2015 +0100
+
+    Move psUncompressPreloadedImages from GlobalParams to PSOutputDev
+
+    It belongs there and PSOutputDev is always created by the external
+    user
+    so in case someone wants to set it, it is the same amount of work
+    to set it in GlobalParams than in PSOutputDev
+
+ poppler/GlobalParams.cc | 16 ----------------
+ poppler/GlobalParams.h  |  3 ---
+ poppler/PSOutputDev.cc  |  9 +++++----
+ poppler/PSOutputDev.h   |  2 ++
+ 4 files changed, 7 insertions(+), 23 deletions(-)
+
+commit 136d7aa5e79f153dfcb216c58598e33a8ff16630
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jan 18 13:28:26 2015 +0100
+
+    Remove declared but not defined function
+
+ poppler/GlobalParams.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit fdba9154d9a176759c765180805e608d4959c34e
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:   Fri Jan 16 19:57:59 2015 +0100
+
+    pdftoppm: parse the flags earlier and only once
+
+ utils/pdftoppm.cc | 42 +++++++++++++++---------------------------
+ 1 file changed, 15 insertions(+), 27 deletions(-)
+
+commit 6b072500b5ac936631be6b29b7d5a591848a18f3
+Author: William Bader <williambader@hotmail.com>
+Date:   Wed Jan 14 23:28:03 2015 +0100
+
+    Add rasterization option to pdftops
+
+    Also removes GlobalParams stuff \o/
+
+    Coded in conjuntion with Albert
+
+    Bug #85934
+
+ cpp/poppler-page-renderer.cpp |  5 ++--
+ poppler/GlobalParams.cc       | 58
+ ++-----------------------------------------
+ poppler/GlobalParams.h        | 16 +++---------
+ poppler/PSOutputDev.cc        | 14 +++++------
+ poppler/PSOutputDev.h         |  5 +++-
+ poppler/SplashOutputDev.cc    | 19 ++++++--------
+ poppler/SplashOutputDev.h     | 11 +++++---
+ qt4/src/poppler-page.cc       |  7 +++---
+ qt5/src/poppler-page.cc       |  7 +++---
+ utils/pdftohtml.cc            |  9 +++----
+ utils/pdftoppm.cc             | 49 ++++++++++++++++++++++++++----------
+ utils/pdftops.cc              | 14 ++++++++++-
+ 12 files changed, 96 insertions(+), 118 deletions(-)
+
+commit dc9751e6ac47a708ba6e7a68560bdce6a2e4a010
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Jan 9 15:50:02 2015 +0100
+
+    Compile++
+
+ poppler/GfxState.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d91876a0c7a936b1f6f461d80131d7586a6c1a5e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Jan 8 20:13:06 2015 +0100
+
+    Accept malformed documents whose root is a Page instead of a Pages
+
+    gs and Adobe Reader do it so it's "common" enough
+
+    Bug #88172
+
+ poppler/Catalog.cc | 37 ++++++++++++++++++++++++++++++++-----
+ 1 file changed, 32 insertions(+), 5 deletions(-)
+
+commit 7ce86b9be058408eb567d8d0b9747853a66c116f
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Jan 8 17:35:28 2015 +0100
+
+    Remove assert in gouraudFillTriangle
+
+    We don't *need* the assert, an error() is fine and the malformed
+    document
+    will just get rendered wrongly instead of "crashing"
+
+    Bugs #85274
+
+ poppler/Gfx.cc | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+commit 9e9df4b20d17478996780008bc9802a857d173fc
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Jan 8 17:01:52 2015 +0100
+
+    Fix crash on broken document
+
+    Bug #85281
+
+ poppler/GfxState.cc | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+commit 636faafcb84b856580398f7883b6406d645c85d1
+Author: Adam Reichold <adamreichold@myopera.com>
+Date:   Tue Jan 6 22:57:20 2015 +0100
+
+    JPEG2000Stream: Inline doGetChar and doLookChar
+
+ poppler/JPEG2000Stream.cc | 49
+ +++++++++++++++++++++++++----------------------
+ poppler/JPEG2000Stream.h  |  7 ++-----
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
 commit c13bffe92963c4969037695992f4c2776bbe973f
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Sun Jan 4 23:17:42 2015 +0100
diff --git a/Build/source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.31.0/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/INSTALL b/Build/source/libs/poppler/poppler-0.31.0/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.31.0/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.30.0/Makefile.am b/Build/source/libs/poppler/poppler-0.31.0/Makefile.am
index 691512f4e3a..691512f4e3a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.31.0/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.30.0/NEWS b/Build/source/libs/poppler/poppler-0.31.0/NEWS
index 2ff8e1797bc..00dbc2539a4 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.31.0/NEWS
@@ -1,3 +1,20 @@
+Release 0.31.0
+        core:
+         * CairoOutputDev: support embedding JBIG2 image data
+         * Accept malformed documents whose root is a Page instead of a Pages. Bug #88172
+         * Fix crash on broken documents
+         * JPEG2000Stream: Inline doGetChar and doLookChar
+         * GlobalParams cleaning
+        
+        utils:
+         * pdftops: Add rasterization option. Bug #85934
+        
+        qt4:
+         * Expose whole-words search option
+
+        qt5:
+         * Expose whole-words search option
+
 Release 0.30.0
         core:
          * Openjpeg2 support (openjpeg 1 is preferred). Bug #58906
diff --git a/Build/source/libs/poppler/poppler-0.30.0/README b/Build/source/libs/poppler/poppler-0.31.0/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/README
+++ b/Build/source/libs/poppler/poppler-0.31.0/README
diff --git a/Build/source/libs/poppler/poppler-0.30.0/README-XPDF b/Build/source/libs/poppler/poppler-0.31.0/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.31.0/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.30.0/TODO b/Build/source/libs/poppler/poppler-0.31.0/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.31.0/TODO
diff --git a/Build/source/libs/poppler/poppler-0.30.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.31.0/config.h.cmake
index 8ed1c92248e..8ed1c92248e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/config.h.in b/Build/source/libs/poppler/poppler-0.31.0/config.h.in
index c47d66d3e52..c47d66d3e52 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/configure.ac b/Build/source/libs/poppler/poppler-0.31.0/configure.ac
index b6429cf8ba1..3f43c0eb705 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.31.0/configure.ac
@@ -1,5 +1,5 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[30])
+m4_define([poppler_version_minor],[31])
 m4_define([poppler_version_micro],[0])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.cc
index 4759186edfe..4759186edfe 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.cc
index 827ebc7d7c3..827ebc7d7c3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.31.0/fofi/Makefile.am
index 4deb7d5e063..4deb7d5e063 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.31.0/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.31.0/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.31.0/goo/GooMutex.h
index b2714b048c7..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.cc
index 8591d95cd3e..8591d95cd3e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.h
index 0176d873646..0176d873646 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.h
index ac64f6b4868..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.31.0/goo/Makefile.am
index 370e85021be..370e85021be 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.cc
index 3528bb357d8..3528bb357d8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.h
index 1365a9cf2ab..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.h b/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.31.0/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.31.0/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.cc
index d35cb9b2697..d35cb9b2697 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.h
index 8fde6a6736b..8fde6a6736b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.cc
index 4cf8d6b41af..a5a3023208a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.cc
@@ -17,7 +17,7 @@
 // Copyright (C) 2005-2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
-// Copyright (C) 2005, 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009, 2012, 2013, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
@@ -417,7 +417,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
   ref = *gfxFont->getID();
   fontType = gfxFont->getType();
 
-  if (!(fontLoc = gfxFont->locateFont(xref, gFalse))) {
+  if (!(fontLoc = gfxFont->locateFont(xref, NULL))) {
     error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
     	gfxFont->getName() ? gfxFont->getName()->getCString()
 	                       : "(unnamed)");
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.cc
index 4e8abcfd94d..a86ec120f20 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.cc
@@ -28,6 +28,7 @@
 // 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>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 //
 // 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
@@ -63,6 +64,7 @@
 #include "CairoFontEngine.h"
 #include "CairoRescaleBox.h"
 #include "UnicodeMap.h"
+#include "JBIG2Stream.h"
 //------------------------------------------------------------------------
 
 // #define LOG_CAIRO
@@ -2701,6 +2703,68 @@ static GBool colorMapHasIdentityDecodeMap(GfxImageColorMap *colorMap)
   return gTrue;
 }
 
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+static cairo_status_t setMimeIdFromRef(cairo_surface_t *surface,
+				       const char *mime_type,
+				       const char *mime_id_prefix,
+				       Ref ref)
+{
+  GooString *mime_id;
+  char *idBuffer;
+  cairo_status_t status;
+
+  mime_id = new GooString;
+
+  if (mime_id_prefix)
+    mime_id->append(mime_id_prefix);
+
+  mime_id->appendf("{0:d}-{1:d}", ref.gen, ref.num);
+
+  idBuffer = copyString(mime_id->getCString());
+  status = cairo_surface_set_mime_data (surface, mime_type,
+                                        (const unsigned char *)idBuffer,
+                                        mime_id->getLength(),
+                                        gfree, idBuffer);
+  delete mime_id;
+  if (status)
+    gfree (idBuffer);
+  return status;
+}
+#endif
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+GBool CairoOutputDev::setMimeDataForJBIG2Globals(Stream  *str,
+                                                 cairo_surface_t *image)
+{
+  JBIG2Stream *jb2Str = static_cast<JBIG2Stream *>(str);
+  Object* globalsStr = jb2Str->getGlobalsStream();
+  char *globalsBuffer;
+  int globalsLength;
+
+  // nothing to do for JBIG2 stream without Globals
+  if (!globalsStr->isStream())
+    return gTrue;
+
+  if (setMimeIdFromRef(image, CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID, NULL,
+                       jb2Str->getGlobalsStreamRef()))
+    return gFalse;
+
+  if (!getStreamData(globalsStr->getStream(), &globalsBuffer, &globalsLength))
+    return gFalse;
+
+  if (cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_JBIG2_GLOBAL,
+                                   (const unsigned char*)globalsBuffer,
+                                   globalsLength,
+                                   gfree, (void*)globalsBuffer))
+  {
+    gfree (globalsBuffer);
+    return gFalse;
+  }
+
+  return gTrue;
+}
+#endif
+
 void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
 				 GfxImageColorMap *colorMap, cairo_surface_t *image)
 {
@@ -2708,17 +2772,35 @@ void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
   int len;
   Object obj;
   GfxColorSpace *colorSpace;
+  StreamKind  strKind = str->getKind();
+  const char *mime_type;
 
-  if (!printing || !(str->getKind() == strDCT || str->getKind() == strJPX))
+  if (!printing)
     return;
 
+  switch (strKind) {
+    case strDCT:
+      mime_type = CAIRO_MIME_TYPE_JPEG;
+      break;
+    case strJPX:
+      mime_type = CAIRO_MIME_TYPE_JP2;
+      break;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+    case strJBIG2:
+      mime_type = CAIRO_MIME_TYPE_JBIG2;
+      break;
+#endif
+    default:
+      return;
+  }
+
   str->getDict()->lookup("ColorSpace", &obj);
   colorSpace = GfxColorSpace::parse(NULL, &obj, this, state);
   obj.free();
 
   // colorspace in stream dict may be different from colorspace in jpx
   // data
-  if (str->getKind() == strJPX && colorSpace)
+  if (strKind == strJPX && colorSpace)
     return;
 
   // only embed mime data for gray, rgb, and cmyk colorspaces.
@@ -2746,31 +2828,27 @@ void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
   if (!colorMapHasIdentityDecodeMap(colorMap))
     return;
 
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+  if (strKind == strJBIG2 && !setMimeDataForJBIG2Globals(str, image))
+    return;
+#endif
+
   if (getStreamData (str->getNextStream(), &strBuffer, &len)) {
-    cairo_status_t st;
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
     if (ref && ref->isRef()) {
-      Ref imgRef = ref->getRef();
-      GooString *surfaceId = new GooString("poppler-surface-");
-      surfaceId->appendf("{0:d}-{1:d}", imgRef.gen, imgRef.num);
-      char *idBuffer = copyString(surfaceId->getCString());
-      st = cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_UNIQUE_ID,
-                                        (const unsigned char *)idBuffer,
-                                        surfaceId->getLength(),
-                                        gfree, idBuffer);
-      if (st)
-        gfree(idBuffer);
-      delete surfaceId;
+      status = setMimeIdFromRef(image, CAIRO_MIME_TYPE_UNIQUE_ID,
+                                "poppler-surface-", ref->getRef());
     }
 #endif
+    if (!status) {
+      status = cairo_surface_set_mime_data (image, mime_type,
+					    (const unsigned char *)strBuffer, len,
+					    gfree, strBuffer);
+    }
 
-    st = cairo_surface_set_mime_data (image,
-				      str->getKind() == strDCT ?
-				      CAIRO_MIME_TYPE_JPEG : CAIRO_MIME_TYPE_JP2,
-				      (const unsigned char *)strBuffer, len,
-				      gfree, strBuffer);
-    if (st)
+    if (status)
       gfree (strBuffer);
   }
 }
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.h
index 8de391ae72b..33dde0c570a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoOutputDev.h
@@ -21,6 +21,7 @@
 // Copyright (C) 2008, 2009, 2011-2014 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 //
 // 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
@@ -280,6 +281,9 @@ protected:
 		   GfxImageColorMap *colorMap, cairo_surface_t *image);
   void fillToStrokePathClip(GfxState *state);
   void alignStrokeCoords(GfxSubpath *subpath, int i, double *x, double *y);
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+  GBool setMimeDataForJBIG2Globals (Stream *str, cairo_surface_t *image);
+#endif
 
   GfxRGB fill_color, stroke_color;
   cairo_pattern_t *fill_pattern, *stroke_pattern;
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.cc
index 039f63e1895..f75f4e106f3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Jeff Muizelaar <jrmuizel@nit.ca>
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
@@ -807,7 +807,6 @@ int Catalog::getNumPages()
       return 0;
     }
     catDict.dictLookup("Pages", &pagesDict);
-    catDict.free();
 
     // This should really be isDict("Pages"), but I've seen at least one
     // PDF file where the /Type entry is missing.
@@ -815,19 +814,47 @@ int Catalog::getNumPages()
       error(errSyntaxError, -1, "Top-level pages object is wrong type ({0:s})",
           pagesDict.getTypeName());
       pagesDict.free();
+      catDict.free();
       return 0;
     }
 
     pagesDict.dictLookup("Count", &obj);
     // some PDF files actually use real numbers here ("/Count 9.0")
     if (!obj.isNum()) {
-      error(errSyntaxError, -1, "Page count in top-level pages object is wrong type ({0:s})",
-         obj.getTypeName());
-      numPages = 0;
+      if (pagesDict.dictIs("Page")) {
+	Object pageRootRef;
+	catDict.dictLookupNF("Pages", &pageRootRef);
+
+	error(errSyntaxError, -1, "Pages top-level is a single Page. The document is mal-formet, trying to recover...");
+
+	Dict *pageDict = pagesDict.getDict();
+	const Ref pageRef = pageRootRef.getRef();
+	Page *p = new Page(doc, 1, pageDict, pageRef, new PageAttrs(NULL, pageDict), form);
+	if (p->isOk()) {
+	  pages = (Page **)gmallocn(1, sizeof(Page *));
+	  pageRefs = (Ref *)gmallocn(1, sizeof(Ref));
+
+	  pages[0] = p;
+	  pageRefs[0].num = pageRef.num;
+	  pageRefs[0].gen = pageRef.gen;
+
+	  numPages = 1;
+	  lastCachedPage = 1;
+	  pagesSize = 1;
+	} else {
+	  delete p;
+	  numPages = 0;
+	}
+      } else {
+	error(errSyntaxError, -1, "Page count in top-level pages object is wrong type ({0:s})",
+	  obj.getTypeName());
+	numPages = 0;
+      }
     } else {
       numPages = (int)obj.getNum();
     }
 
+    catDict.free();
     obj.free();
     pagesDict.free();
   }
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.cc
index 59b7c93e66f..59b7c93e66f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.cc
index c2a94f4a1fa..c2a94f4a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.cc
index 6ad1b2c2884..07d95b355a8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
-// Copyright (C) 2005-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005-2013, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Thorkild Stray <thorkild@ifi.uio.no>
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc@gnome.org>
@@ -3355,6 +3355,12 @@ void Gfx::doGouraudTriangleShFill(GfxGouraudTriangleShading *shading) {
   delete reusablePath;
 }
 
+static inline void checkTrue(bool b, const char *message) {
+  if (unlikely(!b)) {
+    error(errSyntaxError, -1, message);
+  }
+}
+
 void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0,
 			      double x1, double y1, GfxColor *color1,
 			      double x2, double y2, GfxColor *color2,
@@ -3373,11 +3379,11 @@ void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0,
     state->setFillColor(color0);
     out->updateFillColor(state);
 
-    path->reset();                         assert(!path->isEnd());
-    path->setCoord(x0,y0);  path->next();  assert(!path->isEnd());
-    path->setCoord(x1,y1);  path->next();  assert(!path->isEnd());
-    path->setCoord(x2,y2);  path->next();  assert(!path->isEnd());
-    path->setCoord(x0,y0);  path->next();  assert( path->isEnd());
+    path->reset();                         checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x0,y0);  path->next();  checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x1,y1);  path->next();  checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x2,y2);  path->next();  checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x0,y0);  path->next();  checkTrue( path->isEnd(), "Path should be at end");
     out->fill(state);
 
   } else {
@@ -3420,11 +3426,11 @@ void Gfx::gouraudFillTriangle(double x0, double y0, double color0,
     state->setFillColor(&color);
     out->updateFillColor(state);
 
-    path->reset();                         assert(!path->isEnd());
-    path->setCoord(x0,y0);  path->next();  assert(!path->isEnd());
-    path->setCoord(x1,y1);  path->next();  assert(!path->isEnd());
-    path->setCoord(x2,y2);  path->next();  assert(!path->isEnd());
-    path->setCoord(x0,y0);  path->next();  assert( path->isEnd());
+    path->reset();                         checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x0,y0);  path->next();  checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x1,y1);  path->next();  checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x2,y2);  path->next();  checkTrue(!path->isEnd(), "Path should not be at end");
+    path->setCoord(x0,y0);  path->next();  checkTrue( path->isEnd(), "Path should be at end");
     out->fill(state);
 
   } else {
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.cc
index 39f026ad6d4..3e9b7db4248 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.cc
@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005, 2006, 2008-2010, 2012, 2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2006, 2008-2010, 2012, 2014, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -66,6 +66,7 @@
 #include <fofi/FoFiType1C.h>
 #include <fofi/FoFiTrueType.h>
 #include "GfxFont.h"
+#include "PSOutputDev.h"
 
 //------------------------------------------------------------------------
 
@@ -610,7 +611,7 @@ CharCodeToUnicode *GfxFont::readToUnicodeCMap(Dict *fontDict, int nBits,
   return ctu;
 }
 
-GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
+GfxFontLoc *GfxFont::locateFont(XRef *xref, PSOutputDev *ps) {
   GfxFontLoc *fontLoc;
   SysFontType sysFontType;
   GooString *path, *base14Name, *substName;
@@ -640,19 +641,19 @@ GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
 	case fontType1:
 	case fontType1C:
 	case fontType1COT:
-	  embed = globalParams->getPSEmbedType1();
+	  embed = ps->getEmbedType1();
 	  break;
 	case fontTrueType:
 	case fontTrueTypeOT:
-	  embed = globalParams->getPSEmbedTrueType();
+	  embed = ps->getEmbedTrueType();
 	  break;
 	case fontCIDType0C:
 	case fontCIDType0COT:
-	  embed = globalParams->getPSEmbedCIDPostScript();
+	  embed = ps->getEmbedCIDPostScript();
 	  break;
 	case fontCIDType2:
 	case fontCIDType2OT:
-	  embed = globalParams->getPSEmbedCIDTrueType();
+	  embed = ps->getEmbedCIDTrueType();
 	  break;
 	default:
 	  break;
@@ -669,7 +670,7 @@ GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
   }
 
   //----- PS passthrough
-  if (ps && !isCIDFont() && globalParams->getPSFontPassthrough()) {
+  if (ps && !isCIDFont() && ps->getFontPassthrough()) {
     fontLoc = new GfxFontLoc();
     fontLoc->locType = gfxFontLocResident;
     fontLoc->fontType = fontType1;
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.h
index 1be89750349..1f01cc7571c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxFont.h
@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005, 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2008, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -43,6 +43,7 @@ class Dict;
 class CMap;
 class CharCodeToUnicode;
 class FoFiTrueType;
+class PSOutputDev;
 struct GfxFontCIDWidths;
 struct Base14FontMapEntry;
 
@@ -237,9 +238,9 @@ public:
   // Return the writing mode (0=horizontal, 1=vertical).
   virtual int getWMode() { return 0; }
 
-  // Locate the font file for this font.  If <ps> is true, includes PS
+  // Locate the font file for this font.  If <ps> is not null, includes PS
   // printer-resident fonts.  Returns NULL on failure.
-  GfxFontLoc *locateFont(XRef *xref, GBool ps);
+  GfxFontLoc *locateFont(XRef *xref, PSOutputDev *ps);
 
   // Locate a Base-14 font file for a specified font name.
   static GfxFontLoc *locateBase14Font(GooString *base14Name);
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.cc
index 359c0d693ae..3e9cac41534 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2006-2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009, 2012 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2009, 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Christian Persch <chpe@gnome.org>
@@ -3048,8 +3048,12 @@ GfxColorSpace *GfxDeviceNColorSpace::copy() {
   int *mappingA = NULL;
 
   GooList *sepsCSA = new GooList(sepsCS->getLength());
-  for (i = 0; i < sepsCS->getLength(); i++)
-    sepsCSA->append(((GfxSeparationColorSpace *) sepsCS->get(i))->copy());
+  for (i = 0; i < sepsCS->getLength(); i++) {
+    GfxSeparationColorSpace *scs = (GfxSeparationColorSpace *) sepsCS->get(i);
+    if (likely(scs != NULL)) {
+      sepsCSA->append(scs->copy());
+    }
+  }
   if (mapping != NULL) {
     mappingA = (int *)gmalloc(sizeof(int) * nComps);
     for (i = 0; i < nComps; i++)
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.h
index f018e93dd34..f018e93dd34 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.cc
index 3d88646f7b3..7e110d05b15 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2007-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
 // Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
@@ -23,7 +23,7 @@
 // Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2007, 2009 Jonathan Kew <jonathan_kew@sil.org>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2012, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2010, 2012 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
@@ -597,18 +597,6 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
   psResidentFonts = new GooHash(gTrue);
   psResidentFonts16 = new GooList();
   psResidentFontsCC = new GooList();
-  psEmbedType1 = gTrue;
-  psEmbedTrueType = gTrue;
-  psEmbedCIDPostScript = gTrue;
-  psEmbedCIDTrueType = gTrue;
-  psFontPassthrough = gFalse;
-  psPreload = gFalse;
-  psOPI = gFalse;
-  psASCIIHex = gFalse;
-  psBinary = gFalse;
-  psUncompressPreloadedImages = gFalse;
-  psRasterResolution = 300;
-  psRasterMono = gFalse;
   textEncoding = new GooString("UTF-8");
 #if defined(_WIN32)
   textEOL = eolDOS;
@@ -620,9 +608,6 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
   textPageBreaks = gTrue;
   textKeepTinyChars = gFalse;
   enableFreeType = gTrue;
-  antialias = gTrue;
-  vectorAntialias = gTrue;
-  antialiasPrinting = gFalse;
   strokeAdjust = gTrue;
   screenType = screenUnset;
   screenSize = -1;
@@ -1548,114 +1533,6 @@ PSFontParam16 *GlobalParams::getPSResidentFontCC(GooString *collection,
   return p;
 }
 
-GBool GlobalParams::getPSEmbedType1() {
-  GBool e;
-
-  lockGlobalParams;
-  e = psEmbedType1;
-  unlockGlobalParams;
-  return e;
-}
-
-GBool GlobalParams::getPSEmbedTrueType() {
-  GBool e;
-
-  lockGlobalParams;
-  e = psEmbedTrueType;
-  unlockGlobalParams;
-  return e;
-}
-
-GBool GlobalParams::getPSEmbedCIDPostScript() {
-  GBool e;
-
-  lockGlobalParams;
-  e = psEmbedCIDPostScript;
-  unlockGlobalParams;
-  return e;
-}
-
-GBool GlobalParams::getPSEmbedCIDTrueType() {
-  GBool e;
-
-  lockGlobalParams;
-  e = psEmbedCIDTrueType;
-  unlockGlobalParams;
-  return e;
-}
-
-GBool GlobalParams::getPSFontPassthrough() {
-  GBool e;
-
-  lockGlobalParams;
-  e = psFontPassthrough;
-  unlockGlobalParams;
-  return e;
-}
-
-GBool GlobalParams::getPSPreload() {
-  GBool preload;
-
-  lockGlobalParams;
-  preload = psPreload;
-  unlockGlobalParams;
-  return preload;
-}
-
-GBool GlobalParams::getPSOPI() {
-  GBool opi;
-
-  lockGlobalParams;
-  opi = psOPI;
-  unlockGlobalParams;
-  return opi;
-}
-
-GBool GlobalParams::getPSASCIIHex() {
-  GBool ah;
-
-  lockGlobalParams;
-  ah = psASCIIHex;
-  unlockGlobalParams;
-  return ah;
-}
-
-GBool GlobalParams::getPSBinary() {
-  GBool binary;
-
-  lockGlobalParams;
-  binary = psBinary;
-  unlockGlobalParams;
-  return binary;
-}
-
-GBool GlobalParams::getPSUncompressPreloadedImages() {
-  GBool ah;
-
-  lockGlobalParams;
-  ah = psUncompressPreloadedImages;
-  unlockGlobalParams;
-  return ah;
-}
-
-double GlobalParams::getPSRasterResolution() {
-  double res;
-
-  lockGlobalParams;
-  res = psRasterResolution;
-  unlockGlobalParams;
-  return res;
-}
-
-GBool GlobalParams::getPSRasterMono() {
-  GBool mono;
-
-  lockGlobalParams;
-  mono = psRasterMono;
-  unlockGlobalParams;
-  return mono;
-}
-
 GooString *GlobalParams::getTextEncodingName() {
   GooString *s;
 
@@ -1701,33 +1578,6 @@ GBool GlobalParams::getEnableFreeType() {
   return f;
 }
 
-GBool GlobalParams::getAntialias() {
-  GBool f;
-
-  lockGlobalParams;
-  f = antialias;
-  unlockGlobalParams;
-  return f;
-}
-
-GBool GlobalParams::getVectorAntialias() {
-  GBool f;
-
-  lockGlobalParams;
-  f = vectorAntialias;
-  unlockGlobalParams;
-  return f;
-}
-
-GBool GlobalParams::getAntialiasPrinting() {
-  GBool f;
-
-  lockGlobalParams;
-  f = antialiasPrinting;
-  unlockGlobalParams;
-  return f;
-}
-
 GBool GlobalParams::getStrokeAdjust() {
   GBool f;
 
@@ -1973,78 +1823,6 @@ void GlobalParams::setPSLevel(PSLevel level) {
   unlockGlobalParams;
 }
 
-void GlobalParams::setPSEmbedType1(GBool embed) {
-  lockGlobalParams;
-  psEmbedType1 = embed;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSEmbedTrueType(GBool embed) {
-  lockGlobalParams;
-  psEmbedTrueType = embed;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSEmbedCIDPostScript(GBool embed) {
-  lockGlobalParams;
-  psEmbedCIDPostScript = embed;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSEmbedCIDTrueType(GBool embed) {
-  lockGlobalParams;
-  psEmbedCIDTrueType = embed;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSFontPassthrough(GBool passthrough) {
-  lockGlobalParams;
-  psFontPassthrough = passthrough;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSPreload(GBool preload) {
-  lockGlobalParams;
-  psPreload = preload;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSOPI(GBool opi) {
-  lockGlobalParams;
-  psOPI = opi;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSASCIIHex(GBool hex) {
-  lockGlobalParams;
-  psASCIIHex = hex;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSBinary(GBool binary) {
-  lockGlobalParams;
-  psBinary = binary;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSUncompressPreloadedImages(GBool uncomp) {
-  lockGlobalParams;
-  psUncompressPreloadedImages = uncomp;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSRasterResolution(double res) {
-  lockGlobalParams;
-  psRasterResolution = res;
-  unlockGlobalParams;
-}
-
-void GlobalParams::setPSRasterMono(GBool mono) {
-  lockGlobalParams;
-  psRasterMono = mono;
-  unlockGlobalParams;
-}
-
 void GlobalParams::setTextEncoding(char *encodingName) {
   lockGlobalParams;
   delete textEncoding;
@@ -2098,30 +1876,6 @@ GBool GlobalParams::setDisableFreeTypeHinting(char *s) {
   return ok;
 }
 
-GBool GlobalParams::setAntialias(char *s) {
-  GBool ok;
-
-  lockGlobalParams;
-  ok = parseYesNo2(s, &antialias);
-  unlockGlobalParams;
-  return ok;
-}
-
-GBool GlobalParams::setVectorAntialias(char *s) {
-  GBool ok;
-
-  lockGlobalParams;
-  ok = parseYesNo2(s, &vectorAntialias);
-  unlockGlobalParams;
-  return ok;
-}
-
-void GlobalParams::setAntialiasPrinting(GBool anti) {
-  lockGlobalParams;
-  antialiasPrinting = anti;
-  unlockGlobalParams;
-}
-
 void GlobalParams::setStrokeAdjust(GBool adjust)
 {
   lockGlobalParams;
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.h
index c33a8024c04..16d615ae6d9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParams.h
@@ -13,14 +13,14 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005, 2007-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2010, 2012, 2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Jonathan Blandford <jrb@redhat.com>
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2009 Jonathan Kew <jonathan_kew@sil.org>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
-// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2012, 2014, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2011 Pino Toscano <pino@kde.org>
 // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
@@ -166,26 +166,11 @@ public:
   GooList *getPSResidentFonts();
   PSFontParam16 *getPSResidentFont16(GooString *fontName, int wMode);
   PSFontParam16 *getPSResidentFontCC(GooString *collection, int wMode);
-  GBool getPSEmbedType1();
-  GBool getPSEmbedTrueType();
-  GBool getPSEmbedCIDPostScript();
-  GBool getPSEmbedCIDTrueType();
-  GBool getPSFontPassthrough();
-  GBool getPSPreload();
-  GBool getPSOPI();
-  GBool getPSASCIIHex();
-  GBool getPSBinary();
-  GBool getPSUncompressPreloadedImages();
-  double getPSRasterResolution();
-  GBool getPSRasterMono();
   GooString *getTextEncodingName();
   EndOfLineKind getTextEOL();
   GBool getTextPageBreaks();
   GBool getTextKeepTinyChars();
   GBool getEnableFreeType();
-  GBool getAntialias();
-  GBool getVectorAntialias();
-  GBool getAntialiasPrinting();
   GBool getStrokeAdjust();
   ScreenType getScreenType();
   int getScreenSize();
@@ -200,7 +185,6 @@ public:
   GBool getPrintCommands();
   GBool getProfileCommands();
   GBool getErrQuiet();
-  double getSplashResolution();
 
   CharCodeToUnicode *getCIDToUnicode(GooString *collection);
   CharCodeToUnicode *getUnicodeToUnicode(GooString *fontName);
@@ -220,27 +204,12 @@ public:
   void setPSShrinkLarger(GBool shrink);
   void setPSCenter(GBool center);
   void setPSLevel(PSLevel level);
-  void setPSEmbedType1(GBool embed);
-  void setPSEmbedTrueType(GBool embed);
-  void setPSEmbedCIDPostScript(GBool embed);
-  void setPSEmbedCIDTrueType(GBool embed);
-  void setPSFontPassthrough(GBool passthrough);
-  void setPSPreload(GBool preload);
-  void setPSOPI(GBool opi);
-  void setPSASCIIHex(GBool hex);
-  void setPSBinary(GBool binary);
-  void setPSUncompressPreloadedImages(GBool uncomp);
-  void setPSRasterResolution(double res);
-  void setPSRasterMono(GBool mono);
   void setTextEncoding(char *encodingName);
   GBool setTextEOL(char *s);
   void setTextPageBreaks(GBool pageBreaks);
   void setTextKeepTinyChars(GBool keep);
   GBool setEnableFreeType(char *s);
   GBool setDisableFreeTypeHinting(char *s);
-  GBool setAntialias(char *s);
-  GBool setVectorAntialias(char *s);
-  void setAntialiasPrinting(GBool print);
   void setStrokeAdjust(GBool strokeAdjust);
   void setScreenType(ScreenType st);
   void setScreenSize(int size);
@@ -256,6 +225,8 @@ public:
   void setProfileCommands(GBool profileCommandsA);
   void setErrQuiet(GBool errQuietA);
 
+  static GBool parseYesNo2(const char *token, GBool *flag);
+
   //----- security handlers
 
   void addSecurityHandler(XpdfSecurityHandler *handler);
@@ -264,7 +235,6 @@ public:
 private:
 
   void parseNameToUnicode(GooString *name);
-  GBool parseYesNo2(const char *token, GBool *flag);
   UnicodeMap *getUnicodeMap2(GooString *encodingName);
 
   void scanEncodingDirs();
@@ -319,21 +289,6 @@ private:
   GooList *psResidentFontsCC;	// 16-bit character collection fonts
 				//   resident in printer: collection name
 				//   mapped to font info [PSFontParam16]
-  GBool psEmbedType1;		// embed Type 1 fonts?
-  GBool psEmbedTrueType;	// embed TrueType fonts?
-  GBool psEmbedCIDPostScript;	// embed CID PostScript fonts?
-  GBool psEmbedCIDTrueType;	// embed CID TrueType fonts?
-  GBool psFontPassthrough;	// pass all fonts through as-is?
-  GBool psPreload;		// preload PostScript images and forms into
-				//   memory
-  GBool psOPI;			// generate PostScript OPI comments?
-  GBool psASCIIHex;		// use ASCIIHex instead of ASCII85?
-  GBool psBinary;		// use binary instead of hex
-  GBool psUncompressPreloadedImages;  // uncompress all preloaded images
-  double psRasterResolution;	// PostScript rasterization resolution (dpi)
-  GBool psRasterMono;		// true to do PostScript rasterization
-				//   in monochrome (gray); false to do it
-				//   in color (RGB/CMYK)
   GooString *textEncoding;	// encoding (unicodeMap) to use for text
 				//   output
   EndOfLineKind textEOL;	// type of EOL marker to use for text
@@ -342,9 +297,6 @@ private:
   GBool textKeepTinyChars;	// keep all characters in text output
   GBool enableFreeType;		// FreeType enable flag
   GBool disableFreeTypeHinting;	// FreeType disable hinting flag
-  GBool antialias;		// anti-aliasing enable flag
-  GBool vectorAntialias;	// vector anti-aliasing enable flag
-  GBool antialiasPrinting;	// allow anti-aliasing when printing
   GBool strokeAdjust;		// stroke adjustment enable flag
   ScreenType screenType;	// halftone screen type
   int screenSize;		// screen matrix size
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.cc
index 0695dc5da0e..66c1d2505e8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.cc
@@ -22,6 +22,7 @@
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2013, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 //
 // 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
@@ -1168,7 +1169,7 @@ JBIG2CodeTable::~JBIG2CodeTable() {
 // JBIG2Stream
 //------------------------------------------------------------------------
 
-JBIG2Stream::JBIG2Stream(Stream *strA, Object *globalsStreamA):
+JBIG2Stream::JBIG2Stream(Stream *strA, Object *globalsStreamA, Object *globalsStreamRefA):
   FilterStream(strA)
 {
   pageBitmap = NULL;
@@ -1193,7 +1194,12 @@ JBIG2Stream::JBIG2Stream(Stream *strA, Object *globalsStreamA):
   huffDecoder = new JBIG2HuffmanDecoder();
   mmrDecoder = new JBIG2MMRDecoder();
 
-  globalsStreamA->copy(&globalsStream);
+  if (globalsStreamA->isStream()) {
+    globalsStreamA->copy(&globalsStream);
+    if (globalsStreamRefA->isRef())
+      globalsStreamRef = globalsStreamRefA->getRef();
+  }
+
   segments = globalSegments = NULL;
   curStr = NULL;
   dataPtr = dataEnd = NULL;
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.h
index 0ee2518575c..1e14c5cf783 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JBIG2Stream.h
@@ -15,6 +15,7 @@
 //
 // Copyright (C) 2009 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -46,7 +47,7 @@ class JBIG2MMRDecoder;
 class JBIG2Stream: public FilterStream {
 public:
 
-  JBIG2Stream(Stream *strA, Object *globalsStreamA);
+  JBIG2Stream(Stream *strA, Object *globalsStreamA, Object *globalsStreamRefA);
   virtual ~JBIG2Stream();
   virtual StreamKind getKind() { return strJBIG2; }
   virtual void reset();
@@ -57,6 +58,7 @@ public:
   virtual GooString *getPSFilter(int psLevel, const char *indent);
   virtual GBool isBinary(GBool last = gTrue);
   virtual Object *getGlobalsStream() { return &globalsStream; }
+  virtual Ref getGlobalsStreamRef() { return globalsStreamRef; }
 
 private:
   virtual GBool hasGetChars() { return true; }
@@ -132,6 +134,7 @@ private:
   GBool readLong(int *x);
 
   Object globalsStream;
+  Ref globalsStreamRef;
   Guint pageW, pageH, curPageH;
   Guint pageDefPixel;
   JBIG2Bitmap *pageBitmap;
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.cc
index 2d48899904e..35e98b86ebc 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.cc
@@ -7,7 +7,8 @@
 // Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
 // Copyright 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2015 Adam Reichold <adam.reichold@t-online.de>
 //
 // Licensed under GPLv2 or later
 //
@@ -49,6 +50,22 @@ struct JPXStreamPrivate {
 #endif
 };
 
+static inline int doLookChar(JPXStreamPrivate* priv) {
+  if (unlikely(priv->counter >= priv->npixels))
+    return EOF;
+
+  return ((unsigned char *)priv->image->comps[priv->ccounter].data)[priv->counter];
+}
+
+static inline int doGetChar(JPXStreamPrivate* priv) {
+  const int result = doLookChar(priv);
+  if (++priv->ccounter == priv->ncomps) {
+    priv->ccounter = 0;
+    ++priv->counter;
+  }
+  return result;
+}
+
 JPXStream::JPXStream(Stream *strA) : FilterStream(strA) {
   priv = new JPXStreamPrivate;
   priv->inited = gFalse;
@@ -91,8 +108,10 @@ Goffset JPXStream::getPos() {
 }
 
 int JPXStream::getChars(int nChars, Guchar *buffer) {
+  if (unlikely(priv->inited == gFalse)) { init(); }
+
   for (int i = 0; i < nChars; ++i) {
-    const int c = doGetChar();
+    const int c = doGetChar(priv);
     if (likely(c != EOF)) buffer[i] = c;
     else return i;
   }
@@ -100,30 +119,15 @@ int JPXStream::getChars(int nChars, Guchar *buffer) {
 }
 
 int JPXStream::getChar() {
-  return doGetChar();
-}
+  if (unlikely(priv->inited == gFalse)) { init(); }
 
-int JPXStream::doLookChar() {
-  if (unlikely(priv->inited == gFalse))
-    init();
-
-  if (unlikely(priv->counter >= priv->npixels))
-    return EOF;
-
-  return ((unsigned char *)priv->image->comps[priv->ccounter].data)[priv->counter];
+  return doGetChar(priv);
 }
 
 int JPXStream::lookChar() {
-  return doLookChar();
-}
+  if (unlikely(priv->inited == gFalse)) { init(); }
 
-int JPXStream::doGetChar() {
-  int result = doLookChar();
-  if (++priv->ccounter == priv->ncomps) {
-    priv->ccounter = 0;
-    ++priv->counter;
-  }
-  return result;
+  return doLookChar(priv);
 }
 
 GooString *JPXStream::getPSFilter(int psLevel, const char *indent) {
@@ -135,8 +139,7 @@ GBool JPXStream::isBinary(GBool last) {
 }
 
 void JPXStream::getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode) {
-  if (priv->inited == gFalse)
-    init();
+  if (unlikely(priv->inited == gFalse)) { init(); }
 
   *bitsPerComponent = 8;
   if (priv->image && priv->image->numcomps == 3)
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.h
index 50b758608dc..73b6bdd97b8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPEG2000Stream.h
@@ -6,7 +6,8 @@
 //
 // Copyright 2008, 2010 Albert Astals Cid <aacid@kde.org>
 // Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
-// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2015 Adam Reichold <adam.reichold@t-online.de>
 //
 // Licensed under GPLv2 or later
 //
@@ -49,10 +50,6 @@ private:
   void init();
   virtual GBool hasGetChars() { return true; }
   virtual int getChars(int nChars, Guchar *buffer);
-
-  int doGetChar();
-
-  int doLookChar();
 };
 
 #endif
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.cc
index 952967a998a..952967a998a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.cc
index 4ab5f52ceda..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.31.0/poppler/Makefile.am
index e0c98d805e8..9a623af29bb 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD =				\
 	$(win32_libs)
 
 libpoppler_la_LDFLAGS =				\
-	-version-info 49:0:0			\
+	-version-info 50:0:0			\
 	@create_shared_lib@			\
 	@auto_import_flags@
 
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.cc
index 71a1efe269d..71a1efe269d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.h
index 6c40f7b0c0c..6c40f7b0c0c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.cc
index b95df31066f..f69eb860800 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.cc
@@ -23,7 +23,7 @@
 // Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009, 2011, 2012 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2012, 2014, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2009-2011, 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2012, 2014 Fabio D'Urso <fabiodurso@hotmail.it>
@@ -1230,6 +1230,19 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
   }
 
   // initialize
+  embedType1 = gTrue;
+  embedTrueType = gTrue;
+  embedCIDPostScript = gTrue;
+  embedCIDTrueType = gTrue;
+  fontPassthrough = gFalse;
+  preloadImagesForms = gFalse;
+  generateOPI = gFalse;
+  useASCIIHex = gFalse;
+  useBinary = gFalse;
+  rasterMono = gFalse;
+  rasterResolution = 300;
+  uncompressPreloadedImages = gFalse;
+  rasterAntialias = gFalse;
   displayText = gTrue;
   ok = gTrue;
   outputFunc = outputFuncA;
@@ -1310,7 +1323,6 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
     if (!paperMatch)
       break; // we only need one entry when all pages are the same size
   }
-  preload = globalParams->getPSPreload();
   if (imgLLX == 0 && imgURX == 0 && imgLLY == 0 && imgURY == 0) {
     imgLLX = imgLLY = 0;
     imgURX = paperWidth;
@@ -1515,7 +1527,7 @@ void PSOutputDev::writeHeader(const std::vector<int> &pages,
     writePS("%%DocumentCustomColors: (atend)\n");
   }
   writePS("%%DocumentSuppliedResources: (atend)\n");
-  if ((level == psLevel1 || level == psLevel1Sep) && globalParams->getPSBinary()) {
+  if ((level == psLevel1 || level == psLevel1Sep) && useBinary) {
     writePS("%%DocumentData: Binary\n");
   }
 
@@ -1671,7 +1683,7 @@ void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
       }
     }
 #if OPI_SUPPORT
-    if (globalParams->getPSOPI()) {
+    if (generateOPI) {
       writePS("/opiMatrix matrix currentmatrix def\n");
     }
 #endif
@@ -1880,7 +1892,7 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
 			     font->getID()->num, font->getID()->gen);
     setupType3Font(font, psName, parentResDict);
   } else {
-    fontLoc = font->locateFont(xref, gTrue);
+    fontLoc = font->locateFont(xref, this);
     if (fontLoc != NULL) {
       switch (fontLoc->locType) {
       case gfxFontLocEmbedded:
@@ -2812,7 +2824,7 @@ void PSOutputDev::setupImages(Dict *resDict) {
   Ref imgID;
   int i, j;
 
-  if (!(mode == psModeForm || inType3Char || preload)) {
+  if (!(mode == psModeForm || inType3Char || preloadImagesForms)) {
     return;
   }
 
@@ -2864,7 +2876,7 @@ void PSOutputDev::setupImages(Dict *resDict) {
 }
 
 void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
-  GBool useRLE, useCompressed, useASCIIHex;
+  GBool useRLE, useCompressed, doUseASCIIHex;
   GooString *s;
   int c;
   int size, line, col, i;
@@ -2876,9 +2888,9 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
   if (level < psLevel2) {
     useRLE = gFalse;
     useCompressed = gFalse;
-    useASCIIHex = gTrue;
+    doUseASCIIHex = gTrue;
   } else {
-    if (globalParams->getPSUncompressPreloadedImages()) {
+    if (uncompressPreloadedImages) {
       useRLE = gFalse;
       useCompressed = gFalse;
     } else {
@@ -2892,7 +2904,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
 	useCompressed = gFalse;
       }
     }
-    useASCIIHex = globalParams->getPSASCIIHex();
+    doUseASCIIHex = useASCIIHex;
   }
   if (useCompressed) {
     str = str->getUndecodedStream();
@@ -2900,7 +2912,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
   if (useRLE) {
     str = new RunLengthEncoder(str);
   }
-  if (useASCIIHex) {
+  if (doUseASCIIHex) {
     str = new ASCIIHexEncoder(str);
   } else {
     str = new ASCII85Encoder(str);
@@ -2913,23 +2925,23 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
     do {
       c = str->getChar();
     } while (c == '\n' || c == '\r');
-    if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+    if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
       break;
     }
     if (c == 'z') {
       ++col;
     } else {
       ++col;
-      for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
+      for (i = 1; i <= (doUseASCIIHex ? 1 : 4); ++i) {
 	do {
 	  c = str->getChar();
 	} while (c == '\n' || c == '\r');
-	if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+	if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
 	  break;
 	}
 	++col;
       }
-      if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+      if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
 	break;
       }
     }
@@ -2937,7 +2949,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
       ++size;
       col = 0;
     }
-  } while (c != (useASCIIHex ? '>' : '~') && c != EOF);
+  } while (c != (doUseASCIIHex ? '>' : '~') && c != EOF);
   // add one entry for the final line of data; add another entry
   // because the RunLengthDecode filter may read past the end
   ++size;
@@ -2959,12 +2971,12 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
     writePSFmt("{0:d} array 1 index {1:d} 2 index put\n",
 	       innerSize, outer);
     line = col = 0;
-    writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~"));
+    writePS((char *)(doUseASCIIHex ? "dup 0 <" : "dup 0 <~"));
     for (;;) {
       do {
 	c = str->getChar();
       } while (c == '\n' || c == '\r');
-      if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+      if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
 	break;
       }
       if (c == 'z') {
@@ -2973,18 +2985,18 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
       } else {
 	writePSChar(c);
 	++col;
-	for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
+	for (i = 1; i <= (doUseASCIIHex ? 1 : 4); ++i) {
 	  do {
 	    c = str->getChar();
 	  } while (c == '\n' || c == '\r');
-	  if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+	  if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
 	    break;
 	  }
 	  writePSChar(c);
 	  ++col;
 	}
       }
-      if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+      if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
 	break;
       }
       // each line is: "dup nnnnn <~...data...~> put<eol>"
@@ -2992,15 +3004,15 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
       // chunks are 1 or 4 bytes each, so we have to stop at 232
       // but make it 225 just to be safe
       if (col > 225) {
-	writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
+	writePS((char *)(doUseASCIIHex ? "> put\n" : "~> put\n"));
 	++line;
 	if (line >= innerSize) break;
-	writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
+	writePSFmt((char *)(doUseASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
 	col = 0;
       }
     }
-    if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
-      writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
+    if (c == (doUseASCIIHex ? '>' : '~') || c == EOF) {
+      writePS((char *)(doUseASCIIHex ? "> put\n" : "~> put\n"));
       if (useRLE) {
 	++line;
 	writePSFmt("{0:d} <> put\n", line);
@@ -3022,7 +3034,7 @@ void PSOutputDev::setupForms(Dict *resDict) {
   Object xObjDict, xObj, xObjRef, subtypeObj;
   int i;
 
-  if (!preload) {
+  if (!preloadImagesForms) {
     return;
   }
 
@@ -3142,8 +3154,6 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
   PreScanOutputDev *scan;
   GBool rasterize;
 #if HAVE_SPLASH
-  GBool mono;
-  double dpi;
   SplashOutputDev *splashOut;
   SplashColor paperColor;
   PDFRectangle box;
@@ -3161,7 +3171,6 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
 #endif
   char hexBuf[32*2 + 2];	// 32 values X 2 chars/value + line ending + null
   Guchar digit;
-  GBool useBinary;
   GBool isGray;
 
   if (forceRasterize) {
@@ -3180,12 +3189,8 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
   }
 
 #if HAVE_SPLASH
-  // get the rasterization parameters
-  dpi = globalParams->getPSRasterResolution();
-  mono = globalParams->getPSRasterMono();
-
   // start the PS page
-  page->makeBox(dpi, dpi, rotateA, useMediaBox, gFalse,
+  page->makeBox(rasterResolution, rasterResolution, rotateA, useMediaBox, gFalse,
 		sliceX, sliceY, sliceW, sliceH, &box, &crop);
   rotateA += page->getRotate();
   if (rotateA >= 360) {
@@ -3193,38 +3198,37 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
   } else if (rotateA < 0) {
     rotateA += 360;
   }
-  state = new GfxState(dpi, dpi, &box, rotateA, gFalse);
+  state = new GfxState(rasterResolution, rasterResolution, &box, rotateA, gFalse);
   startPage(page->getNum(), state, xref);
   delete state;
 
   // set up the SplashOutputDev
-  if (mono || level == psLevel1) {
+  if (rasterMono || level == psLevel1) {
     numComps = 1;
     paperColor[0] = 0xff;
     splashOut = new SplashOutputDev(splashModeMono8, 1, gFalse,
-				    paperColor, gFalse,
-				    globalParams->getAntialiasPrinting());
+				    paperColor, gFalse);
 #if SPLASH_CMYK
   } else if (level == psLevel1Sep || level == psLevel2Sep ||
 	     level == psLevel3Sep || globalParams->getOverprintPreview()) {
     numComps = 4;
     paperColor[0] = paperColor[1] = paperColor[2] = paperColor[3] = 0;
     splashOut = new SplashOutputDev(splashModeCMYK8, 1, gFalse,
-				    paperColor, gFalse,
-				    globalParams->getAntialiasPrinting());
+				    paperColor, gFalse);
 #endif
   } else {
     numComps = 3;
     paperColor[0] = paperColor[1] = paperColor[2] = 0xff;
     splashOut = new SplashOutputDev(splashModeRGB8, 1, gFalse,
-				    paperColor, gFalse,
-				    globalParams->getAntialiasPrinting());
+				    paperColor, gFalse);
   }
+  splashOut->setFontAntialias(rasterAntialias);
+  splashOut->setVectorAntialias(rasterAntialias);
   splashOut->startDoc(doc);
 
   // break the page into stripes
-  hDPI2 = xScale * dpi;
-  vDPI2 = yScale * dpi;
+  hDPI2 = xScale * rasterResolution;
+  vDPI2 = yScale * rasterResolution;
   if (sliceW < 0 || sliceH < 0) {
     if (useMediaBox) {
       box = *page->getMediaBox();
@@ -3268,7 +3272,6 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
 	       m0, m1, m2, m3, m4, m5);
     switch (level) {
     case psLevel1:
-      useBinary = globalParams->getPSBinary();
       writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}\n",
 		 w, h, w, -h, h,
 		 useBinary ? "Bin" : "");
@@ -3307,7 +3310,6 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
       }
       break;
     case psLevel1Sep:
-      useBinary = globalParams->getPSBinary();
       p = bitmap->getDataPtr();
       // Check for an all gray image
       isGray = gTrue;
@@ -3520,10 +3522,9 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
 	writePS("  /Decode [0 1 0 1 0 1 0 1]\n");
       }
       writePS("  /DataSource currentfile\n");
-      useBinary = globalParams->getPSBinary();
       if (useBinary) {
 	/* nothing to do */;
-      } else if (globalParams->getPSASCIIHex()) {
+      } else if (useASCIIHex) {
 	writePS("    /ASCIIHexDecode filter\n");
       } else {
 	writePS("    /ASCII85Decode filter\n");
@@ -3532,7 +3533,7 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
       writePS(">>\n");
       if (useBinary) {
 	/* nothing to do */;
-      } else if (globalParams->getPSASCIIHex()) {
+      } else if (useASCIIHex) {
 	str = new ASCIIHexEncoder(str);
       } else {
 	str = new ASCII85Encoder(str);
@@ -5143,14 +5144,13 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
   int col, x, y, c, i;
   char hexBuf[32*2 + 2];	// 32 values X 2 chars/value + line ending + null
   Guchar digit, grayValue;
-  const GBool useBinary = globalParams->getPSBinary();
 
   // explicit masking
   if (maskStr && !(maskColors && colorMap)) {
     maskToClippingPath(maskStr, maskWidth, maskHeight, maskInvert);
   }
 
-  if ((inType3Char || preload) && !colorMap) {
+  if ((inType3Char || preloadImagesForms) && !colorMap) {
     if (inlineImg) {
       // create an array
       str = new FixedLengthEncoder(str, len);
@@ -5189,7 +5189,7 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // image/imagemask command
-  if ((inType3Char || preload) && !colorMap) {
+  if ((inType3Char || preloadImagesForms) && !colorMap) {
     writePSFmt("{0:d} {1:d} {2:s} [{3:d} 0 0 {4:d} 0 {5:d}] pdfImM1a\n",
 	       width, height, invert ? "true" : "false",
 	       width, -height, height);
@@ -5206,7 +5206,7 @@ void PSOutputDev::doImageL1(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // image data
-  if (!((inType3Char || preload) && !colorMap)) {
+  if (!((inType3Char || preloadImagesForms) && !colorMap)) {
 
     if (colorMap) {
 
@@ -5302,7 +5302,6 @@ void PSOutputDev::doImageL1Sep(Object *ref, GfxImageColorMap *colorMap,
   GBool checkProcessColor;
   char hexBuf[32*2 + 2];	// 32 values X 2 chars/value + line ending + null
   Guchar digit;
-  const GBool useBinary = globalParams->getPSBinary();
 
   // explicit masking
   if (maskStr && !(maskColors && colorMap)) {
@@ -5529,7 +5528,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
   GBool emitRect, addRect, extendRect;
   GooString *s;
   int n, numComps;
-  GBool useRLE, useASCII, useASCIIHex, useCompressed;
+  GBool useRLE, useASCII, useCompressed;
   GfxSeparationColorSpace *sepCS;
   GfxColor color;
   GfxCMYK cmyk;
@@ -5708,10 +5707,8 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
     writePS(" setcolorspace\n");
   }
 
-  useASCIIHex = globalParams->getPSASCIIHex();
-
   // set up the image data
-  if (mode == psModeForm || inType3Char || preload) {
+  if (mode == psModeForm || inType3Char || preloadImagesForms) {
     if (inlineImg) {
       // create an array
       str2 = new FixedLengthEncoder(str, len);
@@ -5821,7 +5818,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // data source
-  if (mode == psModeForm || inType3Char || preload) {
+  if (mode == psModeForm || inType3Char || preloadImagesForms) {
     if (inlineImg) {
       writePS("  /DataSource { pdfImStr }\n");
     } else {
@@ -5833,8 +5830,8 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // filters
-  if ((mode == psModeForm || inType3Char || preload) &&
-      globalParams->getPSUncompressPreloadedImages()) {
+  if ((mode == psModeForm || inType3Char || preloadImagesForms) &&
+      uncompressPreloadedImages) {
     s = NULL;
     useRLE = gFalse;
     useCompressed = gFalse;
@@ -5845,12 +5842,12 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
     if ((colorMap && colorMap->getColorSpace()->getMode() == csDeviceN) ||
 	inlineImg || !s) {
       useRLE = gTrue;
-      useASCII = !(mode == psModeForm || inType3Char || preload);
+      useASCII = !(mode == psModeForm || inType3Char || preloadImagesForms);
       useCompressed = gFalse;
     } else {
       useRLE = gFalse;
       useASCII = str->isBinary() &&
-	         !(mode == psModeForm || inType3Char || preload);
+	         !(mode == psModeForm || inType3Char || preloadImagesForms);
       useCompressed = gTrue;
     }
   }
@@ -5868,7 +5865,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
     delete s;
   }
 
-  if (mode == psModeForm || inType3Char || preload) {
+  if (mode == psModeForm || inType3Char || preloadImagesForms) {
 
     // end of image dictionary
     writePSFmt(">>\n{0:s}\n", colorMap ? "image" : "imagemask");
@@ -5988,7 +5985,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
   Stream *str2;
   GooString *s;
   int n, numComps;
-  GBool useRLE, useASCII, useASCIIHex, useCompressed;
+  GBool useRLE, useASCII, useCompressed;
   GBool maskUseRLE, maskUseASCII, maskUseCompressed;
   GooString *maskFilters;
   GfxSeparationColorSpace *sepCS;
@@ -5997,7 +5994,6 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
   int c;
   int col, i;
 
-  useASCIIHex = globalParams->getPSASCIIHex();
   useRLE = useASCII = useCompressed = gFalse; // make gcc happy
   maskUseRLE = maskUseASCII = maskUseCompressed = gFalse; // make gcc happy
   maskFilters = NULL; // make gcc happy
@@ -6006,8 +6002,8 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
   if (maskStr) {
 
     // mask data source
-    if ((mode == psModeForm || inType3Char || preload) &&
-      globalParams->getPSUncompressPreloadedImages()) {
+    if ((mode == psModeForm || inType3Char || preloadImagesForms) &&
+      uncompressPreloadedImages) {
       s = NULL;
       maskUseRLE = gFalse;
       maskUseCompressed = gFalse;
@@ -6016,12 +6012,12 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
       s = maskStr->getPSFilter(3, "  ");
       if (!s) {
 	maskUseRLE = gTrue;
-	maskUseASCII = !(mode == psModeForm || inType3Char || preload);
+	maskUseASCII = !(mode == psModeForm || inType3Char || preloadImagesForms);
 	maskUseCompressed = gFalse;
       } else {
 	maskUseRLE = gFalse;
 	maskUseASCII = maskStr->isBinary() &&
-	               !(mode == psModeForm || inType3Char || preload);
+	               !(mode == psModeForm || inType3Char || preloadImagesForms);
 	maskUseCompressed = gTrue;
       }
     }
@@ -6039,7 +6035,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
     if (s) {
       delete s;
     }
-    if (mode == psModeForm || inType3Char || preload) {
+    if (mode == psModeForm || inType3Char || preloadImagesForms) {
       writePSFmt("MaskData_{0:d}_{1:d} pdfMaskInit\n",
 		 ref->getRefNum(), ref->getRefGen());
     } else {
@@ -6085,7 +6081,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // set up the image data
-  if (mode == psModeForm || inType3Char || preload) {
+  if (mode == psModeForm || inType3Char || preloadImagesForms) {
     if (inlineImg) {
       // create an array
       str2 = new FixedLengthEncoder(str, len);
@@ -6203,7 +6199,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // data source
-  if (mode == psModeForm || inType3Char || preload) {
+  if (mode == psModeForm || inType3Char || preloadImagesForms) {
     if (inlineImg) {
   writePS("  /DataSource { pdfImStr }\n");
     } else {
@@ -6215,8 +6211,8 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // filters
-  if ((mode == psModeForm || inType3Char || preload) &&
-      globalParams->getPSUncompressPreloadedImages()) {
+  if ((mode == psModeForm || inType3Char || preloadImagesForms) &&
+      uncompressPreloadedImages) {
     s = NULL;
     useRLE = gFalse;
     useCompressed = gFalse;
@@ -6227,12 +6223,12 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
     if ((colorMap && colorMap->getColorSpace()->getMode() == csDeviceN) ||
 	inlineImg || !s) {
       useRLE = gTrue;
-      useASCII = !(mode == psModeForm || inType3Char || preload);
+      useASCII = !(mode == psModeForm || inType3Char || preloadImagesForms);
       useCompressed = gFalse;
     } else {
       useRLE = gFalse;
       useASCII = str->isBinary() &&
-                 !(mode == psModeForm || inType3Char || preload);
+                 !(mode == psModeForm || inType3Char || preloadImagesForms);
       useCompressed = gTrue;
     }
   }
@@ -6267,7 +6263,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
 	       maskInvert ? 1 : 0, maskInvert ? 0 : 1);
 
     // mask data source
-    if (mode == psModeForm || inType3Char || preload) {
+    if (mode == psModeForm || inType3Char || preloadImagesForms) {
       writePS("  /DataSource {pdfMaskSrc}\n");
       writePS(maskFilters->getCString());
     } else {
@@ -6279,7 +6275,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
     writePS(">>\n");
   }
 
-  if (mode == psModeForm || inType3Char || preload) {
+  if (mode == psModeForm || inType3Char || preloadImagesForms) {
 
     // image command
     writePSFmt("{0:s}\n", colorMap ? "image" : "imagemask");
@@ -6302,7 +6298,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
   }
 
   // get rid of the array and index
-  if (mode == psModeForm || inType3Char || preload) {
+  if (mode == psModeForm || inType3Char || preloadImagesForms) {
     if (!inlineImg) writePS("pop ");
     writePS("pop pop\n");
 
@@ -6347,7 +6343,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
 
   // close the mask stream
   if (maskStr) {
-    if (!(mode == psModeForm || inType3Char || preload)) {
+    if (!(mode == psModeForm || inType3Char || preloadImagesForms)) {
       writePS("pdfMaskEnd\n");
     }
   }
@@ -6629,7 +6625,7 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
 void PSOutputDev::opiBegin(GfxState *state, Dict *opiDict) {
   Object dict;
 
-  if (globalParams->getPSOPI()) {
+  if (generateOPI) {
     opiDict->lookup("2.0", &dict);
     if (dict.isDict()) {
       opiBegin20(state, dict.getDict());
@@ -7002,7 +6998,7 @@ void PSOutputDev::opiTransform(GfxState *state, double x0, double y0,
 void PSOutputDev::opiEnd(GfxState *state, Dict *opiDict) {
   Object dict;
 
-  if (globalParams->getPSOPI()) {
+  if (generateOPI) {
     opiDict->lookup("2.0", &dict);
     if (dict.isDict()) {
       writePS("%%EndIncludedImage\n");
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.h
index 262ce14caab..128ff7c7572 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSOutputDev.h
@@ -20,7 +20,7 @@
 // Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009, 2011 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2011, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2011, 2014 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
@@ -45,6 +45,7 @@
 #include "OutputDev.h"
 #include <set>
 #include <map>
+#include <vector>
 
 class GHooash;
 class PDFDoc;
@@ -151,7 +152,7 @@ public:
 
   // Does this device use drawForm()?  If this returns false,
   // form-type XObjects will be interpreted (i.e., unrolled).
-  virtual GBool useDrawForm() { return preload; }
+  virtual GBool useDrawForm() { return preloadImagesForms; }
 
   // Does this device use beginType3Char/endType3Char?  Otherwise,
   // text in Type 3 fonts will be drawn with drawChar/drawString.
@@ -308,6 +309,26 @@ public:
     { overlayCbk = cbk; overlayCbkData = data; }
   void setDisplayText(GBool display) { displayText = display; }
 
+  void setRasterAntialias(GBool a) { rasterAntialias = a; }
+  void setRasterResolution(double r) { rasterResolution = r; }
+  void setRasterMono(GBool b) { rasterMono = b; }
+  void setUncompressPreloadedImages(GBool b) { uncompressPreloadedImages = b; }
+
+  GBool getEmbedType1() const { return embedType1; }
+  GBool getEmbedTrueType() const { return embedTrueType; }
+  GBool getEmbedCIDPostScript() const { return embedCIDPostScript; }
+  GBool getEmbedCIDTrueType() const { return embedCIDTrueType; }
+  GBool getFontPassthrough() const { return fontPassthrough; }
+  void setEmbedType1(GBool b) { embedType1 = b; }
+  void setEmbedTrueType(GBool b) { embedTrueType = b; }
+  void setEmbedCIDPostScript(GBool b) { embedCIDPostScript = b; }
+  void setEmbedCIDTrueType(GBool b) { embedCIDTrueType = b; }
+  void setFontPassthrough(GBool b) { fontPassthrough = b; }
+  void setPreloadImagesForms(GBool b) { preloadImagesForms = b; }
+  void setGenerateOPI(GBool b) { generateOPI = b; }
+  void setUseASCIIHex(GBool b) { useASCIIHex = b; }
+  void setUseBinary(GBool b) { useBinary = b; }
+
 private:
 
   void init(PSOutputFunc outputFuncA, void *outputStreamA,
@@ -410,8 +431,6 @@ private:
                                 // (only psModePSOrigPageSizes output mode)
   int imgLLX, imgLLY,		// imageable area, in pts
       imgURX, imgURY;
-  GBool preload;		// load all images into memory, and
-				//   predefine forms
   GBool noCrop;
 
   PSOutputFunc outputFunc;
@@ -488,6 +507,22 @@ private:
   GBool t3NeedsRestore;		// set if a 'q' operator was issued
   GBool forceRasterize;		// forces the page to be rasterized into a image before printing
   GBool displayText;		// displayText
+  GBool rasterAntialias;	// antialias on rasterize
+  GBool uncompressPreloadedImages;
+  double rasterResolution;	// PostScript rasterization resolution (dpi)
+  GBool rasterMono;		// true to do PostScript rasterization
+				//   in monochrome (gray); false to do it
+				//   in color (RGB/CMYK)
+  GBool embedType1;		// embed Type 1 fonts?
+  GBool embedTrueType;		// embed TrueType fonts?
+  GBool embedCIDPostScript;	// embed CID PostScript fonts?
+  GBool embedCIDTrueType;	// embed CID TrueType fonts?
+  GBool fontPassthrough;	// pass all fonts through as-is?
+  GBool preloadImagesForms;	// preload PostScript images and forms into
+				//   memory
+  GBool generateOPI;		// generate PostScript OPI comments?
+  GBool useASCIIHex;		// use ASCIIHex instead of ASCII85?
+  GBool useBinary;		// use binary instead of hex
 
 #if OPI_SUPPORT
   int opi13Nest;		// nesting level of OPI 1.3 objects
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.cc
index 98c13c14ff8..98c13c14ff8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo_p.h
index 6cd5220d372..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageLabelInfo_p.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.cc
index d6f55995b1c..d6f55995b1c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.cc
index bfb07eb7315..97af5c4b8a1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.cc
@@ -15,14 +15,14 @@
 //
 // Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2006 Stefan Schweizer <genstef@gentoo.org>
-// Copyright (C) 2006-2014 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2015 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
 // Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2009 William Bader <williambader@hotmail.com>
+// Copyright (C) 2009, 2014, 2015 William Bader <williambader@hotmail.com>
 // Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de>
 // Copyright (C) 2010 Brian Cameron <brian.cameron@oracle.com>
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
@@ -1252,17 +1252,14 @@ SplashOutputDev::SplashOutputDev(SplashColorMode colorModeA,
 				 GBool reverseVideoA,
 				 SplashColorPtr paperColorA,
 				 GBool bitmapTopDownA,
-				 GBool allowAntialiasA, 
-         SplashThinLineMode thinLineMode,
-         GBool overprintPreviewA) {
+				 SplashThinLineMode thinLineMode,
+				 GBool overprintPreviewA) {
   colorMode = colorModeA;
   bitmapRowPad = bitmapRowPadA;
   bitmapTopDown = bitmapTopDownA;
   bitmapUpsideDown = gFalse;
-  allowAntialias = allowAntialiasA;
-  vectorAntialias = allowAntialias &&
-		      globalParams->getVectorAntialias() &&
-		      colorMode != splashModeMono1;
+  fontAntialias = gTrue;
+  vectorAntialias = gTrue;
   overprintPreview = overprintPreviewA;
   enableFreeTypeHinting = gFalse;
   enableSlightHinting = gFalse;
@@ -1383,8 +1380,7 @@ void SplashOutputDev::startDoc(PDFDoc *docA) {
 				    enableFreeTypeHinting,
 				    enableSlightHinting,
 #endif
-				    allowAntialias &&
-				      globalParams->getAntialias() &&
+				      getFontAntialias() &&
 				      colorMode != splashModeMono1);
   for (i = 0; i < nT3Fonts; ++i) {
     delete t3FontCache[i];
@@ -1897,7 +1893,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
 
   } else {
 
-    if (!(fontLoc = gfxFont->locateFont((xref) ? xref : doc->getXRef(), gFalse))) {
+    if (!(fontLoc = gfxFont->locateFont((xref) ? xref : doc->getXRef(), NULL))) {
       error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
 	    gfxFont->getName() ? gfxFont->getName()->getCString()
 	                       : "(unnamed)");
@@ -4151,6 +4147,7 @@ GBool SplashOutputDev::getVectorAntialias() {
 }
 
 void SplashOutputDev::setVectorAntialias(GBool vaa) {
+  vaa = vaa && colorMode != splashModeMono1;
   vectorAntialias = vaa;
   splash->setVectorAntialias(vaa);
 }
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.h
index efbb865c45b..ae20faccb51 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/SplashOutputDev.h
@@ -20,7 +20,8 @@
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz@gmail.com>
 // Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
 // Copyright (C) 2011 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2012, 2015 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2015 William Bader <williambader@hotmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -170,9 +171,8 @@ public:
   SplashOutputDev(SplashColorMode colorModeA, int bitmapRowPadA,
 		  GBool reverseVideoA, SplashColorPtr paperColorA,
 		  GBool bitmapTopDownA = gTrue,
-		  GBool allowAntialiasA = gTrue,
 		  SplashThinLineMode thinLineMode = splashThinLineDefault,
-      GBool overprintPreviewA = globalParams->getOverprintPreview());
+		  GBool overprintPreviewA = globalParams->getOverprintPreview());
 
   // Destructor.
   virtual ~SplashOutputDev();
@@ -359,6 +359,9 @@ public:
   virtual void setVectorAntialias(GBool vaa);
 #endif
 
+  GBool getFontAntialias() { return fontAntialias; }
+  void setFontAntialias(GBool anti) { fontAntialias = anti; }
+
   void setFreeTypeHinting(GBool enable, GBool enableSlightHinting);
 
 protected:
@@ -396,7 +399,7 @@ private:
   int bitmapRowPad;
   GBool bitmapTopDown;
   GBool bitmapUpsideDown;
-  GBool allowAntialias;
+  GBool fontAntialias;
   GBool vectorAntialias;
   GBool overprintPreview;
   GBool enableFreeTypeHinting;
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.cc
index 4c00ddb0d5d..d2dd761c729 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.cc
@@ -30,6 +30,7 @@
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 // Copyright (C) 2013 Pino Toscano <pino@kde.org>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 //
 // 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
@@ -59,6 +60,7 @@
 #include "Lexer.h"
 #include "GfxState.h"
 #include "Stream.h"
+#include "XRef.h"
 #include "JBIG2Stream.h"
 #include "Stream-CCITT.h"
 #include "CachedFile.h"
@@ -337,10 +339,18 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params, int recursio
     str = new FlateStream(str, pred, columns, colors, bits);
   } else if (!strcmp(name, "JBIG2Decode")) {
     if (params->isDict()) {
-      params->dictLookup("JBIG2Globals", &globals, recursion);
+      XRef *xref = params->getDict()->getXRef();
+      params->dictLookupNF("JBIG2Globals", &globals);
+      while (globals.isRef()) {
+        obj.free();
+        globals.copy(&obj);
+        globals.free();
+        obj.fetch(xref, &globals);
+      }
     }
-    str = new JBIG2Stream(str, &globals);
+    str = new JBIG2Stream(str, &globals, &obj);
     globals.free();
+    obj.free();
   } else if (!strcmp(name, "JPXDecode")) {
     str = new JPXStream(str);
   } else if (!strcmp(name, "Crypt")) {
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.cc
index b1aaca8a58b..b1aaca8a58b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.h
index cd89a970ddb..cd89a970ddb 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.cc
index c9db1e7d19f..c9db1e7d19f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.h
index 23fb3b726a9..23fb3b726a9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.cc
index 1bbbdc51c25..1bbbdc51c25 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.h
index 6ed890a8f1f..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.31.0/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.cmake
index b087a693f92..b087a693f92 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.in
index f73d0f66ee9..f73d0f66ee9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.31.0/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.31.0/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.31.0/splash/Makefile.am
index 5c265d6360c..5c265d6360c 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.cc
index fde272acbab..fde272acbab 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.h b/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.cc
index ac344f17c35..ac344f17c35 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.cc
index b785826d66b..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.cc
index f0dcf50384b..f0dcf50384b 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.cc
index 3d6d6b2343e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.h
index e678c9e20e6..e678c9e20e6 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.cc
index ac47881cb4f..ac47881cb4f 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.cc
diff --git a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.h
index cc295cb68fe..cc295cb68fe 100644
--- a/Build/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.31.0/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index aac07c92aff..e53643a1637 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.30.0])
+m4_define([poppler_version], [0.31.0])