298 files changed, 1003 insertions, 119 deletions

diff --git a/Build/source/libs/poppler/ChangeLog b/Build/source/libs/poppler/ChangeLog
index bce57251af4..4888b38c3ba 100644
--- a/Build/source/libs/poppler/ChangeLog
+++ b/Build/source/libs/poppler/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import poppler-0.26.1.
+	* version.ac: Adjust.
+	* Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
 2014-03-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Import poppler-0.25.2.
diff --git a/Build/source/libs/poppler/Makefile.am b/Build/source/libs/poppler/Makefile.am
index fc6098a32bc..3ac0098709a 100644
--- a/Build/source/libs/poppler/Makefile.am
+++ b/Build/source/libs/poppler/Makefile.am
@@ -1,18 +1,16 @@
 ## Proxy Makefile.am to build poppler for TeX Live.
 ##
-##   Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+##   Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
 ##
 ##   This file is free software; the copyright holder
 ##   gives unlimited permission to copy and/or distribute it,
 ##   with or without modifications, as long as this notice is preserved.
 ##
-ACLOCAL_AMFLAGS = -I ../../m4
-
-## We want to re-distribute the whole original poppler source tree.
+## We want to re-distribute the whole poppler source tree.
 ##
 EXTRA_DIST = $(POPPLER_TREE)
 
-## Patches applied to the original source tree
+## Changes applied to the original source tree
 ##
 EXTRA_DIST += $(POPPLER_TREE)-PATCHES
 
diff --git a/Build/source/libs/poppler/Makefile.in b/Build/source/libs/poppler/Makefile.in
index 76a6893e8e6..8ea9c8a5995 100644
--- a/Build/source/libs/poppler/Makefile.in
+++ b/Build/source/libs/poppler/Makefile.in
@@ -80,7 +80,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
 	$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(srcdir)/config.h.in \
-	$(top_srcdir)/poppler-0.25.2/poppler/poppler-config.h.in \
+	$(top_srcdir)/poppler-0.26.1/poppler/poppler-config.h.in \
 	$(top_srcdir)/../../build-aux/depcomp ChangeLog \
 	../../build-aux/compile ../../build-aux/config.guess \
 	../../build-aux/config.sub ../../build-aux/depcomp \
@@ -413,7 +413,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(POPPLER_TREE) $(POPPLER_TREE)-PATCHES
 SUBDIRS = . include
 GOO_SRC = $(top_srcdir)/$(POPPLER_TREE)/goo
@@ -579,7 +578,7 @@ poppler-config.h: stamp-h2
 	@test -f $@ || rm -f stamp-h2
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
 
-stamp-h2: $(top_srcdir)/poppler-0.25.2/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.26.1/poppler/poppler-config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h2
 	cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
 
diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure
index a0c8776c6a4..bb5b28e882a 100755
--- a/Build/source/libs/poppler/configure
+++ b/Build/source/libs/poppler/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.25.2.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.26.1.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -580,12 +580,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='poppler (TeX Live)'
 PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.25.2'
-PACKAGE_STRING='poppler (TeX Live) 0.25.2'
+PACKAGE_VERSION='0.26.1'
+PACKAGE_STRING='poppler (TeX Live) 0.26.1'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="poppler-0.25.2/poppler/Array.cc"
+ac_unique_file="poppler-0.26.1/poppler/Array.cc"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1304,7 +1304,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.25.2 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.26.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1371,7 +1371,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of poppler (TeX Live) 0.25.2:";;
+     short | recursive ) echo "Configuration of poppler (TeX Live) 0.26.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1484,7 +1484,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-poppler (TeX Live) configure 0.25.2
+poppler (TeX Live) configure 0.26.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,7 +2074,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by poppler (TeX Live) $as_me 0.25.2, which was
+It was created by poppler (TeX Live) $as_me 0.26.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3997,7 +3997,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='poppler--tex-live-'
- VERSION='0.25.2'
+ VERSION='0.26.1'
 
 
 # Some tools Automake needs.
@@ -6473,12 +6473,12 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.25.2/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.26.1/poppler/poppler-config.h.in"
 
 
 
 cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.25.2"
+#define POPPLER_VERSION "0.26.1"
 _ACEOF
 
 
@@ -6612,7 +6612,7 @@ fi
 $as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
 
 
-POPPLER_TREE=poppler-0.25.2
+POPPLER_TREE=poppler-0.26.1
 
 
 ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7172,7 +7172,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.25.2, which was
+This file was extended by poppler (TeX Live) $as_me 0.26.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7238,7 +7238,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-poppler (TeX Live) config.status 0.25.2
+poppler (TeX Live) config.status 0.26.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7369,7 +7369,7 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.25.2/poppler/poppler-config.h.in" ;;
+    "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.26.1/poppler/poppler-config.h.in" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;;
diff --git a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX b/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX
deleted file mode 100644
index 0ed8625003c..00000000000
--- a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-03-NOMINMAX
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ur poppler-0.25.2.orig/goo/GooMutex.h poppler-0.25.2/goo/GooMutex.h
---- poppler-0.25.2.orig/goo/GooMutex.h	2014-02-09 16:10:30.000000000 +0100
-+++ poppler-0.25.2/goo/GooMutex.h	2014-03-27 09:21:13.000000000 +0100
-@@ -41,7 +41,9 @@
- // gDestroyMutex(&m);
- 
- #ifdef _WIN32
-+#ifndef NOMINMAX
- #define NOMINMAX
-+#endif
- #include <windows.h>
- 
- typedef CRITICAL_SECTION GooMutex;
-diff -ur poppler-0.25.2.orig/goo/GooTimer.h poppler-0.25.2/goo/GooTimer.h
---- poppler-0.25.2.orig/goo/GooTimer.h	2014-02-09 16:10:30.000000000 +0100
-+++ poppler-0.25.2/goo/GooTimer.h	2014-03-27 09:21:13.000000000 +0100
-@@ -27,7 +27,9 @@
- #endif
- 
- #ifdef _WIN32
-+#ifndef NOMINMAX
- #define NOMINMAX
-+#endif
- #include <windows.h>
- #endif
- 
-diff -ur poppler-0.25.2.orig/goo/gfile.h poppler-0.25.2/goo/gfile.h
---- poppler-0.25.2.orig/goo/gfile.h	2014-02-09 16:10:31.000000000 +0100
-+++ poppler-0.25.2/goo/gfile.h	2014-03-27 09:21:13.000000000 +0100
-@@ -40,7 +40,9 @@
- #  ifdef FPTEX
- #    include <win32lib.h>
- #  else
--  #define NOMINMAX
-+#    ifndef NOMINMAX
-+#      define NOMINMAX
-+#    endif
- #    include <windows.h>
- #  endif
- #elif defined(ACORN)
-diff -ur poppler-0.25.2.orig/poppler/XpdfPluginAPI.h poppler-0.25.2/poppler/XpdfPluginAPI.h
---- poppler-0.25.2.orig/poppler/XpdfPluginAPI.h	2014-02-09 16:10:33.000000000 +0100
-+++ poppler-0.25.2/poppler/XpdfPluginAPI.h	2014-03-27 09:21:13.000000000 +0100
-@@ -23,7 +23,9 @@
- #define XPDFPLUGINAPI_H
- 
- #ifdef _WIN32
-+#ifndef NOMINMAX
- #define NOMINMAX
-+#endif
- #include <windows.h>
- #else
- #define Object XtObject
diff --git a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.26.1-PATCHES/ChangeLog
index 5d6275a64cc..a84547e337b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.26.1-PATCHES/ChangeLog
@@ -1,3 +1,19 @@
+2014-05-24  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.26.1 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-02-LLONG_MAX: Adapted.
+
+2014-05-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Imported poppler-0.26.0 source tree from:
+	  http://poppler.freedesktop.org/
+
+	* patch-02-LLONG_MAX: Adapted.
+
+	* patch-03-NOMINMAX (removed): Now included upstream.
+
 2014-03-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Imported poppler-0.25.2 source tree from:
diff --git a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.26.1-PATCHES/TL-Changes
index 035d4286a84..5117d4c3bbf 100644
--- a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/TL-Changes
+++ b/Build/source/libs/poppler/poppler-0.26.1-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.25.2 tree as obtained from:
+Changes applied to the poppler-0.26.1 tree as obtained from:
 	http://poppler.freedesktop.org/
 
 Removed:
diff --git a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-02-LLONG_MAX b/Build/source/libs/poppler/poppler-0.26.1-PATCHES/patch-02-LLONG_MAX
index dd4301cf634..970d874f4cc 100644
--- a/Build/source/libs/poppler/poppler-0.25.2-PATCHES/patch-02-LLONG_MAX
+++ b/Build/source/libs/poppler/poppler-0.26.1-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.25.2.orig/goo/GooString.h poppler-0.25.2/goo/GooString.h
---- poppler-0.25.2.orig/goo/GooString.h	2014-02-17 22:22:29.000000000 +0100
-+++ poppler-0.25.2/goo/GooString.h	2014-03-27 08:56:22.000000000 +0100
+diff -ur poppler-0.26.1.orig/goo/GooString.h poppler-0.26.1/goo/GooString.h
+--- poppler-0.26.1.orig/goo/GooString.h	2014-04-26 17:37:22.000000000 +0200
++++ poppler-0.26.1/goo/GooString.h	2014-05-24 13:44:20.000000000 +0200
 @@ -34,6 +34,21 @@
  #endif
  
diff --git a/Build/source/libs/poppler/poppler-0.25.2/AUTHORS b/Build/source/libs/poppler/poppler-0.26.1/AUTHORS
index a785e403211..a785e403211 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/AUTHORS
+++ b/Build/source/libs/poppler/poppler-0.26.1/AUTHORS
diff --git a/Build/source/libs/poppler/poppler-0.25.2/CMakeLists.txt b/Build/source/libs/poppler/poppler-0.26.1/CMakeLists.txt
index a522f7636b7..7ceb6433d25 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/CMakeLists.txt
+++ b/Build/source/libs/poppler/poppler-0.26.1/CMakeLists.txt
@@ -17,8 +17,8 @@ include(CheckFileOffsetBits)
 CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "25")
-set(POPPLER_MICRO_VERSION "2")
+set(POPPLER_MINOR_VERSION "26")
+set(POPPLER_MICRO_VERSION "1")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/Build/source/libs/poppler/poppler-0.25.2/COPYING b/Build/source/libs/poppler/poppler-0.26.1/COPYING
index d511905c164..d511905c164 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/COPYING
+++ b/Build/source/libs/poppler/poppler-0.26.1/COPYING
diff --git a/Build/source/libs/poppler/poppler-0.25.2/ChangeLog b/Build/source/libs/poppler/poppler-0.26.1/ChangeLog
index b7adf9dfe80..50287ee104e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/ChangeLog
+++ b/Build/source/libs/poppler/poppler-0.26.1/ChangeLog
@@ -1,3 +1,688 @@
+commit 700bf398ef7b20306f5035e423becfaa3d28fb10
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri May 23 20:05:41 2014 +0200
+
+    0.26.1
+
+ CMakeLists.txt   |  2 +-
+ NEWS             | 12 ++++++++++++
+ configure.ac     |  2 +-
+ cpp/Doxyfile     |  2 +-
+ qt4/src/Doxyfile |  2 +-
+ qt5/src/Doxyfile |  2 +-
+ 6 files changed, 17 insertions(+), 5 deletions(-)
+
+commit 7e9fc61e287889eefd6b08ef5991d31fed79cafd
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Wed May 7 22:25:59 2014 +0200
+
+    Fix libopenjpeg 1.5 detection on some systems
+
+    Someone somewhere decided the pc file will be called libopenjpeg1
+    instead of libopenjpeg
+
+    Bug #78389
+
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit 0a6c1ff777aa23c7a5654b313b639e66600883b9
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date:   Wed May 7 21:54:46 2014 +0200
+
+    Only add annotations of the current page when splitting
+
+    Bug #77549
+
+ poppler/PDFDoc.cc | 153
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ poppler/PDFDoc.h  |   4 +-
+ utils/pdfunite.cc |   9 +++-
+ 3 files changed, 162 insertions(+), 4 deletions(-)
+
+commit 5b2cdef49a8a0a92fd323fbe45841a5098a42ece
+Author: Olly Betts <olly@survex.com>
+Date:   Sun May 4 22:20:30 2014 +0200
+
+    Fix extraction of text in some files
+
+    Bug #78145
+
+ poppler/GfxFont.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit bae836cd3dd3511ca9cf4745626142334bafd1a6
+Author: Marek Kasik <mkasik@redhat.com>
+Date:   Sun May 4 16:20:33 2014 +0200
+
+    Use field value V for radio buttons
+
+    Turn on radio button only if its appearance state is equal to
+    the value
+    of name object "V" of the field.
+
+    Bug #75979
+
+ poppler/Annot.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit a748b3a059938e6ae98b51eb82bab7c33a5e23c7
+Author: Carlos Garcia Campos <carlosgc@gnome.org>
+Date:   Wed Apr 30 09:25:31 2014 +0200
+
+    glib: Fix multiple definition of PopplerTextSpan
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=78103
+
+ glib/poppler-structure-element.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+commit 9a68daee2b3c7f8a992ee47c0e9ac78b346d4348
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Apr 25 01:01:08 2014 +0200
+
+    0.26.0
+
+ CMakeLists.txt   |  4 ++--
+ NEWS             | 13 +++++++++++++
+ configure.ac     |  4 ++--
+ cpp/Doxyfile     |  2 +-
+ qt4/src/Doxyfile |  2 +-
+ qt5/src/Doxyfile |  2 +-
+ 6 files changed, 20 insertions(+), 7 deletions(-)
+
+commit 8073852c84b71257d487aa8a46e441aa82f4b42c
+Author: Fabio D'Urso <fabiodurso@hotmail.it>
+Date:   Mon Apr 14 23:35:50 2014 +0200
+
+    qt: Fix missing ! in TextAnnotation::setInplaceIntent
+
+    CID #16814
+
+ qt4/src/poppler-annotation.cc | 2 +-
+ qt5/src/poppler-annotation.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 1fbf98664c0879ac035a63602242a910c0c1d316
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Mon Apr 14 11:53:59 2014 +0200
+
+    Initialize tmpBufLen
+
+    CID #16957
+
+    It isn't really needed since locateFont always returns a fontLoc
+    with a non null
+    path if fontLoc itself is not null, but it doesn't hurt either
+
+ qt4/src/ArthurOutputDev.cc | 4 ++--
+ qt5/src/ArthurOutputDev.cc | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+commit b3e5c582a279b1b8d8309322ac3f4d0e51831f77
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Apr 10 23:38:09 2014 +0200
+
+    Remove unused member
+
+ cpp/poppler-font.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+commit b86f471c43e387cf873358cf3cbcd27470646713
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Apr 10 22:50:56 2014 +0200
+
+    0.25.3
+
+ CMakeLists.txt                |  2 +-
+ NEWS                          | 19 +++++++++++++++++++
+ configure.ac                  |  2 +-
+ cpp/Doxyfile                  |  2 +-
+ poppler/CairoOutputDev.cc     |  2 +-
+ poppler/GfxFont.cc            |  2 +-
+ qt4/src/Doxyfile              |  2 +-
+ qt4/src/poppler-optcontent.cc |  2 +-
+ qt5/src/Doxyfile              |  2 +-
+ qt5/src/poppler-optcontent.cc |  2 +-
+ qt5/src/poppler-private.cc    |  2 +-
+ qt5/src/poppler-private.h     |  2 +-
+ 12 files changed, 30 insertions(+), 11 deletions(-)
+
+commit 80107c72ac03bf4d00b2d71d6f947c139ea84ab5
+Author: Pino Toscano <pino@kde.org>
+Date:   Sun Apr 6 20:17:31 2014 +0200
+
+    qt5: remove m_fontInfoIterator from Document
+
+    it was used by the deprecated scanForFonts API, which was not provided
+    in poppler-qt5
+
+ qt5/src/poppler-private.cc | 2 --
+ qt5/src/poppler-private.h  | 2 --
+ 2 files changed, 4 deletions(-)
+
+commit b8325316e41fb03eb5fac5c80d6a550fe9ce9695
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 16:05:51 2014 +0200
+
+    Fix memory leak
+
+    CID #16943
+
+ utils/pdfseparate.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit ca9713118d6ce3fdd245f9ca4f595229a5be19c3
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:59:43 2014 +0200
+
+    Don't check twice for the same variable ^_^
+
+    CID #16804
+
+ splash/Splash.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 0ef290a7c5a8fa54d3fe0f646abdf098443a7a67
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:57:38 2014 +0200
+
+    Fix memory leak
+
+    CID #16852
+
+ splash/Splash.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 8810b8917fded340b784873a91ca025b0bb49f3d
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:49:18 2014 +0200
+
+    Fix Out-of-bounds read
+
+    CID #16844
+
+ poppler/PageLabelInfo_p.h | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit 9309907673e8557a25021dce79d9b4354640e2d0
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:35:00 2014 +0200
+
+    Fix memory leak
+
+    Don't pass new'ed GooStrings as parameters to error()
+
+    CID #16915
+
+ poppler/GfxFont.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit a511005584a38217fed582ced6ce2c937526cf96
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:28:50 2014 +0200
+
+    Fix Uninitialized pointer read when nFucnsA is 0
+
+    CID #16965
+
+ poppler/GfxState.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 26b961a64030d91c5db2769dcd0ab8dff7b9b6a6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:23:35 2014 +0200
+
+    gfree -> delete since it was new'ed
+
+    CID #16786
+
+ poppler/JBIG2Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 814ac2230b594cce3b871588804dd92f4a187e7e
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:22:13 2014 +0200
+
+    delete -> gfree since it was gmaloced
+
+    CID #16785
+
+ poppler/JBIG2Stream.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit b496b6665803247b10b018ae939a2a452fa4a48f
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:17:50 2014 +0200
+
+    Fix memory leak
+
+    CID #16864
+
+ poppler/SplashOutputDev.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 1b612f355e9f29fa93c15a9de1188049a8e086b6
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Sun Apr 6 15:14:50 2014 +0200
+
+    Fix memory leak
+
+    CID #16853
+
+ poppler/XRef.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 07621ebbda8ab85cf4cd76a6092efc67aa14454d
+Merge: 8d3a2c9 9fcd46a
+Author: Pino Toscano <pino@kde.org>
+Date:   Sat Apr 5 15:49:31 2014 +0200
+
+    Merge remote-tracking branch 'origin/poppler-0.24'
+
+commit 9fcd46ac4a94f138981ec5afaab3875918c6a175
+Author: Pino Toscano <pino@kde.org>
+Date:   Sat Apr 5 15:48:27 2014 +0200
+
+    qt4/qt5: remove extra qDebug
+
+ qt4/src/poppler-optcontent.cc | 1 -
+ qt5/src/poppler-optcontent.cc | 1 -
+ 2 files changed, 2 deletions(-)
+
+commit 37286ee2923de060ae463ac6b178ffd0e6096b90
+Author: Pino Toscano <pino@kde.org>
+Date:   Sat Apr 5 15:46:44 2014 +0200
+
+    qt4/qt5: fix some kinds of OCG models
+
+    properly pass parent and child when building the tree
+
+ qt4/src/poppler-optcontent.cc | 2 +-
+ qt5/src/poppler-optcontent.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 8d3a2c9d007052bcb8719200760a1abb6314f804
+Author: Peter Breitenlohner <peb@mppmu.mpg.de>
+Date:   Sun Mar 30 23:34:23 2014 +0200
+
+    Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX
+
+ goo/GooMutex.h          | 3 +++
+ goo/GooTimer.h          | 5 ++++-
+ goo/gfile.h             | 5 ++++-
+ poppler/XpdfPluginAPI.h | 3 +++
+ 4 files changed, 14 insertions(+), 2 deletions(-)
+
+commit 38dcaf96f308265ff6958e4683bcec2be0c254b9
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date:   Fri Mar 28 20:49:17 2014 +1030
+
+    cairo: fix segv cause by bad image stream
+
+    bug 76445
+
+ poppler/CairoOutputDev.cc | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+commit 07b0a038b194eb0392a1e9a4236064d37247d687
+Author: Jakub Wilk <jwilk@jwilk.net>
+Date:   Sun Mar 30 16:12:28 2014 +0200
+
+    pdftohtml: Fix typo in manpage
+
+ utils/pdftohtml.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit ac3c8303396a0b8de5e4ad32f480b8da5f3b396e
+Author: Thomas Liebetraut <thomas@tommie-lie.de>
+Date:   Sun Mar 30 12:25:26 2014 +0200
+
+    glib: Fix the first coord of the qudrilateral in
+    create_poppler_quads_from_annot_quads()
+
+    https://bugs.freedesktop.org/show_bug.cgi?id=76504
+
+ glib/poppler-annot.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 82d69da7c2f67e774c51fb7b146fdf639a6b9616
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Mar 28 15:53:22 2014 +0100
+
+    Fix error reported by ASAN in 3628.asan.0.3910.pdf
+
+    ==20743== ERROR: AddressSanitizer: heap-buffer-overflow on
+    address 0x60040005c6ef at pc 0x7f8912ca0c90 bp 0x7fff8509ee20 sp
+    0x7fff8509ee18
+    READ of size 1 at 0x60040005c6ef thread T0
+        #0 0x7f8912ca0c8f in expandRow(unsigned char*, unsigned char*,
+        int, int, int) /home/tsdgeos/devel/poppler/splash/Splash.cc:4855
+        #1 0x7f8912ca1097 in Splash::scaleImageYuXuBilinear(bool
+        (*)(void*, unsigned char*, unsigned char*), void*,
+        SplashColorMode, int, bool, int, int, int, int, SplashBitmap*)
+        /home/tsdgeos/devel/poppler/splash/Splash.cc:4897
+        #2 0x7f8912c9d2b7 in Splash::scaleImage(bool
+        (*)(void*, unsigned char*, unsigned char*), void*,
+        SplashColorMode, int, bool, int, int, int, int, bool, bool)
+        /home/tsdgeos/devel/poppler/splash/Splash.cc:4127
+        #3 0x7f8912c98101 in Splash::drawImage(bool
+        (*)(void*, unsigned char*, unsigned char*), void*,
+        SplashColorMode, bool, int, int, double*, bool, bool)
+        /home/tsdgeos/devel/poppler/splash/Splash.cc:3726
+        #4 0x7f8912c7056a in
+        SplashOutputDev::drawSoftMaskedImage(GfxState*,
+        Object*, Stream*, int, int, GfxImageColorMap*,
+        bool, Stream*, int, int, GfxImageColorMap*, bool)
+        /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3630
+        #5 0x7f8912ac7aa7 in Gfx::doImage(Object*, Stream*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4646
+        #6 0x7f8912ac4de0 in Gfx::opXObject(Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179
+        #7 0x7f8912a9f33a in Gfx::execOp(Object*, Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+        #8 0x7f8912a9e50f in Gfx::go(bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+        #9 0x7f8912a9e163 in Gfx::display(Object*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+        #10 0x7f8912b80e13 in Page::displaySlice(OutputDev*, double,
+        double, int, bool, bool, int, int, int, int, bool, bool
+        (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+        #11 0x7f8912b8833f in PDFDoc::displayPageSlice(OutputDev*,
+        int, double, double, int, bool, bool, bool, int, int, int, int,
+        bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+        #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+        int, int, int, int, int, double, double, char*)
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+        #13 0x404416 in main
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+        #14 0x7f89121a8ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+        #15 0x401d58 in _start
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ splash/Splash.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 38ec8cbeeaf69d96b9d7bcd662187c8916cf7903
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Mar 28 11:18:02 2014 +0100
+
+    Fix error reported by ASAN in 5782.asan.0.7113.pdf
+
+    ==32161== ERROR: AddressSanitizer: heap-buffer-overflow on
+    address 0x6008000e3bcf at pc 0x7f66bae0e117 bp 0x7fffcb54ea70 sp
+    0x7fffcb54ea68
+    READ of size 1 at 0x6008000e3bcf thread T0
+        #0 0x7f66bae0e116 in GooString::getChar(int)
+        /home/tsdgeos/devel/poppler/goo/GooString.h:119
+        #1 0x7f66bafb5dca in LinkURI::LinkURI(Object*, GooString*)
+        /home/tsdgeos/devel/poppler/poppler/Link.cc:562
+        #2 0x7f66bafb2a05 in LinkAction::parseAction(Object*, GooString*)
+        /home/tsdgeos/devel/poppler/poppler/Link.cc:98
+        #3 0x7f66bae69c0e in AnnotLink::initialize(PDFDoc*, Dict*)
+        /home/tsdgeos/devel/poppler/poppler/Annot.cc:2621
+        #4 0x7f66bae698d9 in AnnotLink::AnnotLink(PDFDoc*, Dict*, Object*)
+        /home/tsdgeos/devel/poppler/poppler/Annot.cc:2596
+        #5 0x7f66bae8d998 in Annots::createAnnot(Dict*, Object*)
+        /home/tsdgeos/devel/poppler/poppler/Annot.cc:6737
+        #6 0x7f66bae8d269 in Annots::Annots(PDFDoc*, int, Object*)
+        /home/tsdgeos/devel/poppler/poppler/Annot.cc:6683
+        #7 0x7f66bafc750d in Page::getAnnots(XRef*)
+        /home/tsdgeos/devel/poppler/poppler/Page.cc:402
+        #8 0x7f66bafc8e66 in Page::displaySlice(OutputDev*, double,
+        double, int, bool, bool, int, int, int, int, bool, bool
+        (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Page.cc:595
+        #9 0x7f66bafd02fd in PDFDoc::displayPageSlice(OutputDev*, int,
+        double, double, int, bool, bool, bool, int, int, int, int,
+        bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+        #10 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+        int, int, int, int, int, double, double, char*)
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+        #11 0x404416 in main
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+        #12 0x7f66ba5f0ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+        #13 0x401d58 in _start
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ poppler/Link.cc | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+commit 49b4eb68ee646aefe49b70f9e2831ebf93576053
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Mar 28 11:08:18 2014 +0100
+
+    Fix error reported by ASAN in 590.asan.0.7288.pdf
+
+    ==31898== ERROR: AddressSanitizer: heap-use-after-free on
+    address 0x60ae0007432c at pc 0x7f03483026aa bp 0x7fff6ec0c820 sp
+    0x7fff6ec0c818
+    READ of size 4 at 0x60ae0007432c thread T0
+        #0 0x7f03483026a9 in SplashFTFont::getGlyphPath(int)
+        /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:414
+        #1 0x7f034829f681 in SplashOutputDev::drawChar(GfxState*,
+        double, double, double, double, double,
+        double, unsigned int, int, unsigned int*, int)
+        /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2239
+        #2 0x7f0348100599 in Gfx::doShowText(GooString*)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+        #3 0x7f03480fddb0 in Gfx::opShowSpaceText(Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+        #4 0x7f03480dc33a in Gfx::execOp(Object*, Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+        #5 0x7f03480db50f in Gfx::go(bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+        #6 0x7f03480db163 in Gfx::display(Object*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+        #7 0x7f03481bddd1 in Page::displaySlice(OutputDev*, double,
+        double, int, bool, bool, int, int, int, int, bool, bool
+        (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+        #8 0x7f03481c52fd in PDFDoc::displayPageSlice(OutputDev*, int,
+        double, double, int, bool, bool, bool, int, int, int, int,
+        bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+        #9 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+        int, int, int, int, int, double, double, char*)
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+        #10 0x404416 in main
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+        #11 0x7f03477e5ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+        #12 0x401d58 in _start
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ splash/SplashFTFont.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 89a64b508e5f8445798c95fcec6c87180f6c9b73
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Fri Mar 28 00:35:17 2014 +0100
+
+    Fix error reported by ASAN in 2279.asan.0.1904.pdf
+
+    ==20507== ERROR: AddressSanitizer: heap-buffer-overflow on
+    address 0x60420000ff04 at pc 0x7fa1492e8012 bp 0x7fff8406d900 sp
+    0x7fff8406d8f8
+    READ of size 4 at 0x60420000ff04 thread T0
+        #0 0x7fa1492e8011 in SplashFTFont::makeGlyph(int, int, int,
+        SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+        /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:284
+        #1 0x7fa1492eda32 in SplashFont::getGlyph(int, int, int,
+        SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+        /home/tsdgeos/devel/poppler/splash/SplashFont.cc:168
+        #2 0x7fa1492e7c69 in SplashFTFont::getGlyph(int, int, int,
+        SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+        /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
+        #3 0x7fa1492b3368 in Splash::fillChar(double, double, int,
+        SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
+        #4 0x7fa149286a20 in SplashOutputDev::drawChar(GfxState*,
+        double, double, double, double, double,
+        double, unsigned int, int, unsigned int*, int)
+        /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
+        #5 0x7fa1490e7599 in Gfx::doShowText(GooString*)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+        #6 0x7fa1490e4db0 in Gfx::opShowSpaceText(Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+        #7 0x7fa1490c333a in Gfx::execOp(Object*, Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+        #8 0x7fa1490c250f in Gfx::go(bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+        #9 0x7fa1490c2163 in Gfx::display(Object*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+        #10 0x7fa1491a4dd1 in Page::displaySlice(OutputDev*, double,
+        double, int, bool, bool, int, int, int, int, bool, bool
+        (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+        #11 0x7fa1491ac2fd in PDFDoc::displayPageSlice(OutputDev*,
+        int, double, double, int, bool, bool, bool, int, int, int, int,
+        bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+        #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+        int, int, int, int, int, double, double, char*)
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+        #13 0x404416 in main
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+        #14 0x7fa1487ccec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+        #15 0x401d58 in _start
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ splash/SplashFTFont.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 5055479634dc8d0cd5afb3373de600fb121357fe
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Mar 27 23:54:20 2014 +0100
+
+    Fix error reported by ASAN in 2010.asan.0.1506.pdf
+
+    ==18859== ERROR: AddressSanitizer: unknown-crash on address
+    0x7f1e4a6beb50 at pc 0x7f1e5557444d bp 0x7fff6af3c340 sp
+    0x7fff6af3bb00
+    WRITE of size 442216446 at 0x7f1e4a6beb50 thread T0
+        #0 0x7f1e5557444c (/usr/lib/x86_64-linux-gnu/libasan.so.0+0xe44c)
+        #1 0x7f1e550e04ff in SplashFont::getGlyph(int, int, int,
+        SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+        /home/tsdgeos/devel/poppler/splash/SplashFont.cc:206
+        #2 0x7f1e550d9c69 in SplashFTFont::getGlyph(int, int, int,
+        SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*)
+        /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233
+        #3 0x7f1e550a5368 in Splash::fillChar(double, double, int,
+        SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714
+        #4 0x7f1e55078a20 in SplashOutputDev::drawChar(GfxState*,
+        double, double, double, double, double,
+        double, unsigned int, int, unsigned int*, int)
+        /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270
+        #5 0x7f1e54ed9599 in Gfx::doShowText(GooString*)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054
+        #6 0x7f1e54ed6db0 in Gfx::opShowSpaceText(Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886
+        #7 0x7f1e54eb533a in Gfx::execOp(Object*, Object*, int)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903
+        #8 0x7f1e54eb450f in Gfx::go(bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762
+        #9 0x7f1e54eb4163 in Gfx::display(Object*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728
+        #10 0x7f1e54f96dd1 in Page::displaySlice(OutputDev*, double,
+        double, int, bool, bool, int, int, int, int, bool, bool
+        (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/Page.cc:585
+        #11 0x7f1e54f9e2fd in PDFDoc::displayPageSlice(OutputDev*,
+        int, double, double, int, bool, bool, bool, int, int, int, int,
+        bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool)
+        /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503
+        #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*,
+        int, int, int, int, int, double, double, char*)
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222
+        #13 0x404416 in main
+        /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521
+        #14 0x7f1e545beec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4)
+        #15 0x401d58 in _start
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ splash/SplashFont.cc | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+commit 3e7779935ec2610410bc4a42e9b0174e41ca9672
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Mar 27 16:49:57 2014 +0100
+
+    Fix error reported by ASAN in 139.asan.0.581.pdf
+
+    ==15244== ERROR: AddressSanitizer: SEGV on unknown address
+    0x605df000f3ee (pc 0x7f1087b3a22e sp 0x7fffec30ff20 bp 0x7fffec30ff80
+    T0)
+    AddressSanitizer can not provide additional info.
+        #0 0x7f1087b3a22d
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x48f22d)
+        #1 0x7f1087b19d92
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x46ed92)
+        #2 0x7f1087ae570b
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x43a70b)
+        #3 0x7f1087ae4061
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x439061)
+        #4 0x7f1087ab9b38
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x40eb38)
+        #5 0x7f1087900989
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x255989)
+        #6 0x7f10878f733a
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24c33a)
+        #7 0x7f10878f650f
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b50f)
+        #8 0x7f10878f6163
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b163)
+        #9 0x7f10879d8dd1
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x32ddd1)
+        #10 0x7f10879e02fd
+        (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x3352fd)
+        #11 0x40311e
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x40311e)
+        #12 0x404416
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x404416)
+        #13 0x7f1087000ec4 (/lib/x86_64-linux-gnu/libc-2.19.so+0x21ec4)
+        #14 0x401d58
+        (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58)
+
+ splash/SplashXPathScanner.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 23ad7fa5253a4fec6543d1435827aa1b59b62ced
+Author: Albert Astals Cid <aacid@kde.org>
+Date:   Thu Mar 27 01:14:05 2014 +0100
+
+    0.25.2
+
+ CMakeLists.txt                  |  4 ++--
+ NEWS                            | 48
+ +++++++++++++++++++++++++++++++++++++++++
+ configure.ac                    |  2 +-
+ cpp/Doxyfile                    |  2 +-
+ gtk-doc.make                    | 33 +++++++++++++++++++---------
+ m4/gtk-doc.m4                   | 47
+ +++++++++++++++++++++++++++-------------
+ poppler/CairoOutputDev.h        |  2 +-
+ poppler/Hints.cc                |  2 +-
+ poppler/Makefile.am             |  2 +-
+ poppler/PSOutputDev.cc          |  3 ++-
+ poppler/PSOutputDev.h           |  2 +-
+ poppler/StructElement.cc        |  2 +-
+ poppler/StructElement.h         |  2 +-
+ poppler/StructTreeRoot.cc       |  2 +-
+ poppler/StructTreeRoot.h        |  2 +-
+ qt4/src/CMakeLists.txt          |  2 +-
+ qt4/src/Doxyfile                |  2 +-
+ qt4/src/Makefile.am             |  2 +-
+ qt4/src/poppler-ps-converter.cc |  1 +
+ qt5/src/CMakeLists.txt          |  2 +-
+ qt5/src/Doxyfile                |  2 +-
+ qt5/src/Makefile.am             |  2 +-
+ qt5/src/poppler-ps-converter.cc |  1 +
+ utils/pdftocairo.cc             |  2 +-
+ utils/pdftops.cc                |  1 +
+ 25 files changed, 127 insertions(+), 45 deletions(-)
+
 commit ec2f8bca9f48935d3180dab65ef2ca455a893afd
 Author: Albert Astals Cid <aacid@kde.org>
 Date:   Wed Mar 26 18:38:13 2014 +0100
diff --git a/Build/source/libs/poppler/poppler-0.25.2/ConfigureChecks.cmake b/Build/source/libs/poppler/poppler-0.26.1/ConfigureChecks.cmake
index d3f57325720..d3f57325720 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/ConfigureChecks.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/ConfigureChecks.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/INSTALL b/Build/source/libs/poppler/poppler-0.26.1/INSTALL
index 56b077d6a0b..56b077d6a0b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/INSTALL
+++ b/Build/source/libs/poppler/poppler-0.26.1/INSTALL
diff --git a/Build/source/libs/poppler/poppler-0.25.2/Makefile.am b/Build/source/libs/poppler/poppler-0.26.1/Makefile.am
index e7e5bace9d4..e7e5bace9d4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.26.1/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.2/NEWS b/Build/source/libs/poppler/poppler-0.26.1/NEWS
index 12e6f400cb8..9522bfe3913 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/NEWS
+++ b/Build/source/libs/poppler/poppler-0.26.1/NEWS
@@ -1,3 +1,47 @@
+Release 0.26.1
+        core:
+         * Use field value V for radio buttons. Bug #75979
+         * Fix extraction of text in some files. Bug #78145
+         * Only add annotations of the current page when splitting. Bug #77549
+
+        build system:
+         * autoconf: Fix libopenjpeg 1.5 detection on some systems. Bug #78389
+
+        glib:
+         * Fix multiple definition of PopplerTextSpan
+
+Release 0.26.0
+        qt4:
+         * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent
+
+        qt5:
+         * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent
+
+        core:
+         * Very small code cleanup
+
+        cpp:
+         * Very small code cleanup
+
+Release 0.25.3
+        core:
+         * Fix crashes on broken files
+         * Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX
+         * Fix some small memory leaks
+
+        qt5:
+         * Fix some kinds of OCG models
+         * Cleanup some deprecated methods
+
+        glib:
+         * Fix the first coord of the quadrilateral in create_poppler_quads_from_annot_quads(). Bug #76504
+
+        utils:
+         * pdftohtml: Fix typo in manpage
+
+        qt4:
+         * Fix some kinds of OCG models
+
 Release 0.25.2
         core:
          * Tagged-PDF support
diff --git a/Build/source/libs/poppler/poppler-0.25.2/README b/Build/source/libs/poppler/poppler-0.26.1/README
index fa223900fbf..fa223900fbf 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/README
+++ b/Build/source/libs/poppler/poppler-0.26.1/README
diff --git a/Build/source/libs/poppler/poppler-0.25.2/README-XPDF b/Build/source/libs/poppler/poppler-0.26.1/README-XPDF
index e97791ce5b2..e97791ce5b2 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/README-XPDF
+++ b/Build/source/libs/poppler/poppler-0.26.1/README-XPDF
diff --git a/Build/source/libs/poppler/poppler-0.25.2/TODO b/Build/source/libs/poppler/poppler-0.26.1/TODO
index e067c2a3156..e067c2a3156 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/TODO
+++ b/Build/source/libs/poppler/poppler-0.26.1/TODO
diff --git a/Build/source/libs/poppler/poppler-0.25.2/config.h.cmake b/Build/source/libs/poppler/poppler-0.26.1/config.h.cmake
index b707ba72249..b707ba72249 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/config.h.in b/Build/source/libs/poppler/poppler-0.26.1/config.h.in
index 12fb1a09ec6..12fb1a09ec6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/config.h.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/configure.ac b/Build/source/libs/poppler/poppler-0.26.1/configure.ac
index b21d83eca26..bffec484967 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/configure.ac
+++ b/Build/source/libs/poppler/poppler-0.26.1/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[25])
-m4_define([poppler_version_micro],[2])
+m4_define([poppler_version_minor],[26])
+m4_define([poppler_version_micro],[1])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
 AC_PREREQ(2.59)
@@ -173,7 +173,10 @@ if test x$enable_libopenjpeg = xyes; then
   AC_DEFINE(ENABLE_LIBOPENJPEG)
   PKG_CHECK_EXISTS(libopenjpeg >= 1.5,
       [AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])],
-      [])
+      [PKG_CHECK_EXISTS(libopenjpeg1 >= 1.5,
+       [AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])],
+       [])
+      ])
 fi
 
 AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes)
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.cc b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiBase.cc
index 86bafd80208..86bafd80208 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiBase.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.h b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiBase.h
index d613acd2bb1..d613acd2bb1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiBase.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiBase.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.cc b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiEncodings.cc
index 5cea6fab7f1..5cea6fab7f1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiEncodings.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.h b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiEncodings.h
index ab80ad362a6..ab80ad362a6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiEncodings.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiEncodings.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.cc b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiIdentifier.cc
index be28e2568eb..be28e2568eb 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiIdentifier.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.h b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiIdentifier.h
index af1323b76d6..af1323b76d6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiIdentifier.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiIdentifier.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.cc b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiTrueType.cc
index cd11d6ff2c6..cd11d6ff2c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiTrueType.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.h b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiTrueType.h
index b40a44a8d70..b40a44a8d70 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiTrueType.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiTrueType.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.cc b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1.cc
index 8fa10a016b6..8fa10a016b6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.h b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1.h
index f4e29b4ef0b..f4e29b4ef0b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.cc b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1C.cc
index c4595a3260e..c4595a3260e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1C.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.h b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1C.h
index 698dccd77fd..698dccd77fd 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/FoFiType1C.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/FoFiType1C.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/fofi/Makefile.am b/Build/source/libs/poppler/poppler-0.26.1/fofi/Makefile.am
index c4654dd28b9..c4654dd28b9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/fofi/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.26.1/fofi/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/FixedPoint.cc
index 26b2f0fe890..26b2f0fe890 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/FixedPoint.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.h b/Build/source/libs/poppler/poppler-0.26.1/goo/FixedPoint.h
index 99749802db7..99749802db7 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/FixedPoint.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/FixedPoint.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/GooHash.cc
index f4a92f17506..f4a92f17506 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooHash.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.h b/Build/source/libs/poppler/poppler-0.26.1/goo/GooHash.h
index eda19e31409..eda19e31409 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooHash.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooHash.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooLikely.h b/Build/source/libs/poppler/poppler-0.26.1/goo/GooLikely.h
index 724ccf00870..724ccf00870 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooLikely.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooLikely.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/GooList.cc
index 6ce4952dc6a..6ce4952dc6a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooList.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.h b/Build/source/libs/poppler/poppler-0.26.1/goo/GooList.h
index c83a0e36a8a..c83a0e36a8a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooList.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooList.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooMutex.h b/Build/source/libs/poppler/poppler-0.26.1/goo/GooMutex.h
index 5fef47ee694..b2714b048c7 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooMutex.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooMutex.h
@@ -20,6 +20,7 @@
 // Copyright (C) 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+// Copyright (C) 2014 Peter Breitenlohner <peb@mppmu.mpg.de>
 //
 // 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
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooString.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/GooString.cc
index 8591d95cd3e..8591d95cd3e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooString.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooString.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooString.h b/Build/source/libs/poppler/poppler-0.26.1/goo/GooString.h
index b8020b62992..b8020b62992 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooString.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooString.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/GooTimer.cc
index c766c6bf2e4..c766c6bf2e4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooTimer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.h b/Build/source/libs/poppler/poppler-0.26.1/goo/GooTimer.h
index d5957b0658b..ac64f6b4868 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/GooTimer.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/GooTimer.h
@@ -8,7 +8,8 @@
 // Copyright 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright 2010 Hib Eris <hib@hiberis.nl>
 // Copyright 2011 Albert Astals cid <aacid@kde.org>
-// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+// Copyright 2014 Bogdan Cristea <cristeab@gmail.com>
+// Copyright 2014 Peter Breitenlohner <peb@mppmu.mpg.de>
 // Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
 //
 //========================================================================
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/ImgWriter.cc
index a30d26d89ad..a30d26d89ad 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/ImgWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.h b/Build/source/libs/poppler/poppler-0.26.1/goo/ImgWriter.h
index 8feb3511e4d..8feb3511e4d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/ImgWriter.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/ImgWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/JpegWriter.cc
index 9b7c5051838..9b7c5051838 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/JpegWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.h b/Build/source/libs/poppler/poppler-0.26.1/goo/JpegWriter.h
index d69bbbb8dda..d69bbbb8dda 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/JpegWriter.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/JpegWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/Makefile.am b/Build/source/libs/poppler/poppler-0.26.1/goo/Makefile.am
index a48b20ec493..a48b20ec493 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/NetPBMWriter.cc
index fca00b26b1a..fca00b26b1a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/NetPBMWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.h b/Build/source/libs/poppler/poppler-0.26.1/goo/NetPBMWriter.h
index 21a19ee7508..21a19ee7508 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/NetPBMWriter.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/NetPBMWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/PNGWriter.cc
index c9d5199d040..c9d5199d040 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/PNGWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.h b/Build/source/libs/poppler/poppler-0.26.1/goo/PNGWriter.h
index 90a298e7ef3..90a298e7ef3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/PNGWriter.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/PNGWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/TiffWriter.cc
index 316008778b1..316008778b1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/TiffWriter.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.h b/Build/source/libs/poppler/poppler-0.26.1/goo/TiffWriter.h
index 52fdd53efa5..52fdd53efa5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/TiffWriter.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/TiffWriter.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/gfile.cc
index 6fd4cbad105..6fd4cbad105 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gfile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.h b/Build/source/libs/poppler/poppler-0.26.1/goo/gfile.h
index d4c8d92e081..1365a9cf2ab 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gfile.h
@@ -21,6 +21,7 @@
 // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+// Copyright (C) 2014 Peter Breitenlohner <peb@mppmu.mpg.de>
 //
 // 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
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/gmem.cc
index c1c607ac3f3..c1c607ac3f3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gmem.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.h b/Build/source/libs/poppler/poppler-0.26.1/goo/gmem.h
index 898f33933f9..898f33933f9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gmem.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gmem.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gmempp.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/gmempp.cc
index a70338ca3ce..a70338ca3ce 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gmempp.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gmempp.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/grandom.cc
index 1237175420b..1237175420b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/grandom.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.h b/Build/source/libs/poppler/poppler-0.26.1/goo/grandom.h
index 45fa791aba8..45fa791aba8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/grandom.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/grandom.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.cc b/Build/source/libs/poppler/poppler-0.26.1/goo/gstrtod.cc
index cd1d5b554f7..cd1d5b554f7 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gstrtod.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.h b/Build/source/libs/poppler/poppler-0.26.1/goo/gstrtod.h
index e8abdadf53e..e8abdadf53e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gstrtod.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gstrtod.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes.h b/Build/source/libs/poppler/poppler-0.26.1/goo/gtypes.h
index a8d4519497e..a8d4519497e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gtypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes_p.h b/Build/source/libs/poppler/poppler-0.26.1/goo/gtypes_p.h
index cc4866e1389..cc4866e1389 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/goo/gtypes_p.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/goo/gtypes_p.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/gtk-doc.make b/Build/source/libs/poppler/poppler-0.26.1/gtk-doc.make
index e7916563d75..e7916563d75 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/gtk-doc.make
+++ b/Build/source/libs/poppler/poppler-0.26.1/gtk-doc.make
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-cairo-uninstalled.pc.in
index 2458eb20df8..2458eb20df8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-cairo-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler-cairo.pc.cmake
index b32f118314b..b32f118314b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-cairo.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-cairo.pc.in
index 367a5b690bf..367a5b690bf 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-cairo.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-cairo.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-cpp-uninstalled.pc.in
index af3640eb2c1..af3640eb2c1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-cpp-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler-cpp.pc.cmake
index 3f56b3d9d90..3f56b3d9d90 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-cpp.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-cpp.pc.in
index a7e97c25dfe..a7e97c25dfe 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-cpp.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-cpp.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-glib-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-glib-uninstalled.pc.in
index 5506c4e53ac..5506c4e53ac 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-glib-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-glib-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler-glib.pc.cmake
index e15e6699a43..e15e6699a43 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-glib.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-glib.pc.in
index cd30feb728f..cd30feb728f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-glib.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-glib.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt4-uninstalled.pc.in
index 3a336c6c294..3a336c6c294 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt4-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt4.pc.cmake
index b17fd5d8453..b17fd5d8453 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt4.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt4.pc.in
index 306ae46e0b0..306ae46e0b0 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt4.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt4.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt5-uninstalled.pc.in
index a91e1d5a3bd..a91e1d5a3bd 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt5-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt5.pc.cmake
index b4d87b76675..b4d87b76675 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt5.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt5.pc.in
index cda4c6f80fe..cda4c6f80fe 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-qt5.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-qt5.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-splash-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-splash-uninstalled.pc.in
index 436ecdb8f1b..436ecdb8f1b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-splash-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-splash-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler-splash.pc.cmake
index cb95b3d2d27..cb95b3d2d27 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-splash.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-splash.pc.in
index cf3491fc7cf..cf3491fc7cf 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-splash.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-splash.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler-uninstalled.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler-uninstalled.pc.in
index 6076e80c5b3..6076e80c5b3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler-uninstalled.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler-uninstalled.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler.pc.cmake
index f1aebedbefd..f1aebedbefd 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler.pc.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.in b/Build/source/libs/poppler/poppler-0.26.1/poppler.pc.in
index 8605b28673b..8605b28673b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler.pc.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler.pc.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Annot.cc
index ab48be63346..fa29739a19a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Annot.cc
@@ -29,6 +29,7 @@
 // Copyright (C) 2012 Tobias Koenig <tokoe@kdab.com>
 // Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2014 Marek Kasik <mkasik@redhat.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -4926,7 +4927,8 @@ void AnnotWidget::drawFormFieldButton(GfxResources *resources, GooString *da) {
   switch (static_cast<FormFieldButton *>(field)->getButtonType()) {
   case formButtonRadio: {
     //~ Acrobat doesn't draw a caption if there is no AP dict (?)
-    if (appearState && appearState->cmp("Off") != 0) {
+    if (appearState && appearState->cmp("Off") != 0 &&
+        static_cast<FormFieldButton *>(field)->getState(appearState->getCString())) {
       if (caption) {
         drawText(caption, da, resources, gFalse, 0, fieldQuadCenter,
                  gFalse, gTrue);
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Annot.h
index 8fde6a6736b..8fde6a6736b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Annot.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Annot.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Array.cc
index 230c3287683..230c3287683 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Array.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Array.h
index e78e399baf2..e78e399baf2 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Array.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Array.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFont.cc
index 20a297d6135..20a297d6135 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFont.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFont.h
index bbdd0558e9f..bbdd0558e9f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFont.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFontTables.cc
index 5115b7bcf13..5115b7bcf13 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFontTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFontTables.h
index eb45549efd2..eb45549efd2 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/BuiltinFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/BuiltinFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CMap.cc
index 6731ab5a1fa..6731ab5a1fa 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CMap.h
index f4f5a9141c8..f4f5a9141c8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CMap.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CMap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CachedFile.cc
index b0ae8388113..b0ae8388113 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CachedFile.h
index b99ea1ecad4..b99ea1ecad4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoFontEngine.cc
index 1546594f9ea..1546594f9ea 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoFontEngine.h
index 8c0dba116d5..8c0dba116d5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoOutputDev.cc
index 77bd2458714..f31b46bd44f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoOutputDev.cc
@@ -20,7 +20,7 @@
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 // Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2008 Carl Worth <cworth@cworth.org>
-// Copyright (C) 2008-2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008-2014 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
 // Copyright (C) 2008, 2012 Hib Eris <hib@hiberis.nl>
@@ -2731,6 +2731,7 @@ private:
   GfxImageColorMap *colorMap;
   int *maskColors;
   int current_row;
+  GBool imageError;
 
 public:
   cairo_surface_t *getSourceImage(Stream *str,
@@ -2747,6 +2748,7 @@ public:
     maskColors = maskColorsA;
     width = widthA;
     current_row = -1;
+    imageError = gFalse;
 
     /* TODO: Do we want to cache these? */
     imgStr = new ImageStream(str, width,
@@ -2837,7 +2839,13 @@ public:
       current_row++;
     }
 
-    if (lookup) {
+    if (unlikely(pix == NULL)) {
+      memset(row_data, 0, width*4);
+      if (!imageError) {
+	error(errInternal, -1, "Bad image stream");
+	imageError = gTrue;
+      }
+    } else if (lookup) {
       Guchar *p = pix;
       GfxRGB rgb;
 
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoOutputDev.h
index 28f97fdda32..28f97fdda32 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoRescaleBox.cc
index 3c96f45e5d3..3c96f45e5d3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoRescaleBox.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoRescaleBox.h
index 072e8a9c80c..072e8a9c80c 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CairoRescaleBox.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CairoRescaleBox.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Catalog.cc
index 446434687ba..446434687ba 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Catalog.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Catalog.h
index bc9ce20b098..bc9ce20b098 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Catalog.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Catalog.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CharCodeToUnicode.cc
index 16ba6d48649..16ba6d48649 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CharCodeToUnicode.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CharCodeToUnicode.h
index 1672105a8f4..1672105a8f4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CharCodeToUnicode.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CharCodeToUnicode.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CharTypes.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CharTypes.h
index d0df630d0c9..d0df630d0c9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CharTypes.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CharTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CompactFontTables.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CompactFontTables.h
index cfbfdaf5752..cfbfdaf5752 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CompactFontTables.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CompactFontTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlCachedFile.cc
index af4c2b60322..af4c2b60322 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlCachedFile.h
index 49882aba8ac..49882aba8ac 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlPDFDocBuilder.cc
index 5b02b14a784..5b02b14a784 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlPDFDocBuilder.h
index fb34862057c..fb34862057c 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/CurlPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/CurlPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/DCTStream.cc
index bfdb0eaf80a..bfdb0eaf80a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/DCTStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/DCTStream.h
index bc20a7aaab6..bc20a7aaab6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/DCTStream.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/DCTStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/DateInfo.cc
index 563204a1743..563204a1743 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/DateInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/DateInfo.h
index 116350f4134..116350f4134 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/DateInfo.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/DateInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Decrypt.cc
index ba44f959c31..ba44f959c31 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Decrypt.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Decrypt.h
index 10a6386c6b5..10a6386c6b5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Decrypt.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Decrypt.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Dict.cc
index 4cf42dcd2c1..4cf42dcd2c1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Dict.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Dict.h
index fba99edc513..fba99edc513 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Dict.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Dict.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Error.cc
index 99ca3ad3f53..99ca3ad3f53 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Error.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Error.h
index 9e11733d803..9e11733d803 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Error.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Error.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/ErrorCodes.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/ErrorCodes.h
index b28528df564..b28528df564 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/ErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/ErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/FileSpec.cc
index bac1eaea0d7..bac1eaea0d7 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FileSpec.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/FileSpec.h
index 9f2f6fcd131..9f2f6fcd131 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FileSpec.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FileSpec.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/FlateStream.cc
index 7990dadd821..7990dadd821 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FlateStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/FlateStream.h
index 9e3835f042a..9e3835f042a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FlateStream.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FlateStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontEncodingTables.cc
index 6ebef787421..6ebef787421 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontEncodingTables.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontEncodingTables.h
index a417b324e48..a417b324e48 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontEncodingTables.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontEncodingTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontInfo.cc
index 8fc89e9d827..8fc89e9d827 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontInfo.h
index 615b6793de3..615b6793de3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/FontInfo.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/FontInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Form.cc
index 661ed8972df..661ed8972df 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Form.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Form.h
index 3778ff6f2ef..3778ff6f2ef 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Form.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Form.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Function.cc
index 67283dffe9f..67283dffe9f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Function.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Function.h
index 90e2a768ad0..90e2a768ad0 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Function.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Function.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Gfx.cc
index 90bf41e4965..90bf41e4965 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Gfx.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Gfx.h
index a82f9f4af24..a82f9f4af24 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Gfx.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Gfx.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxFont.cc
index 9eadcc79cff..6f6a125050d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxFont.cc
@@ -13,7 +13,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005, 2006, 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2006, 2008-2010, 2012, 2014 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -31,6 +31,7 @@
 // Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2013, 2014 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2014 Olly Betts <olly@survex.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -764,8 +765,8 @@ GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
     }
     substName = new GooString(base14SubstFonts[substIdx]);
     if (ps) {
-      error(errSyntaxWarning, -1, "Substituting font '{0:s}' for '{1:t}'",
-	    base14SubstFonts[substIdx], name ? name : new GooString("null"));
+      error(errSyntaxWarning, -1, "Substituting font '{0:s}' for '{1:s}'",
+	    base14SubstFonts[substIdx], name ? name->getCString() : "null");
       fontLoc = new GfxFontLoc();
       fontLoc->locType = gfxFontLocResident;
       fontLoc->fontType = fontType1;
@@ -777,8 +778,8 @@ GfxFontLoc *GfxFont::locateFont(XRef *xref, GBool ps) {
       delete substName;
       if (path) {
 	if ((fontLoc = getExternalFont(path, gFalse))) {
-	  error(errSyntaxWarning, -1, "Substituting font '{0:s}' for '{1:t}'",
-		  base14SubstFonts[substIdx], (name == NULL) ? new GooString("") : name);
+	  error(errSyntaxWarning, -1, "Substituting font '{0:s}' for '{1:s}'",
+		  base14SubstFonts[substIdx], name ? name->getCString() : "");
 	  name = new GooString(base14SubstFonts[substIdx]);
 	  fontLoc->substIdx = substIdx;
 	  return fontLoc;
@@ -1386,7 +1387,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA
   // existing entries in ctu, i.e., the ToUnicode CMap takes
   // precedence, but the other encoding info is allowed to fill in any
   // holes
-  readToUnicodeCMap(fontDict, 8, ctu);
+  readToUnicodeCMap(fontDict, 16, ctu);
 
   // look for a Unicode-to-Unicode mapping
   if (name && (utu = globalParams->getUnicodeToUnicode(name))) {
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxFont.h
index f9806681102..f9806681102 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxFont.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxState.cc
index addba68606c..eb11777cef5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxState.cc
@@ -3720,7 +3720,7 @@ GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, OutputDev *out, GfxSta
   dict->lookup("Function", &obj1);
   if (obj1.isArray()) {
     nFuncsA = obj1.arrayGetLength();
-    if (nFuncsA > gfxColorMaxComps) {
+    if (nFuncsA > gfxColorMaxComps || nFuncsA <= 0) {
       error(errSyntaxWarning, -1, "Invalid Function array in shading dictionary");
       goto err1;
     }
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxState.h
index 106b2c0bf00..106b2c0bf00 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxState.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState_helpers.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxState_helpers.h
index bc0024edd79..bc0024edd79 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GfxState_helpers.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GfxState_helpers.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/GlobalParams.cc
index 3d88646f7b3..3d88646f7b3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GlobalParams.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/GlobalParams.h
index c33a8024c04..c33a8024c04 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParams.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GlobalParams.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParamsWin.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/GlobalParamsWin.cc
index 084b49bf639..084b49bf639 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/GlobalParamsWin.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/GlobalParamsWin.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Hints.cc
index bdd0d322612..bdd0d322612 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Hints.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Hints.h
index f46c07f673b..f46c07f673b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Hints.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Hints.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/JArithmeticDecoder.cc
index d23f7ea3887..d23f7ea3887 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JArithmeticDecoder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/JArithmeticDecoder.h
index 3c3e6fed0e5..3c3e6fed0e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JArithmeticDecoder.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JArithmeticDecoder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/JBIG2Stream.cc
index 4c5512311f6..0695dc5da0e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JBIG2Stream.cc
@@ -2290,8 +2290,8 @@ void JBIG2Stream::readTextRegionSeg(Guint segNum, GBool imm,
 
  codeTableError:
   error(errSyntaxError, curStr->getPos(), "Missing code table in JBIG2 text region");
-  gfree(codeTables);
-  delete syms;
+  delete codeTables;
+  gfree(syms);
   return;
 
  eofError:
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/JBIG2Stream.h
index 0ee2518575c..0ee2518575c 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JBIG2Stream.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JBIG2Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPEG2000Stream.cc
index 703d471c99a..703d471c99a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPEG2000Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPEG2000Stream.h
index 3feccbef06d..3feccbef06d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPEG2000Stream.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPEG2000Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPXStream.cc
index 1476e6a0cfe..1476e6a0cfe 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPXStream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPXStream.h
index 30855431fb4..30855431fb4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/JPXStream.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/JPXStream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Lexer.cc
index c62052998b8..c62052998b8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Lexer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Lexer.h
index 02b6cdc6923..02b6cdc6923 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Lexer.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Lexer.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Linearization.cc
index 33331d1af37..33331d1af37 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Linearization.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Linearization.h
index 6728a750aba..6728a750aba 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Linearization.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Linearization.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Link.cc
index 20184d1376c..4ab5f52ceda 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Link.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2006, 2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
-// Copyright (C) 2008-2010, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008-2010, 2012-2014 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2012 Tobias Koening <tobias.koenig@kdab.com>
@@ -559,9 +559,11 @@ LinkURI::LinkURI(Object *uriObj, GooString *baseURI) {
       // relative URI
       if (baseURI) {
 	uri = baseURI->copy();
-	c = uri->getChar(uri->getLength() - 1);
-	if (c != '/' && c != '?') {
-	  uri->append('/');
+	if (uri->getLength() > 0) {
+	  c = uri->getChar(uri->getLength() - 1);
+	  if (c != '/' && c != '?') {
+	    uri->append('/');
+	  }
 	}
 	if (uri2->getChar(0) == '/') {
 	  uri->append(uri2->getCString() + 1, uri2->getLength() - 1);
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Link.h
index fc2abe60052..fc2abe60052 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Link.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Link.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/LocalPDFDocBuilder.cc
index 6f6f1fca9f7..6f6f1fca9f7 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/LocalPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/LocalPDFDocBuilder.h
index c2b1d903885..c2b1d903885 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/LocalPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/LocalPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Makefile.am b/Build/source/libs/poppler/poppler-0.26.1/poppler/Makefile.am
index ce6f4b2d17d..ce6f4b2d17d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/MarkedContentOutputDev.cc
index 7fdd8f54c53..7fdd8f54c53 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/MarkedContentOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/MarkedContentOutputDev.h
index 4ea60c255a1..4ea60c255a1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/MarkedContentOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/MarkedContentOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Movie.cc
index f68b6adcd4d..f68b6adcd4d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Movie.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Movie.h
index 1a162659179..1a162659179 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Movie.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Movie.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/NameToCharCode.cc
index 5448dc4ce10..5448dc4ce10 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/NameToCharCode.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/NameToCharCode.h
index 5b1092bb96b..5b1092bb96b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToCharCode.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/NameToCharCode.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToUnicodeTable.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/NameToUnicodeTable.h
index 827edbaee60..827edbaee60 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/NameToUnicodeTable.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/NameToUnicodeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Object.cc
index d06bb39fb6d..d06bb39fb6d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Object.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Object.h
index 15bea159857..15bea159857 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Object.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Object.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/OptionalContent.cc
index e0d49bc9a5f..e0d49bc9a5f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/OptionalContent.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/OptionalContent.h
index 2e416462003..2e416462003 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/OptionalContent.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/OptionalContent.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Outline.cc
index bd4e6d01b6d..bd4e6d01b6d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Outline.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Outline.h
index 90190e69280..90190e69280 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Outline.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Outline.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/OutputDev.cc
index ee3cf5a30ff..ee3cf5a30ff 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/OutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/OutputDev.h
index e8a7a4794ce..e8a7a4794ce 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/OutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/OutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDoc.cc
index 4f3ab3115fa..e427d2b40ff 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDoc.cc
@@ -26,7 +26,7 @@
 // Copyright (C) 2010 Ilya Gorenbein <igorenbein@finjan.com>
 // Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com>
 // Copyright (C) 2010 Philip Lorenz <lorenzph+freedesktop@gmail.com>
-// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
@@ -686,10 +686,15 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
   infoObj.free();
   
   // get and mark output intents etc.
-  Object catObj, pagesObj, resourcesObj;
+  Object catObj, pagesObj, resourcesObj, annotsObj, afObj;
   getXRef()->getCatalog(&catObj);
   Dict *catDict = catObj.getDict();
   catDict->lookup("Pages", &pagesObj);
+  catDict->lookupNF("AcroForm", &afObj);
+  if (!afObj.isNull()) {
+    markAcroForm(&afObj, yRef, countRef, 0, refPage->num, rootNum + 2);
+    afObj.free();
+  }
   Dict *pagesDict = pagesObj.getDict();
   pagesDict->lookup("Resources", &resourcesObj);
   if (resourcesObj.isDict())
@@ -698,6 +703,11 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
 
   Dict *pageDict = page.getDict();
   markPageObjects(pageDict, yRef, countRef, 0);
+  pageDict->lookupNF("Annots", &annotsObj);
+  if (!annotsObj.isNull()) {
+    markAnnotations(&annotsObj, yRef, countRef, 0, refPage->num, rootNum + 2);
+    annotsObj.free();
+  }
   yRef->markUnencrypted();
   Guint objectsCount = writePageObjects(outStr, yRef, 0);
 
@@ -1569,6 +1579,9 @@ void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint n
     Object value; pageDict->getValNF(n, &value);
     if (strcmp(key, "Parent") != 0 &&
 	      strcmp(key, "Pages") != 0 &&
+	      strcmp(key, "AcroForm") != 0 &&
+	      strcmp(key, "Annots") != 0 &&
+	      strcmp(key, "P") != 0 &&
         strcmp(key, "Root") != 0) {
       markObject(&value, xRef, countRef, numOffset);
     }
@@ -1576,6 +1589,142 @@ void PDFDoc::markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint n
   }
 }
 
+GBool PDFDoc::markAnnotations(Object *annotsObj, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum) {
+  Object annots;
+  GBool modified = gFalse;
+  annotsObj->fetch(getXRef(), &annots);
+  if (annots.isArray()) {
+      Array *array = annots.getArray();
+      for (int i=array->getLength() - 1; i >= 0; i--) {
+        Object obj1;
+        if (array->get(i, &obj1)->isDict()) {
+          Object type;
+          Dict *dict = obj1.getDict();
+          dict->lookup("Type", &type);
+          if (type.isName() && strcmp(type.getName(), "Annot") == 0) {
+            Object obj2;
+            if (dict->lookupNF("P", &obj2)->isRef()) {
+              if (obj2.getRef().num == oldPageNum) {
+                Object obj3;
+                array->getNF(i, &obj3);
+                if (obj3.isRef()) {
+                  Object *newRef = new Object();
+                  newRef->initRef(newPageNum, 0);
+                  dict->set("P", newRef);
+                  getXRef()->setModifiedObject(&obj1, obj3.getRef());
+                }
+                obj3.free();
+              } else if (obj2.getRef().num == newPageNum) {
+                obj1.free();
+                obj2.free();
+                type.free();
+                continue;
+              } else {
+                array->remove(i);
+                obj1.free();
+                obj2.free();
+                type.free();
+                modified = gTrue;
+                continue;
+              }
+            }
+            obj2.free();
+          }
+          type.free();
+          markPageObjects(dict, xRef, countRef, numOffset);
+        }
+        obj1.free();
+        array->getNF(i, &obj1);
+        if (obj1.isRef()) {
+          if (obj1.getRef().num + (int) numOffset >= xRef->getNumObjects() || xRef->getEntry(obj1.getRef().num + numOffset)->type == xrefEntryFree) {
+            if (getXRef()->getEntry(obj1.getRef().num)->type == xrefEntryFree) {
+              continue;  // already marked as free => should be replaced
+            }
+            xRef->add(obj1.getRef().num + numOffset, obj1.getRef().gen, 0, gTrue);
+            if (getXRef()->getEntry(obj1.getRef().num)->type == xrefEntryCompressed) {
+              xRef->getEntry(obj1.getRef().num + numOffset)->type = xrefEntryCompressed;
+            }
+          }
+          if (obj1.getRef().num + (int) numOffset >= countRef->getNumObjects() || 
+              countRef->getEntry(obj1.getRef().num + numOffset)->type == xrefEntryFree)
+          {
+            countRef->add(obj1.getRef().num + numOffset, 1, 0, gTrue);
+          } else {
+            XRefEntry *entry = countRef->getEntry(obj1.getRef().num + numOffset);
+            entry->gen++;
+          } 
+        }
+        obj1.free();
+      }
+  }
+  if (annotsObj->isRef()) {
+    if (annotsObj->getRef().num + (int) numOffset >= xRef->getNumObjects() || xRef->getEntry(annotsObj->getRef().num + numOffset)->type == xrefEntryFree) {
+      if (getXRef()->getEntry(annotsObj->getRef().num)->type == xrefEntryFree) {
+        return modified;  // already marked as free => should be replaced
+      }
+      xRef->add(annotsObj->getRef().num + numOffset, annotsObj->getRef().gen, 0, gTrue);
+      if (getXRef()->getEntry(annotsObj->getRef().num)->type == xrefEntryCompressed) {
+        xRef->getEntry(annotsObj->getRef().num + numOffset)->type = xrefEntryCompressed;
+      }
+    }
+    if (annotsObj->getRef().num + (int) numOffset >= countRef->getNumObjects() || 
+        countRef->getEntry(annotsObj->getRef().num + numOffset)->type == xrefEntryFree)
+    {
+      countRef->add(annotsObj->getRef().num + numOffset, 1, 0, gTrue);
+    } else {
+      XRefEntry *entry = countRef->getEntry(annotsObj->getRef().num + numOffset);
+      entry->gen++;
+    } 
+    getXRef()->setModifiedObject(&annots, annotsObj->getRef());
+  }
+  annots.free();
+  return modified;
+}
+
+void PDFDoc::markAcroForm(Object *afObj, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum) {
+  Object acroform;
+  GBool modified = gFalse;
+  afObj->fetch(getXRef(), &acroform);
+  if (acroform.isDict()) {
+      Dict *dict = acroform.getDict();
+      for (int i=0; i < dict->getLength(); i++) {
+        if (strcmp(dict->getKey(i), "Fields") == 0) {
+          Object fields;
+          modified = markAnnotations(dict->getValNF(i, &fields), xRef, countRef, numOffset, oldPageNum, newPageNum);
+          fields.free();
+        } else {
+          Object obj;
+          markObject(dict->getValNF(i, &obj), xRef, countRef, numOffset);
+          obj.free();
+        }
+      }
+  }
+  if (afObj->isRef()) {
+    if (afObj->getRef().num + (int) numOffset >= xRef->getNumObjects() || xRef->getEntry(afObj->getRef().num + numOffset)->type == xrefEntryFree) {
+      if (getXRef()->getEntry(afObj->getRef().num)->type == xrefEntryFree) {
+        return;  // already marked as free => should be replaced
+      }
+      xRef->add(afObj->getRef().num + numOffset, afObj->getRef().gen, 0, gTrue);
+      if (getXRef()->getEntry(afObj->getRef().num)->type == xrefEntryCompressed) {
+        xRef->getEntry(afObj->getRef().num + numOffset)->type = xrefEntryCompressed;
+      }
+    }
+    if (afObj->getRef().num + (int) numOffset >= countRef->getNumObjects() || 
+        countRef->getEntry(afObj->getRef().num + numOffset)->type == xrefEntryFree)
+    {
+      countRef->add(afObj->getRef().num + numOffset, 1, 0, gTrue);
+    } else {
+      XRefEntry *entry = countRef->getEntry(afObj->getRef().num + numOffset);
+      entry->gen++;
+    } 
+    if (modified){
+      getXRef()->setModifiedObject(&acroform, afObj->getRef());
+    }
+  }
+  acroform.free();
+  return;
+}
+
 Guint PDFDoc::writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, GBool combine) 
 {
   Guint objectsCount = 0; //count the number of objects in the XRef(s)
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDoc.h
index 1e5b8088729..d8064e9dc4c 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDoc.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDoc.h
@@ -22,7 +22,7 @@
 // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
 // Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2010 Srinivas Adicherla <srinivas.adicherla@geodesic.com>
-// Copyright (C) 2011, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011, 2013, 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
@@ -249,6 +249,8 @@ public:
   // rewrite pageDict with MediaBox, CropBox and new page CTM
   void replacePageDict(int pageNo, int rotate, PDFRectangle *mediaBox, PDFRectangle *cropBox, Object *pageCTM);
   void markPageObjects(Dict *pageDict, XRef *xRef, XRef *countRef, Guint numOffset);
+  GBool markAnnotations(Object *annots, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum);
+  void markAcroForm(Object *acrpForm, XRef *xRef, XRef *countRef, Guint numOffset, Guint oldPageNum, Guint newPageNum);
   // write all objects used by pageDict to outStr
   Guint writePageObjects(OutStream *outStr, XRef *xRef, Guint numOffset, GBool combine = gFalse);
   static void writeObject (Object *obj, OutStream* outStr, XRef *xref, Guint numOffset, Guchar *fileKey,
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocBuilder.h
index d6eccf5487a..d6eccf5487a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocEncoding.cc
index 79408346419..79408346419 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocEncoding.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocEncoding.h
index 4f0840bb28a..4f0840bb28a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocEncoding.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocEncoding.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocFactory.cc
index 1ec46477237..1ec46477237 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocFactory.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocFactory.h
index dbceaa567ee..dbceaa567ee 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PDFDocFactory.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PDFDocFactory.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSOutputDev.cc
index 149bb620df2..149bb620df2 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSOutputDev.h
index f30204deeb5..f30204deeb5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSTokenizer.cc
index 05127f0d03c..05127f0d03c 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSTokenizer.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSTokenizer.h
index fc2f053d3f2..fc2f053d3f2 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PSTokenizer.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PSTokenizer.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Page.cc
index ecdff32f693..ecdff32f693 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Page.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Page.h
index 2aaabae9b16..2aaabae9b16 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Page.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Page.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageLabelInfo.cc
index 3153377f6d3..3153377f6d3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageLabelInfo.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageLabelInfo.h
index 960e710069d..960e710069d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageLabelInfo.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo_p.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageLabelInfo_p.h
index d3cd89f9bcd..6cd5220d372 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageLabelInfo_p.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageLabelInfo_p.h
@@ -3,7 +3,7 @@
 // This file is under the GPLv2 or later license
 //
 // Copyright (C) 2005-2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2009 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009, 2014 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2011 Simon Kellner <kellner@kit.edu>
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
 //
@@ -15,6 +15,7 @@
 /* http://mathworld.wolfram.com/RomanNumerals.html */
 
 #include "goo/GooString.h"
+#include "Error.h"
 
 static int fromRoman(const char *buffer) {
   int digit_value, prev_digit_value, value;
@@ -73,6 +74,11 @@ static void toRoman(int number, GooString *str, GBool uppercase) {
   int i, j, k;
   const char *wh;
 
+  if (number >= 4000) {
+    error(errUnimplemented, -1, "Conversion to roman numberals of numbers >= 4000 not implemented");
+    return;
+  }
+
   if (uppercase)
     wh = uppercaseNumerals;
   else
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageTransition.cc
index 441634c039f..441634c039f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageTransition.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageTransition.h
index e892c6c5051..e892c6c5051 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PageTransition.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PageTransition.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Parser.cc
index 28a54607f5c..28a54607f5c 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Parser.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Parser.h
index 1ce9445e19d..1ce9445e19d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Parser.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Parser.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PopplerCache.cc
index 6018a77b70f..6018a77b70f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PopplerCache.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PopplerCache.h
index 74010a2fa6b..74010a2fa6b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PopplerCache.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PopplerCache.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/PreScanOutputDev.cc
index b2af18d86b8..b2af18d86b8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PreScanOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/PreScanOutputDev.h
index 50fcbf22f73..50fcbf22f73 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/PreScanOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/PreScanOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/ProfileData.cc
index a0c44747a56..a0c44747a56 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/ProfileData.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/ProfileData.h
index 418ee010755..418ee010755 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/ProfileData.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/ProfileData.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Rendition.cc
index c040bf2b4a8..c040bf2b4a8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Rendition.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Rendition.h
index 75bfeff32c9..75bfeff32c9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Rendition.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Rendition.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/SecurityHandler.cc
index d6f55995b1c..d6f55995b1c 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/SecurityHandler.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/SecurityHandler.h
index c2991c8f375..c2991c8f375 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/SecurityHandler.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/SecurityHandler.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Sound.cc
index 6129fdcb47d..6129fdcb47d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Sound.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Sound.h
index acb0f8d9acd..acb0f8d9acd 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Sound.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Sound.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/SplashOutputDev.cc
index d0a945468a1..01979fdd7e0 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/SplashOutputDev.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005 Takashi Iwai <tiwai@suse.de>
 // Copyright (C) 2006 Stefan Schweizer <genstef@gentoo.org>
-// Copyright (C) 2006-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2014 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
@@ -4346,6 +4346,7 @@ GBool SplashOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTria
     setVectorAntialias(vaa);
     return retVal;
   }
+  delete splashShading;
   return gFalse;
 }
 
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/SplashOutputDev.h
index ce1d50d0fdd..ce1d50d0fdd 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/SplashOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/SplashOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinCachedFile.cc
index db966377bb0..db966377bb0 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinCachedFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinCachedFile.h
index 5be6fa841a3..5be6fa841a3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinCachedFile.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinCachedFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinPDFDocBuilder.cc
index 571ee46d7f6..571ee46d7f6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinPDFDocBuilder.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinPDFDocBuilder.h
index e9b2f47f636..e9b2f47f636 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StdinPDFDocBuilder.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StdinPDFDocBuilder.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream-CCITT.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Stream-CCITT.h
index 7207729a4d1..7207729a4d1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream-CCITT.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Stream-CCITT.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/Stream.cc
index 4c00ddb0d5d..4c00ddb0d5d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Stream.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/Stream.h
index 00b2925b3d5..00b2925b3d5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/Stream.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/Stream.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructElement.cc
index 8e064a04fdf..8e064a04fdf 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructElement.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructElement.h
index 51fd83da69b..51fd83da69b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructElement.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructElement.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructTreeRoot.cc
index e46e3e28388..e46e3e28388 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructTreeRoot.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructTreeRoot.h
index 3b1f3c84421..3b1f3c84421 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/StructTreeRoot.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/StructTreeRoot.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/TextOutputDev.cc
index 4b7ff406c3e..4b7ff406c3e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/TextOutputDev.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/TextOutputDev.h
index 23fb3b726a9..23fb3b726a9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/TextOutputDev.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/TextOutputDev.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/UTF.cc
index 46007b73006..46007b73006 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UTF.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UTF.h
index 248c168cca5..248c168cca5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UTF.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF8.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UTF8.h
index 34a07d4082f..34a07d4082f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UTF8.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UTF8.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCClassTables.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeCClassTables.h
index 62f9ecc3657..62f9ecc3657 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCClassTables.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeCClassTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCompTables.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeCompTables.h
index 68e2f86aee9..68e2f86aee9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeCompTables.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeCompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeDecompTables.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeDecompTables.h
index 4bc34b18d99..4bc34b18d99 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeDecompTables.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeDecompTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeMap.cc
index 0528cdfc686..0528cdfc686 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeMap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeMap.h
index ba7df2cfb99..ba7df2cfb99 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMap.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeMap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMapTables.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeMapTables.h
index 073e474e6be..073e474e6be 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeMapTables.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeMapTables.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeTypeTable.cc
index 721af9db6e5..721af9db6e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeTypeTable.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeTypeTable.h
index 869aad9e6c6..869aad9e6c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/UnicodeTypeTable.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/UnicodeTypeTable.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/ViewerPreferences.cc
index cba8d0ac512..cba8d0ac512 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/ViewerPreferences.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/ViewerPreferences.h
index 8cdc4d40a73..8cdc4d40a73 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/ViewerPreferences.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/ViewerPreferences.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/XRef.cc
index 5495b62f7ba..2560e3dcf67 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/XRef.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005 Dan Sheridan <dan.sheridan@postman.org.uk>
 // Copyright (C) 2005 Brad Hards <bradh@frogmouth.net>
-// Copyright (C) 2006, 2008, 2010, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006, 2008, 2010, 2012-2014 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007-2008 Julien Rebetez <julienr@svn.gnome.org>
 // Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009, 2010 Ilya Gorenbein <igorenbein@finjan.com>
@@ -435,6 +435,7 @@ XRef *XRef::copy() {
 
   if (xref->reserve(size) == 0) {
     error(errSyntaxError, -1, "unable to allocate {0:d} entries", size);
+    delete xref;
     return NULL;
   }
   xref->size = size;
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/XRef.h
index 70065d8963e..70065d8963e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/XRef.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/XRef.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.cc b/Build/source/libs/poppler/poppler-0.26.1/poppler/XpdfPluginAPI.cc
index 834c681d991..834c681d991 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/XpdfPluginAPI.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.h b/Build/source/libs/poppler/poppler-0.26.1/poppler/XpdfPluginAPI.h
index da69ee31bcc..6ed890a8f1f 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/XpdfPluginAPI.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/XpdfPluginAPI.h
@@ -13,6 +13,7 @@
 //
 // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+// Copyright (C) 2014 Peter Breitenlohner <peb@mppmu.mpg.de>
 //
 // 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
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/gen-unicode-tables.py b/Build/source/libs/poppler/poppler-0.26.1/poppler/gen-unicode-tables.py
index 282f6e52518..282f6e52518 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/gen-unicode-tables.py
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/gen-unicode-tables.py
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.cmake b/Build/source/libs/poppler/poppler-0.26.1/poppler/poppler-config.h.cmake
index b04f2bf60a4..b04f2bf60a4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.cmake
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/poppler-config.h.cmake
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.in b/Build/source/libs/poppler/poppler-0.26.1/poppler/poppler-config.h.in
index 871540626c6..871540626c6 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/poppler-config.h.in
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/poppler-config.h.in
diff --git a/Build/source/libs/poppler/poppler-0.25.2/poppler/strtok_r.cpp b/Build/source/libs/poppler/poppler-0.26.1/poppler/strtok_r.cpp
index 6483e0f7be9..6483e0f7be9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/poppler/strtok_r.cpp
+++ b/Build/source/libs/poppler/poppler-0.26.1/poppler/strtok_r.cpp
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/Makefile.am b/Build/source/libs/poppler/poppler-0.26.1/splash/Makefile.am
index 4330c53aabf..4330c53aabf 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/Makefile.am
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/Makefile.am
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/Splash.cc
index d9983b0705c..8d0765bd3fe 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/Splash.cc
@@ -2511,6 +2511,8 @@ SplashError Splash::fillWithPattern(SplashPath *path, GBool eo,
     delta = (yMinI == yMaxI) ? yMaxFP - yMinFP : xMaxFP - xMinFP;
     if (delta < 0.2) {
       opClipRes = splashClipAllOutside;
+      delete scanner;
+      delete xPath;
       return splashOk;
     }
   }
@@ -3840,7 +3842,7 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, void *srcData
     scaledWidth = yMax - yMin;
     scaledHeight = xMax - xMin;
   }
-  if (scaledHeight <= 1 || scaledHeight <= 1 || tilingPattern) {
+  if (scaledHeight <= 1 || scaledWidth <= 1 || tilingPattern) {
     if (mat[0] >= 0) {
       t0 = imgCoordMungeUpper(mat[0] + mat[4]) - imgCoordMungeLower(mat[4]);
     } else {
@@ -4875,6 +4877,9 @@ void Splash::scaleImageYuXuBilinear(SplashImageSource src, void *srcData,
   Guchar *destPtr0, *destPtr, *destAlphaPtr0, *destAlphaPtr;
   int i;
 
+  if (srcWidth < 1 || srcHeight < 1)
+    return;
+
   // allocate buffers
   srcBuf = (Guchar *)gmallocn(srcWidth+1, nComps); // + 1 pixel of padding
   lineBuf1 = (Guchar *)gmallocn(scaledWidth, nComps);
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.h b/Build/source/libs/poppler/poppler-0.26.1/splash/Splash.h
index cf98e6c6824..cf98e6c6824 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/Splash.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/Splash.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashBitmap.cc
index ac344f17c35..ac344f17c35 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashBitmap.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashBitmap.h
index 70509abcfaa..70509abcfaa 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashClip.cc
index 85c6b11473d..85c6b11473d 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashClip.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashClip.h
index 5c0fdba99a7..5c0fdba99a7 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashClip.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashClip.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashErrorCodes.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashErrorCodes.h
index d1f81f85dd8..d1f81f85dd8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashErrorCodes.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashErrorCodes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFont.cc
index 2a2362520cb..b785826d66b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFont.cc
@@ -11,7 +11,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005, 2007-2011 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2007-2011, 2014 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006 Kristian Høgsberg <krh@bitplanet.net>
 // Copyright (C) 2009 Petr Gajdos <pgajdos@novell.com>
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
@@ -280,7 +280,7 @@ GBool SplashFTFont::makeGlyph(int c, int xFrac, int yFrac,
   FT_Set_Transform(ff->face, &matrix, &offset);
   slot = ff->face->glyph;
 
-  if (ff->codeToGID && c < ff->codeToGIDLen) {
+  if (ff->codeToGID && c < ff->codeToGIDLen && c >= 0) {
     gid = (FT_UInt)ff->codeToGID[c];
   } else {
     gid = (FT_UInt)c;
@@ -410,7 +410,7 @@ SplashPath *SplashFTFont::getGlyphPath(int c) {
   ff->face->size = sizeObj;
   FT_Set_Transform(ff->face, &textMatrix, NULL);
   slot = ff->face->glyph;
-  if (ff->codeToGID && c < ff->codeToGIDLen) {
+  if (ff->codeToGID && c < ff->codeToGIDLen && c >= 0) {
     gid = ff->codeToGID[c];
   } else {
     gid = (FT_UInt)c;
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFont.h
index 98cb29dfbba..98cb29dfbba 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFont.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontEngine.cc
index 9fef8f007d1..9fef8f007d1 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontEngine.h
index 11bbea74a80..11bbea74a80 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontFile.cc
index 34f6ce5c6b4..34f6ce5c6b4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontFile.h
index d642af0a0ab..d642af0a0ab 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFTFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFTFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFont.cc
index 2bfcdc8719e..3d6d6b2343e 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFont.cc
@@ -11,7 +11,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2007-2008, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2008, 2010, 2014 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
@@ -24,6 +24,7 @@
 #pragma implementation
 #endif
 
+#include <limits.h>
 #include <string.h>
 #include "goo/gmem.h"
 #include "SplashMath.h"
@@ -71,10 +72,14 @@ void SplashFont::initCache() {
   // deal with rounding errors
   glyphW = xMax - xMin + 3;
   glyphH = yMax - yMin + 3;
-  if (aa) {
-    glyphSize = glyphW * glyphH;
+  if (glyphW > INT_MAX / glyphH) {
+    glyphSize = -1;
   } else {
-    glyphSize = ((glyphW + 7) >> 3) * glyphH;
+    if (aa) {
+      glyphSize = glyphW * glyphH;
+    } else {
+      glyphSize = ((glyphW + 7) >> 3) * glyphH;
+    }
   }
 
   // set up the glyph pixmap cache
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFont.h
index 78b00d2dcaf..78b00d2dcaf 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFont.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFont.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontEngine.cc
index 968e8207362..968e8207362 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontEngine.h
index 6502ea5a7fa..6502ea5a7fa 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFile.cc
index 68e8608b6a7..68e8608b6a7 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFile.h
index ec87504b9bc..ec87504b9bc 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFile.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFileID.cc
index a66dabf61e3..a66dabf61e3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFileID.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFileID.h
index cfd89ebb56a..cfd89ebb56a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashFontFileID.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashFontFileID.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashGlyphBitmap.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashGlyphBitmap.h
index c062c106e6a..c062c106e6a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashGlyphBitmap.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashGlyphBitmap.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashMath.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashMath.h
index ca73c2bd1f3..ca73c2bd1f3 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashMath.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashMath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPath.cc
index bc4ccd524a4..bc4ccd524a4 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPath.h
index 81273c613e5..81273c613e5 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPath.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPattern.cc
index 28ca4995882..28ca4995882 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPattern.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPattern.h
index 42c1660f126..42c1660f126 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashPattern.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashPattern.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashScreen.cc
index 68ccd7ddda0..68ccd7ddda0 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashScreen.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashScreen.h
index a7fc4559148..a7fc4559148 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashScreen.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashScreen.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashState.cc
index fd2789d02f9..fd2789d02f9 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashState.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashState.h
index 2c603531cfd..2c603531cfd 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashState.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashState.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1Font.cc
index 0fdfaaf5150..0fdfaaf5150 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1Font.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1Font.h
index 1dbe66cd7fc..1dbe66cd7fc 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1Font.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1Font.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontEngine.cc
index fb4b38dae88..fb4b38dae88 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontEngine.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontEngine.h
index 268a01479b0..268a01479b0 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontEngine.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontEngine.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontFile.cc
index 1832a916d9a..1832a916d9a 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontFile.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontFile.h
index c094b6d8b29..c094b6d8b29 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashT1FontFile.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashT1FontFile.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashTypes.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashTypes.h
index 5ea816007f8..5ea816007f8 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashTypes.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashTypes.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPath.cc
index 27106ee3d14..27106ee3d14 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPath.cc
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPath.h
index 1c7040daa23..1c7040daa23 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPath.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPath.h
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.cc b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPathScanner.cc
index 0fd5ccdc59d..52ac1c2734b 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.cc
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPathScanner.cc
@@ -11,7 +11,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2008, 2010 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010, 2014 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha@gmail.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
 //
@@ -514,7 +514,7 @@ void SplashXPathScanner::clipAALine(SplashBitmap *aaBuf,
     xx0 = (*x1 + 1) * splashAASize;
     if (xx0 > aaBuf->getWidth()) xx0 = aaBuf->getWidth();
     // set [xx, xx0) to 0
-    if (xx < xx0) {
+    if (xx < xx0 && xx >= 0) {
       p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx >> 3);
       if (xx & 7) {
 	mask = (Guchar)(0xff00 >> (xx & 7));
diff --git a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.h b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPathScanner.h
index b59e3068093..b59e3068093 100644
--- a/Build/source/libs/poppler/poppler-0.25.2/splash/SplashXPathScanner.h
+++ b/Build/source/libs/poppler/poppler-0.26.1/splash/SplashXPathScanner.h
diff --git a/Build/source/libs/poppler/version.ac b/Build/source/libs/poppler/version.ac
index 48d6d43a35b..f9df1251792 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.25.2])
+m4_define([poppler_version], [0.26.1])