poppler 0.20.2

git-svn-id: svn://tug.org/texlive/trunk@27008 c570f23f-e606-0410-a88d-b1316a301751

246 files changed, 790 insertions, 219 deletions

diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index d9724b8bf5d..317b04339cf 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.20.2.
+	* version.ac: Adjust.
+
 2012-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import poppler-0.20.0.
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index 525b2a98f26..d2da015c1d6 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 for TeX Live 0.20.0.
+# Generated by GNU Autoconf 2.69 for poppler for TeX Live 0.20.2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler for TeX Live'
 PACKAGE_TARNAME='poppler-for-tex-live'
-PACKAGE_VERSION='0.20.0'
-PACKAGE_STRING='poppler for TeX Live 0.20.0'
+PACKAGE_VERSION='0.20.2'
+PACKAGE_STRING='poppler for TeX Live 0.20.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.20.0/poppler/Array.cc"
+ac_unique_file="poppler-0.20.2/poppler/Array.cc"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1295,7 +1295,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 for TeX Live 0.20.0 to adapt to many kinds of systems.
+\`configure' configures poppler for TeX Live 0.20.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1362,7 +1362,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler for TeX Live 0.20.0:";;
+     short | recursive ) echo "Configuration of poppler for TeX Live 0.20.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1473,7 +1473,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler for TeX Live configure 0.20.0
+poppler for TeX Live configure 0.20.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1880,7 +1880,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 for TeX Live $as_me 0.20.0, which was
+It was created by poppler for TeX Live $as_me 0.20.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2708,7 +2708,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler-for-tex-live'
- VERSION='0.20.0'
+ VERSION='0.20.2'
 
 
 # Some tools Automake needs.
@@ -5255,12 +5255,12 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.20.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler/poppler-config.h:poppler-0.20.2/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "$PACKAGE_VERSION"
+#define POPPLER_VERSION "0.20.2"
 _ACEOF
 
 
@@ -5353,7 +5353,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.20.0
+POPPLER_TREE=poppler-0.20.2
 
 
 ac_config_files="$ac_config_files Makefile poppler/Makefile goo/Makefile fofi/Makefile"
@@ -5901,7 +5901,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 for TeX Live $as_me 0.20.0, which was
+This file was extended by poppler for TeX Live $as_me 0.20.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5967,7 +5967,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 for TeX Live config.status 0.20.0
+poppler for TeX Live config.status 0.20.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -6098,7 +6098,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.20.0/poppler/poppler-config.h.in" ;;
+    "poppler/poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler/poppler-config.h:poppler-0.20.2/poppler/poppler-config.h.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "poppler/Makefile") CONFIG_FILES="$CONFIG_FILES poppler/Makefile" ;;
     "goo/Makefile") CONFIG_FILES="$CONFIG_FILES goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/configure.ac b/Build/source/libs/poppler/configure.ac
index 9b4ef940855..126ca467996 100644
--- a/Build/source/libs/poppler/configure.ac
+++ b/Build/source/libs/poppler/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2011-2012 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -74,7 +74,8 @@ AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_HEADERS([poppler/poppler-config.h:poppler-]poppler_version[/poppler/poppler-config.h.in])
 
-AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["$PACKAGE_VERSION"], [Define to the poppler version.])
+dnl ##### Export the version
+AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["poppler_version"], [Define to the poppler version.])
 
 KPSE_ZLIB_FLAGS
 
diff --git a/Build/source/libs/poppler/poppler-0.20.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.20.2-PATCHES/ChangeLog
index 4162d7dccb6..73b6229619a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.20.2-PATCHES/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.20.2 source tree from:
+	  http://poppler.freedesktop.org/
+	* patch-02-warnings: Adapted.
+
 2012-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.20.0 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.20.0-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.20.2-PATCHES/TL-Changes
index ec3282d609f..ead572ccf5e 100644
--- a/Build/source/libs/poppler/poppler-0.20.0-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.20.2-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.20.0 tree as obtained from:
+Changes applied to the poppler-0.20.2 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.20.0-PATCHES/patch-02-warnings b/Build/source/libs/poppler/poppler-0.20.2-PATCHES/patch-02-warnings
index 8462e936007..7ff7b8e98d7 100644
--- a/Build/source/libs/poppler/poppler-0.20.0-PATCHES/patch-02-warnings
+++ b/Build/source/libs/poppler/poppler-0.20.2-PATCHES/patch-02-warnings
@@ -1,6 +1,6 @@
-diff -ur poppler-0.20.0.orig/poppler/GfxState.cc poppler-0.20.0/poppler/GfxState.cc
---- poppler-0.20.0.orig/poppler/GfxState.cc	2012-05-07 03:42:01.000000000 +0200
-+++ poppler-0.20.0/poppler/GfxState.cc	2012-05-11 08:43:26.000000000 +0200
+diff -ur poppler-0.20.2.orig/poppler/GfxState.cc poppler-0.20.2/poppler/GfxState.cc
+--- poppler-0.20.2.orig/poppler/GfxState.cc	2012-06-11 15:19:41.000000000 +0200
++++ poppler-0.20.2/poppler/GfxState.cc	2012-07-11 20:54:59.000000000 +0200
 @@ -3121,7 +3121,7 @@
  
    getParameterRange(&sMin, &sMax, xMin, yMin, xMax, yMax);
@@ -10,9 +10,9 @@ diff -ur poppler-0.20.0.orig/poppler/GfxState.cc poppler-0.20.0/poppler/GfxState
    maxSize = std::max<int>(maxSize, 2);
  
    {
-diff -ur poppler-0.20.0.orig/poppler/GfxState.h poppler-0.20.0/poppler/GfxState.h
---- poppler-0.20.0.orig/poppler/GfxState.h	2012-02-14 19:15:04.000000000 +0100
-+++ poppler-0.20.0/poppler/GfxState.h	2012-05-09 10:05:26.000000000 +0200
+diff -ur poppler-0.20.2.orig/poppler/GfxState.h poppler-0.20.2/poppler/GfxState.h
+--- poppler-0.20.2.orig/poppler/GfxState.h	2012-05-10 22:05:44.000000000 +0200
++++ poppler-0.20.2/poppler/GfxState.h	2012-07-11 20:54:59.000000000 +0200
 @@ -100,7 +100,7 @@
  }
  
@@ -22,9 +22,9 @@ diff -ur poppler-0.20.0.orig/poppler/GfxState.h poppler-0.20.0/poppler/GfxState.
  }
  
  static inline double byteToDbl(Guchar x) {
-diff -ur poppler-0.20.0.orig/poppler/Hints.cc poppler-0.20.0/poppler/Hints.cc
---- poppler-0.20.0.orig/poppler/Hints.cc	2012-02-29 21:12:22.000000000 +0100
-+++ poppler-0.20.0/poppler/Hints.cc	2012-05-09 10:05:26.000000000 +0200
+diff -ur poppler-0.20.2.orig/poppler/Hints.cc poppler-0.20.2/poppler/Hints.cc
+--- poppler-0.20.2.orig/poppler/Hints.cc	2012-05-10 22:05:44.000000000 +0200
++++ poppler-0.20.2/poppler/Hints.cc	2012-07-11 20:54:59.000000000 +0200
 @@ -415,7 +415,7 @@
  {
    Guint bit, bits;
@@ -48,9 +48,9 @@ diff -ur poppler-0.20.0.orig/poppler/Hints.cc poppler-0.20.0/poppler/Hints.cc
  
    return bit | bits;
  }
-diff -ur poppler-0.20.0.orig/poppler/Lexer.cc poppler-0.20.0/poppler/Lexer.cc
---- poppler-0.20.0.orig/poppler/Lexer.cc	2012-03-01 17:47:33.000000000 +0100
-+++ poppler-0.20.0/poppler/Lexer.cc	2012-05-09 10:05:26.000000000 +0200
+diff -ur poppler-0.20.2.orig/poppler/Lexer.cc poppler-0.20.2/poppler/Lexer.cc
+--- poppler-0.20.2.orig/poppler/Lexer.cc	2012-05-10 22:05:44.000000000 +0200
++++ poppler-0.20.2/poppler/Lexer.cc	2012-07-11 20:54:59.000000000 +0200
 @@ -216,7 +216,7 @@
  	      overflownUnsignedInteger = gTrue;
  	      xf = xi * 10.0 + (c - '0');
@@ -60,9 +60,9 @@ diff -ur poppler-0.20.0.orig/poppler/Lexer.cc poppler-0.20.0/poppler/Lexer.cc
  	    }
  	  } else {
  	    xi = xi * 10 + (c - '0');
-diff -ur poppler-0.20.0.orig/poppler/Stream.cc poppler-0.20.0/poppler/Stream.cc
---- poppler-0.20.0.orig/poppler/Stream.cc	2012-05-03 23:28:57.000000000 +0200
-+++ poppler-0.20.0/poppler/Stream.cc	2012-05-11 08:43:26.000000000 +0200
+diff -ur poppler-0.20.2.orig/poppler/Stream.cc poppler-0.20.2/poppler/Stream.cc
+--- poppler-0.20.2.orig/poppler/Stream.cc	2012-05-10 22:05:44.000000000 +0200
++++ poppler-0.20.2/poppler/Stream.cc	2012-07-11 20:54:59.000000000 +0200
 @@ -478,7 +478,7 @@
    Guchar *p;
   
diff --git a/Build/source/libs/poppler/poppler-0.20.0/AUTHORS b/Build/source/libs/poppler/poppler-0.20.2/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.20.2/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.20.0/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.20.2/CMakeLists.txt
index 9f4830bd4df..c42706447a7 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.20.2/CMakeLists.txt
@@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN)
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "20")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "2")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
@@ -386,7 +386,7 @@ add_library(poppler STATIC ${poppler_SRCS})
 else(MSVC)
 add_library(poppler SHARED ${poppler_SRCS})
 endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 25.0.0 SOVERSION 25)
+set_target_properties(poppler PROPERTIES VERSION 26.0.0 SOVERSION 26)
 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.20.0/COPYING b/Build/source/libs/poppler/poppler-0.20.2/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/COPYING
+++ b/Build/source/libs/poppler/poppler-0.20.2/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.20.0/ChangeLog b/Build/source/libs/poppler/poppler-0.20.2/ChangeLog
index 6e8c5c57d20..54590bad05f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.20.2/ChangeLog
@@ -1,3 +1,298 @@
+commit e15fe0e1e6accf779caeb1179a8d62161c0aa650
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Thu Jul 5 17:44:02 2012 +0200
+
+    Fix handling of DeviceN images in level 3 PostScript
+
+    bug #51548
+
+ poppler/PSOutputDev.cc |   14 --------------
+ 1 file changed, 14 deletions(-)
+
+commit 02c4e6bf4cc0f5535946fe31815081a40b1de986
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Jun 29 01:56:55 2012 +0200
+
+    PSOutputDev: Correct %%DocumentCustomColors
+
+    Bug 51479
+
+ poppler/PSOutputDev.cc |   20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+commit f7990386d268a444c297958e9c50ed27a0825a00
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Jun 28 00:18:07 2012 +0200
+
+    Add some security checks to JPXStream decoding
+
+    Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
+    and Gynvael Coldwind
+
+ poppler/JPXStream.cc |   14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+commit c5c6eed1623506e1206e89cee0b7c887d815ba62
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jun 24 23:43:03 2012 +0200
+
+    Change SplashBitmap gmallocn to gmallocn_checkoverflow
+
+    Fixes abort in KDE bug #302372
+
+ splash/Splash.cc       |   37 +++++++++++++++++++++++--------------
+ splash/SplashBitmap.cc |   18 +++++++++++-------
+ 2 files changed, 34 insertions(+), 21 deletions(-)
+
+commit c87738ee234aafc6eda5a263ad789205037020e1
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Sun Jun 24 20:20:38 2012 +0200
+
+    copy resources content defined in the pages dict
+
+    Fixes bug #51369
+
+ poppler/PDFDoc.cc |   16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+commit 6cdf879e389f05abba30b3fad8083b7fff23056e
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sun Jun 24 11:48:04 2012 +0200
+
+    qt4: Do not hang on malformed /Annots objects
+
+    Don't recurse infinitely if the /Annots object contains annotation
+    dictionaries (according to specs, /Annots must contain *references*
+    to annotation dictionaries).
+
+    Fixes bug #51361
+
+ qt4/src/poppler-annotation.cc |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 3575becd60585324bcefc0631b1bac47c1db3c5c
+Author: Mark Brand <mabrand@mabrand.nl>
+Date:   Thu Jun 14 20:31:26 2012 +0200
+
+    fix typo to compile in Windows
+
+ poppler/GlobalParamsWin.cc |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 06618065c8a97a5bec125560546b98edfc1210f3
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Jun 11 15:17:59 2012 +0200
+
+    Add some security checks to JBIG2Stream decoding
+
+    Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
+    and Gynvael Coldwind
+
+ poppler/JBIG2Stream.cc |   58
+ ++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 44 insertions(+), 14 deletions(-)
+
+commit e3fe88df3646a80945210ba426eb4681a98b55e9
+Author: Hib Eris <hib@hiberis.nl>
+Date:   Sun Jun 10 19:44:18 2012 +0200
+
+    Check value of first page in linearization table
+
+    Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
+    and Gynvael Coldwind
+
+ poppler/Linearization.cc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 1240eee8c0d0d01113443e0fda87721775a76da9
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jun 10 20:42:55 2012 +0200
+
+    0.20.1
+
+ CMakeLists.txt      |    4 ++--
+ NEWS                |   25 +++++++++++++++++++++++++
+ configure.ac        |    2 +-
+ cpp/Doxyfile        |    2 +-
+ poppler/Makefile.am |    2 +-
+ qt4/src/Doxyfile    |    2 +-
+ 6 files changed, 31 insertions(+), 6 deletions(-)
+
+commit c783037619e2b4c101e8ecd7e61c94ee077b4be2
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jun 10 20:15:01 2012 +0200
+
+    Update copyrights
+
+ poppler/GlobalParamsWin.cc |    1 +
+ 1 file changed, 1 insertion(+)
+
+commit f3f9d8f28a97338da92c842d5668b0ef3495ef13
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Jun 10 19:09:17 2012 +0200
+
+    Do use NULL function
+
+    Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk
+    and Gynvael Coldwind
+
+ poppler/Gfx.cc |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 92ef16e3699da949c80716c3fd4b438fe79c134d
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Sun Jun 10 16:58:54 2012 +0200
+
+    use setoverprintmode only if rip knows it
+
+ poppler/PSOutputDev.cc |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 99aa734ae2d3ba51f840d4c8ef450488fb702a31
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Thu May 24 23:17:27 2012 +0200
+
+    qt4: Keep page rotation into account when normalizing annotation
+    coords
+
+    If the page is rotated by 90 or 270 degrees, width and height need
+    to be swapped
+
+ qt4/src/poppler-annotation.cc |   16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+commit bde31ce7b223abc86d25e06f3d73668b792c70df
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Sat Jun 9 01:31:29 2012 +0200
+
+    Fix saving to xml
+
+    The default icon is Note not comment
+
+ qt4/src/poppler-annotation.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 9904b8f10abf068a7816bd90976ccbb320387645
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Thu May 24 18:24:48 2012 +0930
+
+    glib docs: fix typo
+
+ glib/poppler-document.cc |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 028f580056f99719cfb8af7bbe8184ceac02cb16
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sun May 13 21:36:36 2012 +0930
+
+    add sustitute font name to GlobalParamsWin32 to fix compilation
+
+ poppler/GlobalParamsWin.cc |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 1916d000a86336213ffd6e9bd44ce873e8955895
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Sat May 12 16:31:38 2012 +0930
+
+    Include substitute font name in system font cache
+
+    Bug 49826
+
+ poppler/FontInfo.cc     |    1 +
+ poppler/GlobalParams.cc |   58
+ ++++++++++++++++++++++++++---------------------
+ 2 files changed, 33 insertions(+), 26 deletions(-)
+
+commit 1c6e84555572a6bf3a2e3fbe9a54b40f11c122ad
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Fri May 18 16:22:46 2012 +0200
+
+    qt4: Make TextAnnotation ctor public
+
+ qt4/src/poppler-annotation.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 8e504bf2543621973fdaddbd29055ce435540146
+Author: Ville Skyttä <ville.skytta@iki.fi>
+Date:   Wed May 16 23:49:01 2012 +0300
+
+    pdfseparate.1: Syntax fixes.
+
+ utils/pdfseparate.1 |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 9f7d919e68a26bb7dd809986d8394fe20b750bd0
+Author: Anthony Wesley <awesley@smartnetworks.com.au>
+Date:   Thu May 17 19:54:47 2012 +0200
+
+    Fix logic on SplashBitmap::writeImgFile
+
+ splash/SplashBitmap.cc |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 7e7997e12faccf4c0513811b324a2fd0fa960a96
+Author: Igor Slepchin <igor.slepchin@gmail.com>
+Date:   Tue May 15 23:16:27 2012 +0200
+
+    Determine if font is bold or italic based on FontDescriptor.
+
+    Bug #49758
+
+ utils/HtmlFonts.cc     |   24 ++++++++++++++++++------
+ utils/HtmlFonts.h      |    3 ++-
+ utils/HtmlOutputDev.cc |    4 +---
+ 3 files changed, 21 insertions(+), 10 deletions(-)
+
+commit 329bb1e2b4f4b58832847bcf805d19ac0fd5ef02
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun May 13 19:45:55 2012 +0200
+
+    glib: Make sure password is always converted to latin1
+
+    Remove the utf8 validation since glib API is supposed to always
+    receive
+    utf8 strings.
+
+ glib/poppler-document.cc |   38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+commit 7714b4e319c48ee915061a172208245ae7c4141b
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Sun May 13 19:30:17 2012 +0200
+
+    glib: Fix memory leak when document fails to load
+
+ glib/poppler-document.cc |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 13d2aa303eb1fd900f1045efec14af8002477b02
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Sun May 13 17:25:15 2012 +0200
+
+    remove unnecesary transparency group handling in splash
+
+    Bug #13487
+
+ poppler/Gfx.cc             |   64
+ +++++++++++++++++++++++++++++++++++++++++++-
+ poppler/Gfx.h              |    4 ++-
+ poppler/GfxState.cc        |    4 ++-
+ poppler/OutputDev.h        |    1 +
+ poppler/SplashOutputDev.cc |   11 ++++++++
+ poppler/SplashOutputDev.h  |    1 +
+ 6 files changed, 82 insertions(+), 3 deletions(-)
+
+commit a76867003a7bff5ab03016156c75b4c928788d50
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun May 13 13:10:40 2012 +0200
+
+    Distribute cmake/modules/FindLCMS2.cmake
+
+    Bug #49818
+
+ Makefile.am |    1 +
+ 1 file changed, 1 insertion(+)
+
 commit 4114c928fa2560937e02319f57937f1c267a9817
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Thu May 10 21:09:14 2012 +0200
diff --git a/Build/source/libs/poppler/poppler-0.20.0/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.20.2/ConfigureChecks.cmake
index 04de970c4e1..04de970c4e1 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/INSTALL b/Build/source/libs/poppler/poppler-0.20.2/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.20.2/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.20.0/Makefile.am b/Build/source/libs/poppler/poppler-0.20.2/Makefile.am
index 5023be9121c..a9f5db1cad6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.20.2/Makefile.am
@@ -76,6 +76,7 @@ EXTRA_DIST +=							\
 	cmake/modules/FindGTK.cmake				\
 	cmake/modules/FindIconv.cmake				\
 	cmake/modules/FindLCMS.cmake				\
+	cmake/modules/FindLCMS2.cmake				\
 	cmake/modules/FindQt4.cmake				\
 	cmake/modules/GObjectIntrospectionMacros.cmake		\
 	cmake/modules/MacroBoolTo01.cmake			\
diff --git a/Build/source/libs/poppler/poppler-0.20.0/Makefile.in b/Build/source/libs/poppler/poppler-0.20.2/Makefile.in
index 8b476f16fb8..14950a6b085 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/Makefile.in
@@ -396,7 +396,8 @@ EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
 	cmake/modules/FindGLIB.cmake \
 	cmake/modules/FindGObjectIntrospection.cmake \
 	cmake/modules/FindGTK.cmake cmake/modules/FindIconv.cmake \
-	cmake/modules/FindLCMS.cmake cmake/modules/FindQt4.cmake \
+	cmake/modules/FindLCMS.cmake cmake/modules/FindLCMS2.cmake \
+	cmake/modules/FindQt4.cmake \
 	cmake/modules/GObjectIntrospectionMacros.cmake \
 	cmake/modules/MacroBoolTo01.cmake \
 	cmake/modules/MacroEnsureVersion.cmake \
diff --git a/Build/source/libs/poppler/poppler-0.20.0/NEWS b/Build/source/libs/poppler/poppler-0.20.2/NEWS
index 308edc9d0ec..df7dca7a2f1 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/NEWS
+++ b/Build/source/libs/poppler/poppler-0.20.2/NEWS
@@ -1,3 +1,39 @@
+Release 0.20.2
+        core:
+         * Fix compilation on Windows
+         * Copy resources content defined in the pages dict on save (Bug #51369)
+         * PSOutputDev: Correct %%DocumentCustomColors (Bug #51479)
+         * PSOutputDev: Fix handling of DeviceN images in level 3 PostScript (Bug #51548)
+         * Fix crash in malformed documents
+        
+        qt4:
+         * Do not hang on malformed /Annots objects (Bug #51361)
+
+Release 0.20.1
+        core:
+         * Remove unnecesary transparency group handling in splash (Bug #13487)
+         * Include substitute font name in system font cache (Bug #49826)
+         * Fix logic on SplashBitmap::writeImgFile
+         * PSOutputDev: use setoverprintmode only if rip knows it
+         * Fix crash in malformed documents
+        
+        qt4:
+         * Make TextAnnotation constructor public
+         * Fix saving of default TextAnnotation to xml
+         * Keep page rotation into account when normalizing annotation coords
+        
+        glib:
+         * Fix memory leak when document fails to load
+         * Make sure password is always converted to latin1
+         * Fix typo in documentation
+
+        build system:
+         * Distribute cmake/modules/FindLCMS2.cmake (Bug #49818)
+
+        utils:
+         * pdftohtml: Determine if font is bold or italic based on FontDescriptor (Bug #49758)
+         * pdfseparate: Syntax fixes in the man page
+
 Release 0.20.0
         core:
          * Reconstruct xref table if xref needed but missing (Bug #40719)
diff --git a/Build/source/libs/poppler/poppler-0.20.0/README b/Build/source/libs/poppler/poppler-0.20.2/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/README
+++ b/Build/source/libs/poppler/poppler-0.20.2/README
diff --git a/Build/source/libs/poppler/poppler-0.20.0/README-XPDF b/Build/source/libs/poppler/poppler-0.20.2/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.20.2/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.20.0/TODO b/Build/source/libs/poppler/poppler-0.20.2/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/TODO
+++ b/Build/source/libs/poppler/poppler-0.20.2/TODO
diff --git a/Build/source/libs/poppler/poppler-0.20.0/aclocal.m4 b/Build/source/libs/poppler/poppler-0.20.2/aclocal.m4
index a628837fab8..a628837fab8 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/aclocal.m4
+++ b/Build/source/libs/poppler/poppler-0.20.2/aclocal.m4
diff --git a/Build/source/libs/poppler/poppler-0.20.0/config.h.cmake b/Build/source/libs/poppler/poppler-0.20.2/config.h.cmake
index 3c7b96813fd..3c7b96813fd 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/config.h.in b/Build/source/libs/poppler/poppler-0.20.2/config.h.in
index 4e0e48f9f78..4e0e48f9f78 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/configure b/Build/source/libs/poppler/poppler-0.20.2/configure
index 367971d9bc3..8357062d0a0 100755
--- a/Build/source/libs/poppler/poppler-0.20.0/configure
+++ b/Build/source/libs/poppler/poppler-0.20.2/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for poppler 0.20.0.
+# Generated by GNU Autoconf 2.68 for poppler 0.20.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=poppler>.
 #
@@ -571,8 +571,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler'
 PACKAGE_TARNAME='poppler'
-PACKAGE_VERSION='0.20.0'
-PACKAGE_STRING='poppler 0.20.0'
+PACKAGE_VERSION='0.20.2'
+PACKAGE_STRING='poppler 0.20.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=poppler'
 PACKAGE_URL=''
 
@@ -1492,7 +1492,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 0.20.0 to adapt to many kinds of systems.
+\`configure' configures poppler 0.20.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1566,7 +1566,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler 0.20.0:";;
+     short | recursive ) echo "Configuration of poppler 0.20.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1614,7 +1614,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1767,7 +1767,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler configure 0.20.0
+poppler configure 0.20.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2461,7 +2461,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 $as_me 0.20.0, which was
+It was created by poppler $as_me 0.20.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3277,7 +3277,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler'
- VERSION='0.20.0'
+ VERSION='0.20.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5992,6 +5992,11 @@ else
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6031,7 +6036,7 @@ else
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -6457,12 +6462,12 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -7094,13 +7099,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7247,6 +7252,7 @@ for ac_symprfx in "" "_"; do
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7635,7 +7641,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7646,7 +7652,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8286,7 +8305,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8297,6 +8322,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8329,6 +8355,7 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8350,7 +8377,9 @@ _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8486,7 +8515,22 @@ fi
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8564,6 +8608,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9023,7 +9071,9 @@ lt_prog_compiler_static=
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9114,18 +9164,33 @@ lt_prog_compiler_static=
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9487,7 +9552,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9531,6 +9595,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -9737,8 +9804,7 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9753,7 +9819,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9930,6 +9996,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -10117,6 +10184,7 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10162,6 +10230,7 @@ fi
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10190,10 +10259,6 @@ fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10206,7 +10271,7 @@ fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10245,7 +10310,6 @@ fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10386,7 +10450,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10869,11 +10933,6 @@ esac
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10963,7 +11022,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10972,7 +11031,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11037,7 +11096,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11176,7 +11235,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11184,10 +11243,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11195,7 +11250,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11213,7 +11268,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11233,17 +11288,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11304,7 +11360,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11320,7 +11376,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11357,9 +11413,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11422,6 +11478,18 @@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11441,7 +11509,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11510,7 +11578,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11535,7 +11603,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11559,7 +11627,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11590,7 +11658,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11600,7 +11668,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12382,6 +12450,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -13609,7 +13679,6 @@ export_dynamic_flag_spec_CXX=
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -14193,6 +14262,7 @@ fi
   hardcode_shlibpath_var_CXX=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec_CXX=''
   fi
@@ -14237,7 +14307,7 @@ fi
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -14913,6 +14983,7 @@ _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -15340,7 +15411,7 @@ lt_prog_compiler_static_CXX=
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -15702,13 +15773,18 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
       ;;
     esac
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs_CXX=no
+    ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -15855,8 +15931,6 @@ esac
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15882,7 +15956,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -15891,7 +15965,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -15956,7 +16030,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -16093,7 +16167,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -16101,10 +16175,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -16112,7 +16182,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -16130,7 +16200,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -16150,17 +16220,18 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -16221,7 +16292,7 @@ hpux9* | hpux10* | hpux11*)
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -16237,7 +16308,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -16274,9 +16345,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16339,6 +16410,18 @@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -16358,7 +16441,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -16427,7 +16510,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16452,7 +16535,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16476,7 +16559,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -16507,7 +16590,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16517,7 +16600,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -17522,7 +17605,7 @@ fi
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.20.0"
+#define POPPLER_VERSION "0.20.2"
 _ACEOF
 
 
@@ -23881,9 +23964,9 @@ POPPLER_MAJOR_VERSION=0
 
 POPPLER_MINOR_VERSION=20
 
-POPPLER_MICRO_VERSION=0
+POPPLER_MICRO_VERSION=2
 
-POPPLER_VERSION=0.20.0
+POPPLER_VERSION=0.20.2
 
 
 ac_config_files="$ac_config_files Makefile goo/Makefile fofi/Makefile splash/Makefile poppler/Makefile utils/Makefile glib/Makefile glib/poppler-features.h glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile qt4/Makefile qt4/src/Makefile qt4/tests/Makefile qt4/demos/Makefile cpp/Makefile cpp/poppler-version.h cpp/tests/Makefile poppler.pc poppler-uninstalled.pc poppler-cairo.pc poppler-cairo-uninstalled.pc poppler-splash.pc poppler-splash-uninstalled.pc poppler-glib.pc poppler-glib-uninstalled.pc poppler-qt4.pc poppler-qt4-uninstalled.pc poppler-cpp.pc poppler-cpp-uninstalled.pc"
@@ -24531,7 +24614,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 $as_me 0.20.0, which was
+This file was extended by poppler $as_me 0.20.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24597,7 +24680,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 config.status 0.20.0
+poppler config.status 0.20.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -24737,6 +24820,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -24817,7 +24901,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -24889,7 +24972,6 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -24931,6 +25013,7 @@ DLLTOOL \
 OBJDUMP \
 SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -24979,7 +25062,6 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -25013,7 +25095,6 @@ with_gnu_ld_CXX \
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -25851,8 +25932,8 @@ $as_echo X"$file" |
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -25915,6 +25996,9 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -26210,10 +26294,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -26556,10 +26636,6 @@ no_undefined_flag=$lt_no_undefined_flag_CXX
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
diff --git a/Build/source/libs/poppler/poppler-0.20.0/configure.ac b/Build/source/libs/poppler/poppler-0.20.2/configure.ac
index 1eaa8090ac3..0facfdbed3a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.20.2/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[20])
-m4_define([poppler_version_micro],[0])
+m4_define([poppler_version_micro],[2])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
 AC_PREREQ(2.59)
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiIdentifier.cc
index d8ee7e0e509..d8ee7e0e509 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiTrueType.cc
index c777d02282e..c777d02282e 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiTrueType.h
index fb05ae9a51e..fb05ae9a51e 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1.cc
index 8fa10a016b6..8fa10a016b6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1C.cc
index d0ea8887fae..d0ea8887fae 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1C.h
index b9e19330268..b9e19330268 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.20.2/fofi/Makefile.am
index c4654dd28b9..c4654dd28b9 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.20.0/fofi/Makefile.in b/Build/source/libs/poppler/poppler-0.20.2/fofi/Makefile.in
index 58e7f7c059f..58e7f7c059f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/fofi/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/fofi/Makefile.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.20.2/goo/FixedPoint.h
index afe21d96670..afe21d96670 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.20.2/goo/GooHash.h
index b973a93a48d..b973a93a48d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.20.2/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooList.h b/Build/source/libs/poppler/poppler-0.20.2/goo/GooList.h
index 964568a4ef8..964568a4ef8 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.20.2/goo/GooMutex.h
index 3f53a626a67..3f53a626a67 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooMutex.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/GooString.cc
index fc78d907978..fc78d907978 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooString.h b/Build/source/libs/poppler/poppler-0.20.2/goo/GooString.h
index 23558b0c528..23558b0c528 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.20.2/goo/GooTimer.h
index d700e501c07..d700e501c07 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/GooTimer.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.20.2/goo/ImgWriter.h
index 185c230ef48..185c230ef48 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/JpegWriter.cc
index 2fe3d3276cf..2fe3d3276cf 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.20.2/goo/JpegWriter.h
index 7af6870f6b8..7af6870f6b8 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.20.2/goo/Makefile.am
index f4f97304f39..f4f97304f39 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/Makefile.in b/Build/source/libs/poppler/poppler-0.20.2/goo/Makefile.in
index b0ed3ac5f36..b0ed3ac5f36 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/Makefile.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/PNGWriter.cc
index fe8b79ed0d5..fe8b79ed0d5 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.20.2/goo/PNGWriter.h
index f22495d0d00..f22495d0d00 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/TiffWriter.cc
index f63b2450029..f63b2450029 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.20.2/goo/TiffWriter.h
index b2b0ea99cf9..b2b0ea99cf9 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/gfile.cc
index 752242476b6..752242476b6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gfile.h b/Build/source/libs/poppler/poppler-0.20.2/goo/gfile.h
index d4b908209aa..d4b908209aa 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gfile.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/gmem.cc
index 768b283a18e..768b283a18e 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gmem.h b/Build/source/libs/poppler/poppler-0.20.2/goo/gmem.h
index d5bb2ae5d07..d5bb2ae5d07 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.20.2/goo/gstrtod.cc
index e6c3a00741f..e6c3a00741f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.20.2/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.20.2/goo/gtypes.h
index b7a2dd2d268..b7a2dd2d268 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.20.2/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/gtk-doc.make b/Build/source/libs/poppler/poppler-0.20.2/gtk-doc.make
index 9841de47922..9841de47922 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.20.2/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.20.2/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.20.2/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-glib-uninstalled.pc.in
index 5fcb6f24b9a..5fcb6f24b9a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.20.2/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-glib.pc.in
index 9ba8978f6ec..9ba8978f6ec 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.20.2/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.20.2/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.20.2/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler.pc.in b/Build/source/libs/poppler/poppler-0.20.2/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Annot.cc
index 24ef57d3766..24ef57d3766 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Annot.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Annot.h
index 04a13010d3c..04a13010d3c 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Array.cc
index cb2243296f6..cb2243296f6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Array.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Array.h
index 666a409c2d2..666a409c2d2 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/ArthurOutputDev.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/ArthurOutputDev.cc
index a1cb89db537..a1cb89db537 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/ArthurOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/ArthurOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/ArthurOutputDev.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/ArthurOutputDev.h
index ed631a053ef..ed631a053ef 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/ArthurOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/ArthurOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CMap.cc
index 13f293a4aea..13f293a4aea 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CachedFile.cc
index 4c20daefcdd..4c20daefcdd 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoFontEngine.cc
index c4493e87a3a..c4493e87a3a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoFontEngine.h
index 63353489f2c..63353489f2c 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoOutputDev.cc
index b70183e15f4..b70183e15f4 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoOutputDev.h
index df76975cf29..df76975cf29 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoRescaleBox.cc
index 68a0c4cb055..68a0c4cb055 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoRescaleBox.h
index 5349c87f306..5349c87f306 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Catalog.cc
index 664c42146ba..664c42146ba 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Catalog.h
index cdb1f1373e0..cdb1f1373e0 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CharCodeToUnicode.cc
index d0e6c7fe6bd..d0e6c7fe6bd 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/DCTStream.cc
index 90a1377cc8b..90a1377cc8b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/DCTStream.h
index 55bd985d1d7..55bd985d1d7 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Decrypt.cc
index 24af996848d..24af996848d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Decrypt.h
index d947f41a6c7..d947f41a6c7 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Dict.cc
index c4f667bf505..c4f667bf505 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Dict.h
index 897f221346a..897f221346a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Error.cc
index 9d044bc7ef5..9d044bc7ef5 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Error.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Error.h
index d7a0991fd54..d7a0991fd54 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/FileSpec.cc
index 13606089634..13606089634 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontInfo.cc
index 4f30f05fa35..35d5f5f2097 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontInfo.cc
@@ -224,6 +224,7 @@ FontInfo::FontInfo(FontInfo& f) {
   name = f.name ? f.name->copy() : NULL;
   file = f.file ? f.file->copy() : NULL;
   encoding = f.encoding ? f.encoding->copy() : NULL;
+  substituteName = f.substituteName ? f.substituteName->copy() : NULL;
   type = f.type;
   emb = f.emb;
   subset = f.subset;
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontInfo.h
index db90440da73..db90440da73 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Form.cc
index 99d7bbbc527..99d7bbbc527 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Form.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Form.h
index fa3c718b6bd..fa3c718b6bd 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Function.cc
index 25e8f747e44..25e8f747e44 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Function.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Function.h
index a456dfefd56..a456dfefd56 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Gfx.cc
index 9c2a9d8164e..d7684d63980 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Gfx.cc
@@ -1158,8 +1158,9 @@ void Gfx::opSetExtGState(Object args[], int numArgs) {
 	  funcs[0] = NULL;
 	} else {
 	  funcs[0] = Function::parse(&obj3);
-	  if (funcs[0]->getInputSize() != 1 ||
-	      funcs[0]->getOutputSize() != 1) {
+      if (funcs[0] == NULL ||
+          funcs[0]->getInputSize() != 1 ||
+          funcs[0]->getOutputSize() != 1) {
 	    error(errSyntaxError, getPos(),
 		  "Invalid transfer function in soft mask in ExtGState");
 	    delete funcs[0];
@@ -4580,6 +4581,68 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
   error(errSyntaxError, getPos(), "Bad image parameters");
 }
 
+GBool Gfx::checkTransparencyGroup(Dict *resDict) {
+  // check the effect of compositing objects as a group:
+  // look for ExtGState entries with ca != 1 or CA != 1 or BM != normal
+  Object extGStates;
+  GBool transpGroup = gFalse;
+  double opac;
+
+  if (resDict == NULL)
+    return gFalse;
+  pushResources(resDict);
+  resDict->lookup("ExtGState", &extGStates);
+  if (extGStates.isDict()) {
+    Dict *dict = extGStates.getDict();
+    for (int i = 0; i < dict->getLength() && !transpGroup; i++) {
+      Object obj1, obj2;
+      GfxBlendMode mode;
+
+      if (res->lookupGState(dict->getKey(i), &obj1)) {
+        if (!obj1.dictLookup("BM", &obj2)->isNull()) {
+          if (state->parseBlendMode(&obj2, &mode)) {
+            if (mode != gfxBlendNormal)
+              transpGroup = gTrue;
+          } else {
+            error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState");
+          }
+        }
+        obj2.free();
+        if (obj1.dictLookup("ca", &obj2)->isNum()) {
+          opac = obj2.getNum();
+          opac = opac < 0 ? 0 : opac > 1 ? 1 : opac;
+          if (opac != 1)
+            transpGroup = gTrue;
+        }
+        obj2.free();
+        if (obj1.dictLookup("CA", &obj2)->isNum()) {
+          opac = obj2.getNum();
+          opac = opac < 0 ? 0 : opac > 1 ? 1 : opac;
+          if (opac != 1)
+            transpGroup = gTrue;
+        }
+        obj2.free();
+        // alpha is shape
+        if (!transpGroup && obj1.dictLookup("AIS", &obj2)->isBool()) {
+          transpGroup = obj2.getBool();
+        }
+        obj2.free();
+        // soft mask
+        if (!transpGroup && !obj1.dictLookup("SMask", &obj2)->isNull()) {
+          if (!obj2.isName("None")) {
+            transpGroup = gTrue;
+          }
+        }
+        obj2.free();
+      }
+      obj1.free();
+    }
+  }
+  extGStates.free();
+  popResources();
+  return transpGroup;
+}
+
 void Gfx::doForm(Object *str) {
   Dict *dict;
   GBool transpGroup, isolated, knockout;
@@ -4666,7 +4729,6 @@ void Gfx::doForm(Object *str) {
   blendingColorSpace = NULL;
   if (dict->lookup("Group", &obj1)->isDict()) {
     if (obj1.dictLookup("S", &obj2)->isName("Transparency")) {
-      transpGroup = gTrue;
       if (!obj1.dictLookup("CS", &obj3)->isNull()) {
 	blendingColorSpace = GfxColorSpace::parse(&obj3, this);
       }
@@ -4679,6 +4741,7 @@ void Gfx::doForm(Object *str) {
 	knockout = obj3.getBool();
       }
       obj3.free();
+      transpGroup = isolated || out->checkTransparencyGroup(state, knockout) || checkTransparencyGroup(resDict);
     }
     obj2.free();
   }
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Gfx.h
index 689d362a25c..37022e0c62a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Gfx.h
@@ -18,7 +18,7 @@
 // Copyright (C) 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009-2011 Albert Astals Cid <aacid@kde.org>
-// Copyright (C) 2009, 2010 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009, 2010, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2010 David Benjamin <davidben@mit.edu>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 //
@@ -181,6 +181,8 @@ public:
   // Get the current graphics state object.
   GfxState *getState() { return state; }
 
+  GBool checkTransparencyGroup(Dict *resDict);
+
   void drawForm(Object *str, Dict *resDict, double *matrix, double *bbox,
 	       GBool transpGroup = gFalse, GBool softMask = gFalse,
 	       GfxColorSpace *blendingColorSpace = NULL,
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxFont.cc
index ea22af8272c..ea22af8272c 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxFont.h
index f9806681102..f9806681102 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxState.cc
index 7b63a9fa4a5..45c5f488c4e 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxState.cc
@@ -18,7 +18,7 @@
 // Copyright (C) 2006, 2010 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2006-2012 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009, 2012 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009, 2011 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009, 2011, 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2009 Christian Persch <chpe@gnome.org>
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
@@ -5609,6 +5609,8 @@ GfxState::GfxState(double hDPIA, double vDPIA, PDFRectangle *pageBox,
   lineCap = 0;
   miterLimit = 10;
   strokeAdjust = gFalse;
+  alphaIsShape = gFalse;
+  textKnockout = gFalse;
 
   font = NULL;
   fontSize = 0;
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxState.h
index 72c97fb7e45..72c97fb7e45 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/GlobalParams.cc
index 64d6133c2a4..76394cafa5f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GlobalParams.cc
@@ -214,9 +214,10 @@ public:
   GooString *path;
   SysFontType type;
   int fontNum;			// for TrueType collections
+  GooString *substituteName;
 
   SysFontInfo(GooString *nameA, GBool boldA, GBool italicA, GBool obliqueA, GBool fixedWidthA,
-	      GooString *pathA, SysFontType typeA, int fontNumA);
+	      GooString *pathA, SysFontType typeA, int fontNumA, GooString *substituteNameA);
   ~SysFontInfo();
   GBool match(SysFontInfo *fi);
   GBool match(GooString *nameA, GBool boldA, GBool italicA, GBool obliqueA, GBool fixedWidthA);
@@ -224,7 +225,7 @@ public:
 };
 
 SysFontInfo::SysFontInfo(GooString *nameA, GBool boldA, GBool italicA, GBool obliqueA, GBool fixedWidthA,
-			 GooString *pathA, SysFontType typeA, int fontNumA) {
+			 GooString *pathA, SysFontType typeA, int fontNumA, GooString *substituteNameA) {
   name = nameA;
   bold = boldA;
   italic = italicA;
@@ -233,11 +234,13 @@ SysFontInfo::SysFontInfo(GooString *nameA, GBool boldA, GBool italicA, GBool obl
   path = pathA;
   type = typeA;
   fontNum = fontNumA;
+  substituteName = substituteNameA;
 }
 
 SysFontInfo::~SysFontInfo() {
   delete name;
   delete path;
+  delete substituteName;
 }
 
 GBool SysFontInfo::match(SysFontInfo *fi) {
@@ -1184,6 +1187,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
   FcPattern *p=0;
   GooString *path = NULL;
   GooString *fontName = font->getName();
+  GooString substituteName;
   if (!fontName) return NULL;
   lockGlobalParams;
 
@@ -1191,6 +1195,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
     path = fi->path->copy();
     *type = fi->type;
     *fontNum = fi->fontNum;
+    substituteName.Set(fi->substituteName->getCString());
   } else {
     FcChar8* s;
     char * ext;
@@ -1235,28 +1240,26 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
 	  }
 	}
 	FcChar8* s2;
-	if (substituteFontName) {
-	  res = FcPatternGetString(set->fonts[i], FC_FULLNAME, 0, &s2);
-	  if (res == FcResultMatch && s2) {
-	    substituteFontName->Set((char*)s2);
-	  } else {
-	    // fontconfig does not extract fullname for some fonts
-	    // create the fullname from family and style
-	    res = FcPatternGetString(set->fonts[i], FC_FAMILY, 0, &s2);
-	    if (res == FcResultMatch && s2) {
-	      substituteFontName->Set((char*)s2);
-	      res = FcPatternGetString(set->fonts[i], FC_STYLE, 0, &s2);
-	      if (res == FcResultMatch && s2) {
-		GooString *style = new GooString((char*)s2);
-		if (style->cmp("Regular") != 0) {
-		  substituteFontName->append(" ");
-		  substituteFontName->append(style);
-		}
-		delete style;
-	      }
-	    }
-	  }
-	}
+        res = FcPatternGetString(set->fonts[i], FC_FULLNAME, 0, &s2);
+        if (res == FcResultMatch && s2) {
+          substituteName.Set((char*)s2);
+        } else {
+          // fontconfig does not extract fullname for some fonts
+          // create the fullname from family and style
+          res = FcPatternGetString(set->fonts[i], FC_FAMILY, 0, &s2);
+          if (res == FcResultMatch && s2) {
+            substituteName.Set((char*)s2);
+            res = FcPatternGetString(set->fonts[i], FC_STYLE, 0, &s2);
+            if (res == FcResultMatch && s2) {
+              GooString *style = new GooString((char*)s2);
+              if (style->cmp("Regular") != 0) {
+                substituteName.append(" ");
+                substituteName.append(style);
+              }
+              delete style;
+            }
+          }
+        }
 	ext = strrchr((char*)s,'.');
 	if (!ext)
 	  continue;
@@ -1281,7 +1284,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
 	  *type = (!strncasecmp(ext,".ttc",4)) ? sysFontTTC : sysFontTTF;
 	  FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, fontNum);
 	  fi = new SysFontInfo(fontName->copy(), bold, italic, oblique, font->isFixedWidth(),
-			       new GooString((char*)s), *type, *fontNum);
+			       new GooString((char*)s), *type, *fontNum, substituteName.copy());
 	  sysFonts->addFcFont(fi);
 	  path = new GooString((char*)s);
 	}
@@ -1306,7 +1309,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
 	  *type = (!strncasecmp(ext,".pfa",4)) ? sysFontPFA : sysFontPFB;
 	  FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, fontNum);
 	  fi = new SysFontInfo(fontName->copy(), bold, italic, oblique, font->isFixedWidth(),
-			       new GooString((char*)s), *type, *fontNum);
+			       new GooString((char*)s), *type, *fontNum, substituteName.copy());
 	  sysFonts->addFcFont(fi);
 	  path = new GooString((char*)s);
 	}
@@ -1329,6 +1332,9 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
     *type = fi->type;
     *fontNum = fi->fontNum;
   }
+  if (substituteFontName) {
+    substituteFontName->Set(substituteName.getCString());
+  }
 fin:
   if (p)
     FcPatternDestroy(p);
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/GlobalParams.h
index 375ac2cc95a..375ac2cc95a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/GlobalParamsWin.cc
index d8065e04108..527f08e1946 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/GlobalParamsWin.cc
@@ -4,6 +4,8 @@
    // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
    // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
    // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+   // Copyright (C) 2012 Adrian Johnson <ajohnson@redneon.com>
+   // Copyright (C) 2012 Mark Brand <mabrand@mabrand.nl>
 
 TODO: instead of a fixed mapping defined in displayFontTab, it could
 scan the whole fonts directory, parse TTF files and build font
@@ -313,6 +315,7 @@ SysFontInfo *SysFontList::makeWindowsFont(char *name, int fontNum,
   char c;
   int i;
   SysFontType type;
+  GooString substituteName;
 
   n = strlen(name);
   bold = italic = oblique = fixedWidth = gFalse;
@@ -380,7 +383,7 @@ SysFontInfo *SysFontList::makeWindowsFont(char *name, int fontNum,
   }
 
   return new SysFontInfo(s, bold, italic, oblique, fixedWidth,
-                         new GooString(path), type, fontNum);
+                         new GooString(path), type, fontNum, substituteName.copy());
 }
 
 static GooString* replaceSuffix(GooString *path,
@@ -570,6 +573,8 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
     path = fi->path->copy();
     *type = fi->type;
     *fontNum = fi->fontNum;
+    if (substituteFontName)
+      substituteFontName->Set(fi->substituteName->getCString());
   } else {
     GooString *substFontName = new GooString(findSubstituteName(font, fontFiles,
                                                                 substFiles,
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Hints.cc
index af67182cbdd..af67182cbdd 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Hints.h
index d598e796beb..d598e796beb 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/JBIG2Stream.cc
index a65746efdbb..7ddcc81dcf0 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JBIG2Stream.cc
@@ -1860,13 +1860,18 @@ GBool JBIG2Stream::readSymbolDictSeg(Guint segNum, Guint length,
 				       0, gFalse, gFalse, NULL, NULL, NULL,
 				       bmSize);
       }
-      x = 0;
-      for (; j < i; ++j) {
-	bitmaps[numInputSyms + j] =
-	    collBitmap->getSlice(x, 0, symWidths[j], symHeight);
-	x += symWidths[j];
+      if (likely(collBitmap != NULL)) {
+	x = 0;
+	for (; j < i; ++j) {
+	  bitmaps[numInputSyms + j] =
+	      collBitmap->getSlice(x, 0, symWidths[j], symHeight);
+	  x += symWidths[j];
+	}
+	delete collBitmap;
+      } else {
+	error(errSyntaxError, curStr->getPos(), "collBitmap was null");
+	goto syntaxError;
       }
-      delete collBitmap;
     }
   }
 
@@ -2858,6 +2863,7 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
     // ---> max refLine size = w + 2
     codingLine = (int *)gmallocn(w + 1, sizeof(int));
     refLine = (int *)gmallocn(w + 2, sizeof(int));
+    memset(refLine, 0, (w + 2) * sizeof(int));
     for (i = 0; i < w + 1; ++i) codingLine[i] = w;
 
     for (y = 0; y < h; ++y) {
@@ -2884,6 +2890,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
 	code1 = mmrDecoder->get2DCode();
 	switch (code1) {
 	case twoDimPass:
+          if (unlikely(b1i + 1 >= w + 2)) {
+            break;
+          }
           mmrAddPixels(refLine[b1i + 1], blackPixels, codingLine, &a0i, w);
           if (refLine[b1i + 1] < w) {
             b1i += 2;
@@ -2912,51 +2921,66 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
             mmrAddPixels(codingLine[a0i] + code2, blackPixels ^ 1,
 			 codingLine, &a0i, w);
           }
-          while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+          while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
             b1i += 2;
           }
           break;
 	case twoDimVertR3:
+          if (unlikely(b1i >= w + 2)) {
+            break;
+          }
           mmrAddPixels(refLine[b1i] + 3, blackPixels, codingLine, &a0i, w);
           blackPixels ^= 1;
           if (codingLine[a0i] < w) {
             ++b1i;
-            while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+            while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
               b1i += 2;
             }
           }
           break;
 	case twoDimVertR2:
+          if (unlikely(b1i >= w + 2)) {
+            break;
+          }
           mmrAddPixels(refLine[b1i] + 2, blackPixels, codingLine, &a0i, w);
           blackPixels ^= 1;
           if (codingLine[a0i] < w) {
             ++b1i;
-            while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+            while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
               b1i += 2;
             }
           }
           break;
 	case twoDimVertR1:
+          if (unlikely(b1i >= w + 2)) {
+            break;
+          }
           mmrAddPixels(refLine[b1i] + 1, blackPixels, codingLine, &a0i, w);
           blackPixels ^= 1;
           if (codingLine[a0i] < w) {
             ++b1i;
-            while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+            while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
               b1i += 2;
             }
           }
           break;
 	case twoDimVert0:
+          if (unlikely(b1i >= w + 2)) {
+            break;
+          }
           mmrAddPixels(refLine[b1i], blackPixels, codingLine, &a0i, w);
           blackPixels ^= 1;
           if (codingLine[a0i] < w) {
             ++b1i;
-            while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+            while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
               b1i += 2;
             }
           }
           break;
 	case twoDimVertL3:
+          if (unlikely(b1i >= w + 2)) {
+            break;
+          }
           mmrAddPixelsNeg(refLine[b1i] - 3, blackPixels, codingLine, &a0i, w);
           blackPixels ^= 1;
           if (codingLine[a0i] < w) {
@@ -2965,12 +2989,15 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
             } else {
               ++b1i;
             }
-            while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+            while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
               b1i += 2;
             }
           }
           break;
 	case twoDimVertL2:
+          if (unlikely(b1i >= w + 2)) {
+            break;
+          }
           mmrAddPixelsNeg(refLine[b1i] - 2, blackPixels, codingLine, &a0i, w);
           blackPixels ^= 1;
           if (codingLine[a0i] < w) {
@@ -2979,12 +3006,15 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
             } else {
               ++b1i;
             }
-            while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+            while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
               b1i += 2;
             }
           }
           break;
 	case twoDimVertL1:
+          if (unlikely(b1i >= w + 2)) {
+            break;
+          }
           mmrAddPixelsNeg(refLine[b1i] - 1, blackPixels, codingLine, &a0i, w);
           blackPixels ^= 1;
           if (codingLine[a0i] < w) {
@@ -2993,7 +3023,7 @@ JBIG2Bitmap *JBIG2Stream::readGenericBitmap(GBool mmr, int w, int h,
             } else {
               ++b1i;
             }
-            while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
+            while (likely(b1i < w + 2) && refLine[b1i] <= codingLine[a0i] && refLine[b1i] < w) {
               b1i += 2;
             }
           }
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/JBIG2Stream.h
index c518aa5e6ca..c518aa5e6ca 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPEG2000Stream.cc
index e2fd8086b53..e2fd8086b53 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPEG2000Stream.h
index 5aed32d4594..5aed32d4594 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPXStream.cc
index 54bee6f2f02..2cf616d6ae1 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPXStream.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) 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2012 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -416,6 +416,10 @@ void JPXStream::fillReadBuf() {
 #endif
     tx = jpxCeilDiv((curX - img.xTileOffset) % img.xTileSize, tileComp->hSep);
     ty = jpxCeilDiv((curY - img.yTileOffset) % img.yTileSize, tileComp->vSep);
+    if (unlikely(ty >= (tileComp->y1 - tileComp->y0))) {
+      error(errSyntaxError, getPos(), "Unexpected ty in fillReadBuf in JPX stream");
+      return;
+    }
     pix = (int)tileComp->data[ty * (tileComp->x1 - tileComp->x0) + tx];
     pixBits = tileComp->prec;
 #if 1 //~ ignore the palette, assume the PDF ColorSpace object is valid
@@ -2846,7 +2850,13 @@ void JPXStream::inverseTransformLevel(JPXTileComp *tileComp,
 	cover(102);
 	++shift;
       }
-      t = tileComp->quantSteps[qStyle == 1 ? 0 : (3*r - 2 + sb)];
+      const Guint stepIndex = qStyle == 1 ? 0 : (3*r - 2 + sb);
+      if (unlikely(stepIndex >= tileComp->nQuantSteps)) {
+	error(errSyntaxError, getPos(),
+	      "Wrong index for quantSteps in inverseTransformLevel in JPX stream");
+	break;
+      }
+      t = tileComp->quantSteps[stepIndex];
       mu = (double)(0x800 + (t & 0x7ff)) / 2048.0;
     }
     if (tileComp->transform == 0) {
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Lexer.cc
index fa9cfdf2e93..fa9cfdf2e93 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Lexer.h
index 284479dfbfa..284479dfbfa 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Linearization.cc
index 7b8f1e0cce6..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Linearization.cc
@@ -4,7 +4,7 @@
 //
 // This file is licensed under the GPLv2 or later
 //
-// Copyright 2010 Hib Eris <hib@hiberis.nl>
+// Copyright 2010, 2012 Hib Eris <hib@hiberis.nl>
 //
 //========================================================================
 
@@ -211,7 +211,7 @@ int Linearization::getPageFirst()
     linDict.getDict()->lookupInt("P", NULL, &pageFirst);
   }
 
-  if (pageFirst < 0) {
+  if ((pageFirst < 0) || (pageFirst > getNumPages())) {
     error(errSyntaxWarning, -1, "First page in linearization table is invalid");
     return 0;
   }
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Link.cc
index b90b1c13c2a..b90b1c13c2a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Link.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Link.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Link.h
index 8e2df24f40a..8e2df24f40a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.20.2/poppler/Makefile.am
index 8920f8edb7d..c5785d61d6d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Makefile.am
@@ -177,7 +177,7 @@ libpoppler_la_LIBADD =				\
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 25:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 26:0:0 @create_shared_lib@ @auto_import_flags@
 
 if ENABLE_XPDF_HEADERS
 
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Makefile.in b/Build/source/libs/poppler/poppler-0.20.2/poppler/Makefile.in
index 218e72502ab..16386cd2696 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Makefile.in
@@ -570,7 +570,7 @@ libpoppler_la_LIBADD = \
 	$(PTHREAD_LIBS)				\
 	$(win32_libs)
 
-libpoppler_la_LDFLAGS = -version-info 25:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 26:0:0 @create_shared_lib@ @auto_import_flags@
 @ENABLE_XPDF_HEADERS_TRUE@poppler_includedir = $(includedir)/poppler
 @ENABLE_XPDF_HEADERS_TRUE@poppler_include_HEADERS = \
 @ENABLE_XPDF_HEADERS_TRUE@	$(splash_headers)	\
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/NameToUnicodeTable.h
index 74645ab2878..74645ab2878 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Object.cc
index 1963b7f88d4..1963b7f88d4 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Object.h
index c885d739fb3..c885d739fb3 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/OptionalContent.h
index 02c9a471e33..02c9a471e33 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/OutputDev.cc
index 54580d0c106..54580d0c106 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/OutputDev.h
index 855dbafa2a1..15af90ab4cb 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/OutputDev.h
@@ -302,6 +302,7 @@ public:
   virtual GooHash *endProfile();
 
   //----- transparency groups and soft masks
+  virtual GBool checkTransparencyGroup(GfxState * /*state*/, GBool /*knockout*/) { return gTrue; }
   virtual void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
 				      GfxColorSpace * /*blendingColorSpace*/,
 				      GBool /*isolated*/, GBool /*knockout*/,
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDoc.cc
index 2dc1ac89c7d..ce01ca31e11 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDoc.cc
@@ -661,9 +661,14 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
   infoObj.free();
   
   // get and mark output intents etc.
-  Object catObj;
+  Object catObj, pagesObj, resourcesObj;
   getXRef()->getCatalog(&catObj);
   Dict *catDict = catObj.getDict();
+  catDict->lookup("Pages", &pagesObj);
+  Dict *pagesDict = pagesObj.getDict();
+  pagesDict->lookup("Resources", &resourcesObj);
+  if (resourcesObj.isDict())
+    markPageObjects(resourcesObj.getDict(), yRef, countRef, 0);
   markPageObjects(catDict, yRef, countRef, 0);
 
   Dict *pageDict = page.getDict();
@@ -687,12 +692,19 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
     }
   }
   catObj.free();
+  pagesObj.free();
   outStr->printf(">>\nendobj\n");
   objectsCount++;
 
   yRef->add(rootNum + 1,0,outStr->getPos(),gTrue);
   outStr->printf("%d 0 obj\n", rootNum + 1);
-  outStr->printf("<< /Type /Pages /Kids [ %d 0 R ] /Count 1 >>\n", rootNum + 2);
+  outStr->printf("<< /Type /Pages /Kids [ %d 0 R ] /Count 1 ", rootNum + 2);
+  if (resourcesObj.isDict()) {
+    outStr->printf("/Resources ");
+    writeObject(&resourcesObj, NULL, outStr, getXRef(), 0);
+    resourcesObj.free();
+  }
+  outStr->printf(">>\n");
   outStr->printf("endobj\n");
   objectsCount++;
 
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDoc.h
index 468f698bfec..468f698bfec 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDoc.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSOutputDev.cc
index dac10d014e6..5df506f154b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSOutputDev.cc
@@ -258,7 +258,7 @@ static const char *prolog[] = {
   "} def",
   "~3n",
   "/opm { dup /pdfOPM exch def",
-  "      setoverprintmode } def",
+  "      /setoverprintmode where{pop setoverprintmode}{pop}ifelse  } def",
   "~23n",
   "/cs { /pdfFillXform exch def dup /pdfFillCS exch def",
   "      setcolorspace } def",
@@ -292,7 +292,7 @@ static const char *prolog[] = {
   "} def",
   "~3s",
   "/opm { dup /pdfOPM exch def",
-  "      setoverprintmode } def",
+  "      /setoverprintmode where{pop setoverprintmode}{pop}ifelse } def",
   "~23s",
   "/k { 4 copy 4 array astore /pdfFill exch def setcmykcolor",
   "     /pdfLastFill true def /pdfLastStroke false def } def",
@@ -390,7 +390,7 @@ static const char *prolog[] = {
   "~3sn",
   "  /pdfOPM where {",
   "    pop",
-  "    pdfOPM setoverprintmode",
+  "    pdfOPM /setoverprintmode where{pop setoverprintmode}{pop}ifelse ",
   "  } if",
   "~23sn",
   "} def",
@@ -3984,6 +3984,26 @@ void PSOutputDev::addCustomColor(GfxSeparationColorSpace *sepCS) {
   GfxColor color;
   GfxCMYK cmyk;
 
+  if (!sepCS->getName()->cmp("Black")) {
+    processColors |= psProcessBlack;
+    return;
+  }
+  if (!sepCS->getName()->cmp("Cyan")) {
+    processColors |= psProcessCyan;
+    return;
+  }
+  if (!sepCS->getName()->cmp("Yellow")) {
+    processColors |= psProcessYellow;
+    return;
+  }
+  if (!sepCS->getName()->cmp("Magenta")) {
+    processColors |= psProcessMagenta;
+    return;
+  }
+  if (!sepCS->getName()->cmp("All")) 
+    return;
+  if (!sepCS->getName()->cmp("None")) 
+    return;
   for (cc = customColors; cc; cc = cc->next) {
     if (!cc->name->cmp(sepCS->getName())) {
       return;
@@ -6079,15 +6099,6 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
       n = (1 << colorMap->getBits()) - 1;
       writePSFmt("{0:.4g} {1:.4g}", colorMap->getDecodeLow(0) * n,
 		 colorMap->getDecodeHigh(0) * n);
-    } else if (colorMap->getColorSpace()->getMode() == csDeviceN) {
-      numComps = ((GfxDeviceNColorSpace *)colorMap->getColorSpace())->
-	           getAlt()->getNComps();
-      for (i = 0; i < numComps; ++i) {
-	if (i > 0) {
-	  writePS(" ");
-	}
-	writePS("0 1");
-      }
     } else {
       numComps = colorMap->getNumPixelComps();
       for (i = 0; i < numComps; ++i) {
@@ -6217,11 +6228,6 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
       str = str->getUndecodedStream();
     }
 
-    // recode DeviceN data
-    if (colorMap && colorMap->getColorSpace()->getMode() == csDeviceN) {
-      str = new DeviceNRecoder(str, width, height, colorMap);
-    }
-
     // add RunLengthEncode and ASCIIHex/85 encode filters
     if (useRLE) {
       str = new RunLengthEncoder(str);
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSOutputDev.h
index 70aef9f5c5b..70aef9f5c5b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Page.cc
index eccc1981692..eccc1981692 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Page.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Page.h
index e2e666c581d..e2e666c581d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageLabelInfo.cc
index a099d11a699..a099d11a699 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageTransition.cc
index 3fbd0de2802..3fbd0de2802 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Parser.cc
index 5b80293b134..5b80293b134 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Parser.h
index 5ab40995fc3..5ab40995fc3 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/PreScanOutputDev.cc
index 3a86d526f12..3a86d526f12 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/PreScanOutputDev.h
index 5260a3b7ace..5260a3b7ace 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/SecurityHandler.cc
index 00c4ae1fbef..00c4ae1fbef 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/SplashOutputDev.cc
index ce666b92247..be35c259a99 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/SplashOutputDev.cc
@@ -3517,6 +3517,17 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
   str->close();
 }
 
+GBool SplashOutputDev::checkTransparencyGroup(GfxState *state, GBool knockout) {
+  if (state->getFillOpacity() != 1 || 
+    state->getStrokeOpacity() != 1 ||
+    state->getAlphaIsShape() ||
+    state->getBlendMode() != gfxBlendNormal ||
+    splash->getSoftMask() != NULL ||
+    knockout) 
+    return gTrue;
+  return transpGroupStack != NULL && transpGroupStack->shape != NULL;
+}
+
 void SplashOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
 					     GfxColorSpace *blendingColorSpace,
 					     GBool isolated, GBool knockout,
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/SplashOutputDev.h
index b70ec38efe7..f1c87ec637e 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/SplashOutputDev.h
@@ -292,6 +292,7 @@ public:
 		       double llx, double lly, double urx, double ury);
 
   //----- transparency groups and soft masks
+  virtual GBool checkTransparencyGroup(GfxState *state, GBool knockout);
   virtual void beginTransparencyGroup(GfxState *state, double *bbox,
 				      GfxColorSpace *blendingColorSpace,
 				      GBool isolated, GBool knockout,
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/Stream.cc
index 77a418f7045..77a418f7045 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/Stream.h
index a270fdf936b..a270fdf936b 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/TextOutputDev.cc
index e8d993bfd1a..e8d993bfd1a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/TextOutputDev.h
index e31876b9bd3..e31876b9bd3 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/XRef.cc
index 35648073563..35648073563 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/XRef.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/XRef.h
index 148a5cec3f9..148a5cec3f9 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.20.2/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.20.2/poppler/XpdfPluginAPI.h
index b0165c0a72a..b0165c0a72a 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/XpdfPluginAPI.h
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.20.2/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.20.2/poppler/poppler-config.h.cmake
index 94a12aadbc5..94a12aadbc5 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.20.2/poppler/poppler-config.h.in
index 302d12ee72d..302d12ee72d 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.20.0/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.20.2/poppler/strtok_r.cpp
index 30e2196aa13..30e2196aa13 100644
--- a/Build/source/libs/poppler/poppler-0.20.0/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.20.2/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler/Makefile.in b/Build/source/libs/poppler/poppler/Makefile.in
index 5d1be37b04a..b547a3f4520 100644
--- a/Build/source/libs/poppler/poppler/Makefile.in
+++ b/Build/source/libs/poppler/poppler/Makefile.in
@@ -49,7 +49,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/../am/hdr_links.am \
-	$(top_srcdir)/poppler-0.20.0/poppler/poppler-config.h.in
+	$(top_srcdir)/poppler-0.20.2/poppler/poppler-config.h.in
 subdir = poppler
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -211,10 +211,10 @@ poppler-config.h: stamp-h2
 	@if test ! -f $@; then rm -f stamp-h2; else :; fi
 	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h2; else :; fi
 
-stamp-h2: $(top_srcdir)/poppler-0.20.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.20.2/poppler/poppler-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status poppler/poppler-config.h
-$(top_srcdir)/poppler-0.20.0/poppler/poppler-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(top_srcdir)/poppler-0.20.2/poppler/poppler-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h2
 	touch $@
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index fb021cec3c7..1a7e15921ac 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.20.0])
+m4_define([poppler_version], [0.20.2])